From f404243d63be8fdc5d34efa4c27f0ce827bf5fd2 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 3 Apr 2024 08:38:26 +0200
Subject: [PATCH 01/38] feat(route): refs # agency add agencyList

---
 src/i18n/en/index.js                  |  1 +
 src/i18n/es/index.js                  |  1 +
 src/pages/Route/Agency/AgencyList.vue | 39 +++++++++++++++++++++++++++
 src/router/modules/route.js           | 11 +++++++-
 4 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Route/Agency/AgencyList.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 9e0ad7c9b..a91f9586b 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -937,6 +937,7 @@ export default {
         pageTitles: {
             routes: 'Routes',
             cmrsList: 'External CMRs list',
+            agencyList: 'Agency',
             RouteList: 'List',
             create: 'Create',
             basicData: 'Basic Data',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6083dfad7..3b664a8e4 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -937,6 +937,7 @@ export default {
         pageTitles: {
             routes: 'Rutas',
             cmrsList: 'Listado de CMRs externos',
+            agency: 'Agency',
             RouteList: 'Listado',
             create: 'Crear',
             basicData: 'Datos básicos',
diff --git a/src/pages/Route/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue
new file mode 100644
index 000000000..ca5197986
--- /dev/null
+++ b/src/pages/Route/Agency/AgencyList.vue
@@ -0,0 +1,39 @@
+<script setup>
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+const router = useRouter();
+function navigate(id) {
+    router.push({ path: `/agencies/${id}` });
+}
+</script>
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                data-key="AgencyList"
+                url="agencies"
+                limit="20"
+                order-by="name"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        :id="row.id"
+                        :key="row.id"
+                        :title="row.name"
+                        @click="navigate(row.id)"
+                        v-for="row of rows"
+                    >
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
+<style lang="scss"></style>
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 614345913..4031e74bf 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -10,7 +10,7 @@ export default {
     component: RouterView,
     redirect: { name: 'RouteMain' },
     menus: {
-        main: ['RouteList', 'CmrList'],
+        main: ['RouteList', 'CmrList', 'agencyList'],
         card: ['RouteBasicData'],
     },
     children: [
@@ -29,6 +29,15 @@ export default {
                     },
                     component: () => import('src/pages/Route/Cmr/CmrList.vue'),
                 },
+                {
+                    path: 'agency',
+                    name: 'agencyList',
+                    meta: {
+                        title: 'agencyList',
+                        icon: 'package',
+                    },
+                    component: () => import('src/pages/Route/Agency/AgencyList.vue'),
+                },
                 {
                     path: 'list',
                     name: 'RouteList',

From cd49ebe7a66790e039baaa4b9280d0aa3f9b6d3f Mon Sep 17 00:00:00 2001
From: jcasado <jcasado.verdnatura@gmail.com>
Date: Wed, 3 Apr 2024 12:54:14 +0200
Subject: [PATCH 02/38] refs #6697 fix claimQuantity

---
 src/pages/Claim/Card/ClaimLines.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index 70c257c69..4a1d9c9d0 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -20,7 +20,7 @@ const { t } = useI18n();
 const stateStore = useStateStore();
 const arrayData = useArrayData('ClaimLines');
 const store = arrayData.store;
-
+let claimedDefault = 0;
 const claimFilter = {
     fields: ['ticketFk'],
 };
@@ -79,6 +79,7 @@ const columns = computed(() => [
         label: t('Claimed'),
         field: (row) => row.quantity,
         sortable: true,
+        default: 0,
     },
     {
         name: 'description',

From fb6a2c809789eb74f23bdb2f62d0d90be6bc1753 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 3 Apr 2024 14:59:51 +0200
Subject: [PATCH 03/38] feat: refs #4988 add agencyList and searchBar

---
 src/i18n/en/index.js                  |  1 +
 src/i18n/es/index.js                  |  3 +-
 src/pages/Agency/AgencyList.vue       | 92 +++++++++++++++++++++++++++
 src/pages/Agency/Card/AgencyCard.vue  | 39 ++++++++++++
 src/pages/Route/Agency/AgencyList.vue | 39 ------------
 src/router/modules/agency.js          | 54 ++++++++++++++++
 src/router/modules/route.js           | 26 +++++---
 7 files changed, 204 insertions(+), 50 deletions(-)
 create mode 100644 src/pages/Agency/AgencyList.vue
 create mode 100644 src/pages/Agency/Card/AgencyCard.vue
 delete mode 100644 src/pages/Route/Agency/AgencyList.vue
 create mode 100644 src/router/modules/agency.js

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 054668042..9d0488cab 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -91,6 +91,7 @@ export default {
             basicData: 'Basic data',
             log: 'Logs',
             parkingList: 'Parkings list',
+            agencyList: 'Agencies list',
         },
     },
     errors: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 099f97938..478c93467 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -91,6 +91,7 @@ export default {
             basicData: 'Datos básicos',
             log: 'Historial',
             parkingList: 'Listado de parkings',
+            agencyList: 'Listado de agencias',
         },
     },
     errors: {
@@ -992,7 +993,7 @@ export default {
             routes: 'Rutas',
             cmrsList: 'Listado de CMRs externos',
             agency: 'Agency',
-            RouteList: 'Listado',
+            RouteList: 'Listado de rutas',
             create: 'Crear',
             basicData: 'Datos básicos',
             summary: 'Resumen',
diff --git a/src/pages/Agency/AgencyList.vue b/src/pages/Agency/AgencyList.vue
new file mode 100644
index 000000000..2746f8529
--- /dev/null
+++ b/src/pages/Agency/AgencyList.vue
@@ -0,0 +1,92 @@
+<script setup>
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import { useStateStore } from 'stores/useStateStore';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+const router = useRouter();
+const stateStore = useStateStore();
+function navigate(id) {
+    router.push({ path: `/agency/${id}` });
+}
+function exprBuilder(param, value) {
+    switch (param) {
+        case 'search':
+            return { name: { like: `%${value}%` } };
+    }
+}
+</script>
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                :info="t('You can search by name')"
+                :label="t('Search agency')"
+                data-key="AgencyList"
+                url="Agencies"
+            />
+        </Teleport>
+    </template>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                data-key="AgencyList"
+                url="Agencies"
+                order="name"
+                :expr-builder="exprBuilder"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        :id="row.id"
+                        :key="row.id"
+                        :title="row.name"
+                        @click="navigate(row.id)"
+                        v-for="row of rows"
+                    >
+                        <template #list-items>
+                            <QCheckbox
+                                :label="t('isOwn')"
+                                v-model="row.isOwn"
+                                :disable="true"
+                            />
+                            <QCheckbox
+                                :label="t('isAnyVolumeAllowed')"
+                                v-model="row.isAnyVolumeAllowed"
+                                :disable="true"
+                            />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openCard')"
+                                @click.stop="navigate(row.id)"
+                                outline
+                            />
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id, CustomerSummary)"
+                                color="primary"
+                                style="margin-top: 15px"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
+<i18n>
+    es: 
+        isOwn: Tiene propietario
+        isAnyVolumeAllowed: Permite cualquier volumen
+        Search agency: Buscar agencia
+        You can search by name: Puedes buscar por nombre
+    en:
+        isOwn: Has owner
+        isAnyVolumeAllowed: Allows any volume
+</i18n>
diff --git a/src/pages/Agency/Card/AgencyCard.vue b/src/pages/Agency/Card/AgencyCard.vue
new file mode 100644
index 000000000..1c7e3cc10
--- /dev/null
+++ b/src/pages/Agency/Card/AgencyCard.vue
@@ -0,0 +1,39 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'stores/useStateStore';
+import { useRoute } from 'vue-router';
+import CustomerDescriptor from './CustomerDescriptor.vue';
+import LeftMenu from 'components/LeftMenu.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import useCardSize from 'src/composables/useCardSize';
+
+const stateStore = useStateStore();
+const route = useRoute();
+const { t } = useI18n();
+</script>
+<template>
+    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
+        <VnSearchbar
+            data-key="CustomerList"
+            url="Clients/filter"
+            :label="t('Search customer')"
+            :info="t('You can search by customer id or name')"
+        />
+    </Teleport>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <CustomerDescriptor />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <VnSubToolbar />
+            <div :class="useCardSize()">
+                <RouterView></RouterView>
+            </div>
+        </QPage>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Route/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue
deleted file mode 100644
index ca5197986..000000000
--- a/src/pages/Route/Agency/AgencyList.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-<script setup>
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import CardList from 'src/components/ui/CardList.vue';
-import { useRouter } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-
-const { t } = useI18n();
-const { viewSummary } = useSummaryDialog();
-const router = useRouter();
-function navigate(id) {
-    router.push({ path: `/agencies/${id}` });
-}
-</script>
-<template>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="AgencyList"
-                url="agencies"
-                limit="20"
-                order-by="name"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        :id="row.id"
-                        :key="row.id"
-                        :title="row.name"
-                        @click="navigate(row.id)"
-                        v-for="row of rows"
-                    >
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-    </QPage>
-</template>
-<style lang="scss"></style>
diff --git a/src/router/modules/agency.js b/src/router/modules/agency.js
new file mode 100644
index 000000000..42b139b95
--- /dev/null
+++ b/src/router/modules/agency.js
@@ -0,0 +1,54 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/agency',
+    name: 'Agency',
+    meta: {
+        title: 'agency',
+        icon: 'garage_home',
+        moduleName: 'Agency',
+    },
+    component: RouterView,
+    redirect: { name: 'AgencyCard' },
+    menus: {
+        main: [],
+        card: ['AgencyBasicData', 'AgencyLog'],
+    },
+    children: [
+        {
+            path: '/agency/:id',
+            name: 'AgencyCard',
+            component: () => import('src/pages/Agency/Card/AgencyCard.vue'),
+            redirect: { name: 'AgencySummary' },
+            children: [
+                {
+                    name: 'AgencySummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'view_list',
+                    },
+                    component: () => import('src/pages/Agency/Card/AgencySummary.vue'),
+                },
+                {
+                    name: 'AgencyBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () => import('pages/Agency/Card/AgencyBasicData.vue'),
+                },
+                {
+                    name: 'AgencyLog',
+                    path: 'log',
+                    meta: {
+                        title: 'log',
+                        icon: 'history',
+                    },
+                    component: () => import('src/pages/Agency/Card/AgencyLog.vue'),
+                },
+            ],
+        },
+    ],
+};
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 1e392fa0f..cfa8c9c35 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'RouteMain' },
     menus: {
-        main: ['RouteList', 'RouteAutonomous', 'RouteRoadmap', 'CmrList', 'agencyList'],
+        main: ['RouteList', 'RouteAutonomous', 'RouteRoadmap', 'CmrList', 'AgencyList'],
         card: ['RouteBasicData', 'RouteTickets', 'RouteLog'],
     },
     children: [
@@ -21,15 +21,6 @@ export default {
             component: () => import('src/pages/Route/RouteMain.vue'),
             redirect: { name: 'RouteList' },
             children: [
-                {
-                    path: 'agency',
-                    name: 'agencyList',
-                    meta: {
-                        title: 'agencyList',
-                        icon: 'package',
-                    },
-                    component: () => import('src/pages/Route/Agency/AgencyList.vue'),
-                },
                 {
                     path: 'list',
                     name: 'RouteList',
@@ -83,6 +74,21 @@ export default {
                     },
                     component: () => import('src/pages/Route/Cmr/CmrList.vue'),
                 },
+                {
+                    path: '/agency',
+                    redirect: { name: 'agencyList' },
+                    children: [
+                        {
+                            path: 'list',
+                            name: 'AgencyList',
+                            meta: {
+                                title: 'agencyList',
+                                icon: 'view_list',
+                            },
+                            component: () => import('src/pages/Agency/AgencyList.vue'),
+                        },
+                    ],
+                },
             ],
         },
         {

From b5aae63e15ac0b59b4e333e86ac30095b2de227f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 12 Apr 2024 08:47:25 +0200
Subject: [PATCH 04/38] refs #6976 supplier onUnmounted

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

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 33d235a5f..18d163d52 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -15,8 +15,11 @@ import { usePrintService } from 'composables/usePrintService';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import { useStateStore } from 'stores/useStateStore';
+import { useState } from 'src/composables/useState';
 import { useArrayData } from 'composables/useArrayData';
+import { onUnmounted } from 'vue';
 
+const state = useState();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const route = useRoute();
@@ -32,6 +35,7 @@ const arrayData = useArrayData('SupplierConsumption', {
 
 const store = arrayData.store;
 
+onUnmounted(() => state.unset('SupplierConsumption'));
 const dateRanges = computed(() => {
     const ranges = {
         from: null,
@@ -112,6 +116,8 @@ onMounted(async () => {
     stateStore.rightDrawer = true;
     await getSupplierConsumptionData();
 });
+
+console.log('dateRange From', dateRanges.value.from);
 </script>
 
 <template>

From ee80b1d617e1835a1a04760f0fd4fa9435a81457 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 12 Apr 2024 14:34:11 +0200
Subject: [PATCH 05/38] refs #6976 changes table

---
 .../Supplier/Card/SupplierConsumption.vue     | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 18d163d52..e7cbca8b1 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -162,16 +162,20 @@ console.log('dateRange From', dateRanges.value.from);
         >
             <template #body="{ row }">
                 <QTr>
-                    <QTd no-hover class="label">{{
-                        t('supplier.consumption.entry')
-                    }}</QTd>
-                    <QTd no-hover>{{ row.id }}</QTd>
-                    <QTd no-hover class="label">{{ t('supplier.consumption.date') }}</QTd>
-                    <QTd no-hover>{{ toDate(row.shipped) }}</QTd>
-                    <QTd no-hover class="label">{{
-                        t('supplier.consumption.reference')
-                    }}</QTd>
-                    <QTd no-hover>{{ row.invoiceNumber }}</QTd>
+                    <QTd no-hover>
+                        <span class="label">{{ t('supplier.consumption.entry') }}: </span>
+                        <span>{{ row.id }}</span>
+                    </QTd>
+                    <QTd no-hover>
+                        <span class="label">{{ t('supplier.consumption.date') }}: </span>
+                        <span>{{ toDate(row.shipped) }}</span></QTd
+                    >
+                    <QTd colspan="6" no-hover>
+                        <span class="label"
+                            >{{ t('supplier.consumption.reference') }}:
+                        </span>
+                        <span>{{ row.invoiceNumber }}</span>
+                    </QTd>
                 </QTr>
                 <QTr v-for="(buy, index) in row.buys" :key="index">
                     <QTd no-hover>

From c65c09c39c990bd6b72be4cc59e65db1814c80fe Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 16 Apr 2024 07:45:33 +0200
Subject: [PATCH 06/38] feat(agency): refs #4988 add agency router and sections

---
 src/components/common/VnBreadcrumbs.vue    |  1 +
 src/i18n/en/index.js                       |  8 ++-
 src/pages/Agency/AgencyList.vue            |  9 ++--
 src/pages/Agency/Card/AgencyBasicData.vue  | 59 ++++++++++++++++++++++
 src/pages/Agency/Card/AgencyCard.vue       | 46 +++++++++++------
 src/pages/Agency/Card/AgencyDescriptor.vue | 39 ++++++++++++++
 src/pages/Agency/Card/AgencyLog.vue        |  6 +++
 src/pages/Agency/Card/AgencySummary.vue    | 44 ++++++++++++++++
 src/router/modules/index.js                |  2 +
 src/router/routes.js                       |  2 +
 10 files changed, 196 insertions(+), 20 deletions(-)
 create mode 100644 src/pages/Agency/Card/AgencyBasicData.vue
 create mode 100644 src/pages/Agency/Card/AgencyDescriptor.vue
 create mode 100644 src/pages/Agency/Card/AgencyLog.vue
 create mode 100644 src/pages/Agency/Card/AgencySummary.vue

diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 337507233..65f6946f4 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -30,6 +30,7 @@ watchEffect(() => {
 });
 
 function getBreadcrumb(param) {
+    console.log('param.meta.title: ', param.meta.title);
     const breadcrumb = {
         icon: param.meta.icon,
         path: param.path,
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 0f90d5f44..d26ee26a3 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -1003,9 +1003,10 @@ export default {
     },
     route: {
         pageTitles: {
+            agency: 'Agency',
             routes: 'Routes',
             cmrsList: 'External CMRs list',
-            agencyList: 'Agency',
+            agencyList: 'Agency list',
             RouteList: 'List',
             create: 'Create',
             basicData: 'Basic Data',
@@ -1033,6 +1034,11 @@ export default {
             },
         },
     },
+    agency: {
+        pageTitles: {
+            agency: 'Agency',
+        },
+    },
     supplier: {
         pageTitles: {
             suppliers: 'Suppliers',
diff --git a/src/pages/Agency/AgencyList.vue b/src/pages/Agency/AgencyList.vue
index 2746f8529..6f8185864 100644
--- a/src/pages/Agency/AgencyList.vue
+++ b/src/pages/Agency/AgencyList.vue
@@ -15,10 +15,11 @@ function navigate(id) {
     router.push({ path: `/agency/${id}` });
 }
 function exprBuilder(param, value) {
-    switch (param) {
-        case 'search':
-            return { name: { like: `%${value}%` } };
-    }
+    if (param !== 'search') return;
+
+    if (!isNaN(value)) return { id: value };
+
+    return { name: { like: `%${value}%` } };
 }
 </script>
 <template>
diff --git a/src/pages/Agency/Card/AgencyBasicData.vue b/src/pages/Agency/Card/AgencyBasicData.vue
new file mode 100644
index 000000000..f54f7037d
--- /dev/null
+++ b/src/pages/Agency/Card/AgencyBasicData.vue
@@ -0,0 +1,59 @@
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import VnRow from 'components/ui/VnRow.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModel from 'components/FormModel.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const id = route.params?.id || null;
+const warehouses = ref([]);
+const sectorFilter = { fields: ['id', 'description'] };
+
+const filter = {
+    fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+    include: [{ relation: 'sector', scope: sectorFilter }],
+};
+</script>
+<template>
+    <FetchData
+        url="warehouses"
+        sort-by="name"
+        @on-fetch="(data) => (warehouses = data)"
+        auto-load
+    />
+    <VnSubToolbar />
+    <FormModel :url="`Agencies/${id}`" model="agency" auto-load>
+        <template #form="{ data }">
+            <VnRow>
+                <VnInput v-model="data.name" :label="t('globals.name')" />
+            </VnRow>
+            <VnRow>
+                <VnSelectFilter
+                    v-model="data.sectorFk"
+                    option-value="id"
+                    option-label="name"
+                    :label="t('parking.sector')"
+                    :options="warehouses"
+                    use-input
+                    input-debounce="0"
+                    :is-clearable="false"
+                />
+            </VnRow>
+            <VnRow>
+                <QCheckbox :label="t('isOwn')" v-model="data.isOwn" />
+            </VnRow>
+            <VnRow>
+                <QCheckbox
+                    :label="t('isAnyVolumeAllowed')"
+                    v-model="data.isAnyVolumeAllowed"
+                />
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
diff --git a/src/pages/Agency/Card/AgencyCard.vue b/src/pages/Agency/Card/AgencyCard.vue
index 1c7e3cc10..628acf2f2 100644
--- a/src/pages/Agency/Card/AgencyCard.vue
+++ b/src/pages/Agency/Card/AgencyCard.vue
@@ -1,39 +1,55 @@
 <script setup>
+import { onMounted, watch } from 'vue';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
-import { useRoute } from 'vue-router';
-import CustomerDescriptor from './CustomerDescriptor.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import useCardSize from 'src/composables/useCardSize';
+import AgencyDescriptor from 'pages/Agency/Card/AgencyDescriptor.vue';
 
-const stateStore = useStateStore();
-const route = useRoute();
 const { t } = useI18n();
+const route = useRoute();
+const stateStore = useStateStore();
+
+const filter = {
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+
+const arrayData = useArrayData('Agency', {
+    url: `Agencies/${route.params.id}`,
+});
+const { store } = arrayData;
+onMounted(async () => await arrayData.fetch({ append: false }));
+watch(
+    () => route.params.id,
+    async (newId) => {
+        if (newId) {
+            store.url = `Agencies/${newId}`;
+            await arrayData.fetch({ append: false });
+        }
+    }
+);
 </script>
 <template>
     <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
         <VnSearchbar
-            data-key="CustomerList"
-            url="Clients/filter"
-            :label="t('Search customer')"
-            :info="t('You can search by customer id or name')"
+            :info="t('Agency.searchBar.info')"
+            :label="t('Agency.searchBar.label')"
+            data-key="Agency"
         />
     </Teleport>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit">
-            <CustomerDescriptor />
+            <AgencyDescriptor />
             <QSeparator />
             <LeftMenu source="card" />
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <VnSubToolbar />
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
+            <RouterView></RouterView>
         </QPage>
     </QPageContainer>
 </template>
diff --git a/src/pages/Agency/Card/AgencyDescriptor.vue b/src/pages/Agency/Card/AgencyDescriptor.vue
new file mode 100644
index 000000000..573205f8b
--- /dev/null
+++ b/src/pages/Agency/Card/AgencyDescriptor.vue
@@ -0,0 +1,39 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { useArrayData } from 'src/composables/useArrayData';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'components/ui/VnLv.vue';
+
+const props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const { t } = useI18n();
+const { params } = useRoute();
+const entityId = computed(() => props.id || params.id);
+const { store } = useArrayData('Parking');
+const card = computed(() => store.data);
+const filter = {
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+</script>
+<template>
+    <CardDescriptor
+        module="Agency"
+        data-key="Agency"
+        :url="`Agencies/${entityId}`"
+        :title="card?.name"
+        :subtitle="card?.id"
+    >
+        <template #body="{ entity: agency }">
+            <VnLv :label="t('globals.name')" :value="agency.name" />
+        </template>
+    </CardDescriptor>
+</template>
diff --git a/src/pages/Agency/Card/AgencyLog.vue b/src/pages/Agency/Card/AgencyLog.vue
new file mode 100644
index 000000000..d4769a676
--- /dev/null
+++ b/src/pages/Agency/Card/AgencyLog.vue
@@ -0,0 +1,6 @@
+<script setup>
+import VnLog from 'src/components/common/VnLog.vue';
+</script>
+<template>
+    <VnLog model="Agency" url="/AgencyLogs" />
+</template>
diff --git a/src/pages/Agency/Card/AgencySummary.vue b/src/pages/Agency/Card/AgencySummary.vue
new file mode 100644
index 000000000..96652fe29
--- /dev/null
+++ b/src/pages/Agency/Card/AgencySummary.vue
@@ -0,0 +1,44 @@
+<script setup>
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'components/ui/VnLv.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+const { params } = useRoute();
+const { t } = useI18n();
+const entityId = computed(() => $props.id || params.id);
+
+const filter = {
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+</script>
+
+<template>
+    <div class="q-pa-md">
+        <CardSummary :url="`Agencies/${entityId}`">
+            <template #header="{ entity: agency }">{{ agency.name }}</template>
+            <template #body="{ entity: agency }">
+                <QCard class="vn-one">
+                    <QCardSection class="q-pa-none">
+                        <a
+                            class="header header-link"
+                            :href="`#/agency/${entityId}/basic-data`"
+                        >
+                            {{ t('globals.pageTitles.basicData') }}
+                            <QIcon name="open_in_new" />
+                        </a>
+                    </QCardSection>
+                    <VnLv :label="t('globals.name')" :value="agency.name" />
+                </QCard>
+            </template>
+        </CardSummary>
+    </div>
+</template>
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index 302ba7fe0..6f4b0b35e 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -15,6 +15,7 @@ import Department from './department';
 import Entry from './entry';
 import roadmap from './roadmap';
 import Parking from './parking';
+import Agency from './agency';
 
 export default [
     Item,
@@ -34,4 +35,5 @@ export default [
     Entry,
     roadmap,
     Parking,
+    Agency,
 ];
diff --git a/src/router/routes.js b/src/router/routes.js
index 51e726a62..ca52441e7 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -15,6 +15,7 @@ import order from 'src/router/modules/order';
 import entry from 'src/router/modules/entry';
 import roadmap from 'src/router/modules/roadmap';
 import parking from 'src/router/modules/parking';
+import agency from 'src/router/modules/agency';
 
 const routes = [
     {
@@ -71,6 +72,7 @@ const routes = [
             roadmap,
             entry,
             parking,
+            agency,
             {
                 path: '/:catchAll(.*)*',
                 name: 'NotFound',

From d2ec47fe1c87803770425ddb317abd83d21f7cdb Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 22 Apr 2024 11:25:32 +0200
Subject: [PATCH 07/38] refs #6976 total Stems

---
 .../Supplier/Card/SupplierConsumption.vue     | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index e7cbca8b1..2b4dfe6b8 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import { computed, onMounted } from 'vue';
+import { computed, onMounted, watch, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 
@@ -17,7 +17,6 @@ import axios from 'axios';
 import { useStateStore } from 'stores/useStateStore';
 import { useState } from 'src/composables/useState';
 import { useArrayData } from 'composables/useArrayData';
-import { onUnmounted } from 'vue';
 
 const state = useState();
 const stateStore = useStateStore();
@@ -35,6 +34,9 @@ const arrayData = useArrayData('SupplierConsumption', {
 
 const store = arrayData.store;
 
+console.log('route del principio', route.query.from);
+watch(() => route.query);
+
 onUnmounted(() => state.unset('SupplierConsumption'));
 const dateRanges = computed(() => {
     const ranges = {
@@ -42,6 +44,7 @@ const dateRanges = computed(() => {
         to: null,
     };
 
+    console.log('route del if', route.query.from);
     if (route.query && route.query.params) {
         const params = JSON.parse(route.query.params);
         if (params.from && params.to) {
@@ -52,7 +55,7 @@ const dateRanges = computed(() => {
 
     return ranges;
 });
-
+console.log('dataRanges', dateRanges);
 const reportParams = computed(() => ({
     recipientId: Number(route.params.id),
     ...dateRanges.value,
@@ -112,12 +115,16 @@ const sendCampaignMetricsEmail = ({ address }) => {
 const calculateTotal = (buysArray = []) =>
     buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
 
+const calculateTotalStems = (buysArray = []) =>
+    buysArray.reduce((accumulator, { quantity }) => accumulator + quantity, 0);
+
 onMounted(async () => {
     stateStore.rightDrawer = true;
     await getSupplierConsumptionData();
 });
 
 console.log('dateRange From', dateRanges.value.from);
+console.log('dateRange value', dateRanges.value);
 </script>
 
 <template>
@@ -192,10 +199,14 @@ console.log('dateRange From', dateRanges.value.from);
                     <QTd colspan="2" no-hover> {{ dashIfEmpty(buy.total) }}</QTd>
                 </QTr>
                 <QTr>
-                    <QTd colspan="6" no-hover>
+                    <QTd colspan="5" no-hover>
                         <span class="label">{{ t('Total entry') }}: </span>
                         <span>{{ calculateTotal(row.buys) }}</span>
                     </QTd>
+                    <QTd no-hover>
+                        <span class="label">{{ t('Total stems') }}: </span>
+                        <span>{{ calculateTotalStems(row.buys) }}</span>
+                    </QTd>
                 </QTr>
             </template>
         </QTable>
@@ -211,6 +222,7 @@ console.log('dateRange From', dateRanges.value.from);
 <i18n>
 es:
     Total entry: Total entrada
+    Total stems: Total tallos
     Open as PDF: Abrir como PDF
     Send to email: Enviar por email
     This supplier does not have a contact with an email address: Este proveedor no tiene un email de contacto

From 6b4cb4ed122cf086cff1f699b2d53a08efa5d80d Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 22 Apr 2024 12:19:22 +0200
Subject: [PATCH 08/38] feat: refs #4988 add agency section

---
 src/i18n/en/index.js                       |  14 ++-
 src/i18n/es/index.js                       |   9 ++
 src/pages/Agency/AgencyList.vue            |   8 --
 src/pages/Agency/Card/AgencyBasicData.vue  |  21 ++--
 src/pages/Agency/Card/AgencyCard.vue       |   5 -
 src/pages/Agency/Card/AgencyDescriptor.vue |   7 +-
 src/pages/Agency/Card/AgencyModes.vue      |  84 +++++++++++++++
 src/pages/Agency/Card/AgencySummary.vue    |  20 ++--
 src/pages/Agency/Card/AgencyWorkcenter.vue | 113 +++++++++++++++++++++
 src/router/modules/agency.js               |  36 ++++++-
 src/router/modules/route.js                |   2 +-
 11 files changed, 274 insertions(+), 45 deletions(-)
 create mode 100644 src/pages/Agency/Card/AgencyModes.vue
 create mode 100644 src/pages/Agency/Card/AgencyWorkcenter.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index d26ee26a3..be8a13267 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -94,6 +94,7 @@ export default {
         },
         created: 'Created',
         worker: 'Worker',
+        name: 'Name',
     },
     errors: {
         statusUnauthorized: 'Access denied',
@@ -1034,11 +1035,6 @@ export default {
             },
         },
     },
-    agency: {
-        pageTitles: {
-            agency: 'Agency',
-        },
-    },
     supplier: {
         pageTitles: {
             suppliers: 'Suppliers',
@@ -1291,4 +1287,12 @@ export default {
         },
         iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789',
     },
+    agency: {
+        pageTitles: {
+            agency: 'Agency',
+            modes: 'Modes',
+        },
+        isOwn: 'Is own',
+        isAnyVolumeAllowed: 'Any volume allowed',
+    },
 };
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 0d31c375f..88e000635 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -94,6 +94,7 @@ export default {
         },
         created: 'Fecha creación',
         worker: 'Trabajador',
+        name: 'Nombre',
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',
@@ -1284,4 +1285,12 @@ export default {
         },
         iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789',
     },
+    agency: {
+        pageTitles: {
+            agency: 'Agencia',
+            modes: 'Modos',
+        },
+        isOwn: 'Propia',
+        isAnyVolumeAllowed: 'Volumen libre',
+    },
 };
diff --git a/src/pages/Agency/AgencyList.vue b/src/pages/Agency/AgencyList.vue
index 6f8185864..930cae563 100644
--- a/src/pages/Agency/AgencyList.vue
+++ b/src/pages/Agency/AgencyList.vue
@@ -5,10 +5,8 @@ import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 
 const { t } = useI18n();
-const { viewSummary } = useSummaryDialog();
 const router = useRouter();
 const stateStore = useStateStore();
 function navigate(id) {
@@ -68,12 +66,6 @@ function exprBuilder(param, value) {
                                 @click.stop="navigate(row.id)"
                                 outline
                             />
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, CustomerSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
                         </template>
                     </CardList>
                 </template>
diff --git a/src/pages/Agency/Card/AgencyBasicData.vue b/src/pages/Agency/Card/AgencyBasicData.vue
index f54f7037d..00595ce1f 100644
--- a/src/pages/Agency/Card/AgencyBasicData.vue
+++ b/src/pages/Agency/Card/AgencyBasicData.vue
@@ -2,23 +2,18 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import VnRow from 'components/ui/VnRow.vue';
+
+import FormModel from 'components/FormModel.vue';
 import FetchData from 'src/components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import FormModel from 'components/FormModel.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const id = route.params?.id || null;
+const routeId = route.params?.id || null;
 const warehouses = ref([]);
-const sectorFilter = { fields: ['id', 'description'] };
-
-const filter = {
-    fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'],
-    include: [{ relation: 'sector', scope: sectorFilter }],
-};
 </script>
 <template>
     <FetchData
@@ -28,7 +23,7 @@ const filter = {
         auto-load
     />
     <VnSubToolbar />
-    <FormModel :url="`Agencies/${id}`" model="agency" auto-load>
+    <FormModel :url="`Agencies/${routeId}`" model="agency" auto-load>
         <template #form="{ data }">
             <VnRow>
                 <VnInput v-model="data.name" :label="t('globals.name')" />
@@ -38,7 +33,7 @@ const filter = {
                     v-model="data.sectorFk"
                     option-value="id"
                     option-label="name"
-                    :label="t('parking.sector')"
+                    :label="t('globals.warehouse')"
                     :options="warehouses"
                     use-input
                     input-debounce="0"
@@ -46,11 +41,11 @@ const filter = {
                 />
             </VnRow>
             <VnRow>
-                <QCheckbox :label="t('isOwn')" v-model="data.isOwn" />
+                <QCheckbox :label="t('agency.isOwn')" v-model="data.isOwn" />
             </VnRow>
             <VnRow>
                 <QCheckbox
-                    :label="t('isAnyVolumeAllowed')"
+                    :label="t('agency.isAnyVolumeAllowed')"
                     v-model="data.isAnyVolumeAllowed"
                 />
             </VnRow>
diff --git a/src/pages/Agency/Card/AgencyCard.vue b/src/pages/Agency/Card/AgencyCard.vue
index 628acf2f2..db2e6381c 100644
--- a/src/pages/Agency/Card/AgencyCard.vue
+++ b/src/pages/Agency/Card/AgencyCard.vue
@@ -12,11 +12,6 @@ const { t } = useI18n();
 const route = useRoute();
 const stateStore = useStateStore();
 
-const filter = {
-    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
-    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
-};
-
 const arrayData = useArrayData('Agency', {
     url: `Agencies/${route.params.id}`,
 });
diff --git a/src/pages/Agency/Card/AgencyDescriptor.vue b/src/pages/Agency/Card/AgencyDescriptor.vue
index 573205f8b..311f5d3a5 100644
--- a/src/pages/Agency/Card/AgencyDescriptor.vue
+++ b/src/pages/Agency/Card/AgencyDescriptor.vue
@@ -19,10 +19,7 @@ const { params } = useRoute();
 const entityId = computed(() => props.id || params.id);
 const { store } = useArrayData('Parking');
 const card = computed(() => store.data);
-const filter = {
-    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
-    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
-};
+console.log('card: ', card);
 </script>
 <template>
     <CardDescriptor
@@ -30,7 +27,7 @@ const filter = {
         data-key="Agency"
         :url="`Agencies/${entityId}`"
         :title="card?.name"
-        :subtitle="card?.id"
+        :subtitle="props.id"
     >
         <template #body="{ entity: agency }">
             <VnLv :label="t('globals.name')" :value="agency.name" />
diff --git a/src/pages/Agency/Card/AgencyModes.vue b/src/pages/Agency/Card/AgencyModes.vue
new file mode 100644
index 000000000..2c0c9d47b
--- /dev/null
+++ b/src/pages/Agency/Card/AgencyModes.vue
@@ -0,0 +1,84 @@
+<script setup>
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CardList from 'src/components/ui/CardList.vue';
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+const { t } = useI18n();
+const router = useRouter();
+const route = useRoute();
+console.log('route: ', route.path);
+const routeId = route.params.id;
+const toAgencyModeCreate = (consigneeId) => {
+    router.push({
+        name: 'AgencyMode',
+        params: {
+            id: route.params.id,
+            consigneeId,
+        },
+    });
+};
+</script>
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                data-key="AgencyModes"
+                :url="`AgencyModes`"
+                :filter="{ where: { agencyFk: routeId } }"
+                order="name"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        :id="row.id"
+                        :key="row.id"
+                        :title="row.name"
+                        v-for="row of rows"
+                    >
+                        <template #list-items>
+                            <VnLv
+                                :label="t('globals.description')"
+                                :value="row?.description"
+                            />
+                            <VnLv
+                                :label="t('deliveryMethod')"
+                                :value="row?.deliveryMethodFk"
+                            />
+                            <VnLv label="m3" :value="row?.m3" />
+                            <VnLv :label="t('inflation')" :value="row?.inflation" />
+                            <VnLv :label="t('globals.code')" :value="row?.code" />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('globals.edit')"
+                                @click.stop="toAgencyModeCreate(row.id)"
+                                color="primary"
+                                icon="edit"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+
+        <QPageSticky :offset="[18, 18]">
+            <QBtn @click.stop="toAgencyModeCreate()" color="primary" fab icon="add" />
+            <QTooltip>
+                {{ t('New mode') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>
+<i18n>
+    es: 
+        isOwn: Tiene propietario
+        isAnyVolumeAllowed: Permite cualquier volumen
+        Search agency: Buscar agencia
+        You can search by name: Puedes buscar por nombre
+    en:
+        isOwn: Has owner
+        isAnyVolumeAllowed: Allows any volume
+</i18n>
diff --git a/src/pages/Agency/Card/AgencySummary.vue b/src/pages/Agency/Card/AgencySummary.vue
index 96652fe29..4c9e7052f 100644
--- a/src/pages/Agency/Card/AgencySummary.vue
+++ b/src/pages/Agency/Card/AgencySummary.vue
@@ -2,8 +2,12 @@
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+
+import FetchData from 'src/components/FetchData.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
+import VnTitle from 'src/components/common/VnTitle.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 
 const $props = defineProps({
     id: {
@@ -28,15 +32,17 @@ const filter = {
             <template #body="{ entity: agency }">
                 <QCard class="vn-one">
                     <QCardSection class="q-pa-none">
-                        <a
-                            class="header header-link"
-                            :href="`#/agency/${entityId}/basic-data`"
-                        >
-                            {{ t('globals.pageTitles.basicData') }}
-                            <QIcon name="open_in_new" />
-                        </a>
+                        <VnTitle
+                            :url="`#/agency/${entityId}/basic-data`"
+                            :text="t('globals.pageTitles.basicData')"
+                        />
                     </QCardSection>
                     <VnLv :label="t('globals.name')" :value="agency.name" />
+                    <QCheckbox :label="t('agency.isOwn')" v-model="agency.isOwn" />
+                    <QCheckbox
+                        :label="t('agency.isAnyVolumeAllowed')"
+                        v-model="agency.isAnyVolumeAllowed"
+                    />
                 </QCard>
             </template>
         </CardSummary>
diff --git a/src/pages/Agency/Card/AgencyWorkcenter.vue b/src/pages/Agency/Card/AgencyWorkcenter.vue
new file mode 100644
index 000000000..cacd4b8f2
--- /dev/null
+++ b/src/pages/Agency/Card/AgencyWorkcenter.vue
@@ -0,0 +1,113 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'src/components/FetchData.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import VnRow from 'components/ui/VnRow.vue';
+
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const paginate = ref();
+const dialog = ref();
+const routeId = computed(() => route.params.id);
+
+const initialData = computed(() => {
+    return {
+        agencyFk: routeId.value,
+        workCenterFk: null,
+    };
+});
+</script>
+<template>
+    <div class="centerCard">
+        <FetchData
+            url="workCenters"
+            sort-by="name"
+            @on-fetch="(data) => (warehouses = data)"
+            auto-load
+        />
+        <VnPaginate
+            ref="paginate"
+            data-key="AgencyWorkCenters"
+            url="AgencyWorkCenters"
+            :filter="{ where: { agencyFk: routeId } }"
+            order="id"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <QCard
+                    flat
+                    bordered
+                    :key="row.id"
+                    v-for="row of rows"
+                    class="card q-pa-md q-mb-sm"
+                >
+                    <QItem>
+                        <QItemSection side-left>
+                            <VnLv :value="row?.workCenter?.name" icon="delete" />
+                        </QItemSection>
+                        <QItemSection side>
+                            <QBtn icon="delete" color="primary" round flat />
+                        </QItemSection>
+                    </QItem>
+                </QCard>
+            </template>
+        </VnPaginate>
+    </div>
+    <QPageSticky :offset="[18, 18]">
+        <QBtn @click.stop="dialog.show()" color="primary" fab icon="add">
+            <QDialog ref="dialog">
+                <FormModelPopup
+                    :title="t('Add work center')"
+                    url-create="AgencyWorkCenters"
+                    model="AgencyWorkCenter"
+                    :form-initial-data="initialData"
+                    @on-data-saved="paginate.fetch()"
+                >
+                    <template #form-inputs="{ data }">
+                        <VnRow class="row q-gutter-md q-mb-md">
+                            <VnSelectFilter
+                                v-model="data.workCenterFk"
+                                option-value="id"
+                                option-label="name"
+                                :label="t('workCenter')"
+                                :options="warehouses"
+                                use-input
+                                input-debounce="0"
+                                :is-clearable="false"
+                            />
+                        </VnRow>
+                    </template>
+                </FormModelPopup>
+            </QDialog>
+        </QBtn>
+        <QTooltip>
+            {{ t('globals.new') }}
+        </QTooltip>
+    </QPageSticky>
+</template>
+<style lang="scss" scoped>
+.centerCard {
+    padding: 5%;
+    width: 100%;
+    max-width: 50%;
+    margin: 0 auto;
+}
+</style>
+<i18n>
+    es: 
+        isOwn: Tiene propietario
+        isAnyVolumeAllowed: Permite cualquier volumen
+        Search agency: Buscar agencia
+        You can search by name: Puedes buscar por nombre
+    en:
+        isOwn: Has owner
+        isAnyVolumeAllowed: Allows any volume
+</i18n>
diff --git a/src/router/modules/agency.js b/src/router/modules/agency.js
index 42b139b95..6f281e21d 100644
--- a/src/router/modules/agency.js
+++ b/src/router/modules/agency.js
@@ -12,7 +12,7 @@ export default {
     redirect: { name: 'AgencyCard' },
     menus: {
         main: [],
-        card: ['AgencyBasicData', 'AgencyLog'],
+        card: ['AgencyBasicData', 'AgencyModes', 'AgencyWorkCenters', 'AgencyLog'],
     },
     children: [
         {
@@ -39,6 +39,40 @@ export default {
                     },
                     component: () => import('pages/Agency/Card/AgencyBasicData.vue'),
                 },
+                {
+                    path: 'workCenter',
+                    name: 'AgencyWorkCenterCard',
+                    redirect: { name: 'AgencyWorkCenters' },
+                    children: [
+                        {
+                            path: '',
+                            name: 'AgencyWorkCenters',
+                            meta: {
+                                icon: 'apartment',
+                                title: 'workCenters',
+                            },
+                            component: () =>
+                                import('src/pages/Agency/Card/AgencyWorkcenter.vue'),
+                        },
+                    ],
+                },
+                {
+                    path: 'modes',
+                    name: 'AgencyModesCard',
+                    redirect: { name: 'AgencyModes' },
+                    children: [
+                        {
+                            path: '',
+                            name: 'AgencyModes',
+                            meta: {
+                                icon: 'format_list_bulleted',
+                                title: 'modes',
+                            },
+                            component: () =>
+                                import('src/pages/Agency/Card/AgencyModes.vue'),
+                        },
+                    ],
+                },
                 {
                     name: 'AgencyLog',
                     path: 'log',
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index cfa8c9c35..e29e3a86b 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -76,7 +76,7 @@ export default {
                 },
                 {
                     path: '/agency',
-                    redirect: { name: 'agencyList' },
+                    redirect: { name: 'AgencyList' },
                     children: [
                         {
                             path: 'list',

From 663c093a0032ffd43cee788ec0a63a086da5e8e3 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 22 Apr 2024 18:17:01 +0200
Subject: [PATCH 09/38] feat: refs #4988 agency e2e

---
 src/i18n/locale/en.yml                        | 23 +++++++++----
 src/i18n/locale/es.yml                        | 13 ++++++++
 src/pages/Agency/Card/AgencyBasicData.vue     |  2 +-
 src/pages/Agency/Card/AgencyModes.vue         | 27 +--------------
 src/pages/Agency/Card/AgencyWorkcenter.vue    | 28 +++++++++++++++-
 test/cypress/integration/agency/spec.spec.js  | 25 ++++++++++++++
 .../pages/Agency/AgencyWorCenter.spec.js      | 33 +++++++++++++++++++
 test/vitest/setup-file.js                     |  1 -
 8 files changed, 116 insertions(+), 36 deletions(-)
 create mode 100644 test/cypress/integration/agency/spec.spec.js
 create mode 100644 test/vitest/__tests__/pages/Agency/AgencyWorCenter.spec.js
 delete mode 100644 test/vitest/setup-file.js

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 3ac3d18a0..d978fa089 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -89,9 +89,14 @@ globals:
         basicData: Basic data
         log: Logs
         parkingList: Parkings list
+        agencyList: Agencies list
+        agency: Agency
+        workCenters: Work centers
+        modes: Modes
     created: Created
     worker: Worker
     now: Now
+    name: Name
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -1146,13 +1151,17 @@ item:
         stemMultiplier: Multiplier
         producer: Producer
         landed: Landed
-    create:
-        name: Name
-        tag: Tag
-        priority: Priority
-        type: Type
-        intrastat: Intrastat
-        origin: Origin
+agency:
+    isOwn: Own
+    isAnyVolumeAllowed: Any volume allowed
+    notification:
+        removeItem: Agency removed successfully
+        removeItemError: Error removing agency
+    pageTitles:
+        agency: Agency
+    searchBar:
+        info: You can search by agency code
+        label: Search agency...
 components:
     topbar: {}
     userPanel:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 4ecbcdbc0..aa4d88f5d 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -89,9 +89,14 @@ globals:
         basicData: Datos básicos
         log: Historial
         parkingList: Listado de parkings
+        agencyList: Listado de agencias
+        agency: Agencia
+        workCenters: Centros de trabajo
+        modes: Modos
     created: Fecha creación
     worker: Trabajador
     now: Ahora
+    name: Nombre
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -1152,6 +1157,14 @@ item:
         type: Tipo
         intrastat: Intrastat
         origin: Origen
+agency:
+    isOwn: Propio
+    isAnyVolumeAllowed: Cualquier volumen
+    removeItem: Agencia eliminada correctamente
+    notification:
+        removeItemError: Error al eliminar la agencia
+    pageTitles:
+        agency: Agencia
 components:
     topbar: {}
     userPanel:
diff --git a/src/pages/Agency/Card/AgencyBasicData.vue b/src/pages/Agency/Card/AgencyBasicData.vue
index 00595ce1f..40510a205 100644
--- a/src/pages/Agency/Card/AgencyBasicData.vue
+++ b/src/pages/Agency/Card/AgencyBasicData.vue
@@ -30,7 +30,7 @@ const warehouses = ref([]);
             </VnRow>
             <VnRow>
                 <VnSelectFilter
-                    v-model="data.sectorFk"
+                    v-model="data.warehouseFk"
                     option-value="id"
                     option-label="name"
                     :label="t('globals.warehouse')"
diff --git a/src/pages/Agency/Card/AgencyModes.vue b/src/pages/Agency/Card/AgencyModes.vue
index 2c0c9d47b..4b145f227 100644
--- a/src/pages/Agency/Card/AgencyModes.vue
+++ b/src/pages/Agency/Card/AgencyModes.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 import CardList from 'src/components/ui/CardList.vue';
@@ -7,19 +7,9 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
 const { t } = useI18n();
-const router = useRouter();
 const route = useRoute();
 console.log('route: ', route.path);
 const routeId = route.params.id;
-const toAgencyModeCreate = (consigneeId) => {
-    router.push({
-        name: 'AgencyMode',
-        params: {
-            id: route.params.id,
-            consigneeId,
-        },
-    });
-};
 </script>
 <template>
     <QPage class="column items-center q-pa-md">
@@ -51,25 +41,10 @@ const toAgencyModeCreate = (consigneeId) => {
                             <VnLv :label="t('inflation')" :value="row?.inflation" />
                             <VnLv :label="t('globals.code')" :value="row?.code" />
                         </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('globals.edit')"
-                                @click.stop="toAgencyModeCreate(row.id)"
-                                color="primary"
-                                icon="edit"
-                            />
-                        </template>
                     </CardList>
                 </template>
             </VnPaginate>
         </div>
-
-        <QPageSticky :offset="[18, 18]">
-            <QBtn @click.stop="toAgencyModeCreate()" color="primary" fab icon="add" />
-            <QTooltip>
-                {{ t('New mode') }}
-            </QTooltip>
-        </QPageSticky>
     </QPage>
 </template>
 <i18n>
diff --git a/src/pages/Agency/Card/AgencyWorkcenter.vue b/src/pages/Agency/Card/AgencyWorkcenter.vue
index cacd4b8f2..83231e6c2 100644
--- a/src/pages/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Agency/Card/AgencyWorkcenter.vue
@@ -1,4 +1,6 @@
 <script setup>
+import axios from 'axios';
+import { useQuasar } from 'quasar';
 import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
@@ -17,6 +19,7 @@ const route = useRoute();
 const paginate = ref();
 const dialog = ref();
 const routeId = computed(() => route.params.id);
+const quasar = useQuasar();
 
 const initialData = computed(() => {
     return {
@@ -24,6 +27,23 @@ const initialData = computed(() => {
         workCenterFk: null,
     };
 });
+
+async function deleteWorCenter(id) {
+    try {
+        await axios.delete(`AgencyWorkCenters/${id}`).then(async () => {
+            quasar.notify({
+                message: t('agency.notification.removeItem'),
+                type: 'positive',
+            });
+        });
+    } catch (error) {
+        quasar.notify({
+            message: t('agency.notification.removeItemError'),
+            type: 'error',
+        });
+    }
+    paginate.value.fetch();
+}
 </script>
 <template>
     <div class="centerCard">
@@ -54,7 +74,13 @@ const initialData = computed(() => {
                             <VnLv :value="row?.workCenter?.name" icon="delete" />
                         </QItemSection>
                         <QItemSection side>
-                            <QBtn icon="delete" color="primary" round flat />
+                            <QBtn
+                                @click.stop="deleteWorCenter(row.id)"
+                                icon="delete"
+                                color="primary"
+                                round
+                                flat
+                            />
                         </QItemSection>
                     </QItem>
                 </QCard>
diff --git a/test/cypress/integration/agency/spec.spec.js b/test/cypress/integration/agency/spec.spec.js
new file mode 100644
index 000000000..dd6b0da6f
--- /dev/null
+++ b/test/cypress/integration/agency/spec.spec.js
@@ -0,0 +1,25 @@
+describe('template spec', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/agency`);
+    });
+
+    it('passes', () => {
+        cy.visit(`/#/agency`);
+        /* ==== Generated with Cypress Studio ==== */
+        cy.get(':nth-child(1) > :nth-child(1) > .card-list-body > .list-items').click();
+        cy.get('[href="#/agency/1/workCenter"] > .q-item__section--main').click();
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('#f_fa5833a2-f919-4542-b663-e72b3ba4ffe5').click();
+        cy.get('#f_fa5833a2-f919-4542-b663-e72b3ba4ffe5_0').click();
+        cy.get('#formModel > .q-card').click();
+        cy.get('.q-btn--standard > .q-btn__content > .block').click();
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('#f_94743509-f7a7-4e5c-83f4-61ab52c7cd72').click();
+        cy.get('#f_94743509-f7a7-4e5c-83f4-61ab52c7cd72_1 > .q-item__section').click();
+        cy.get('.q-btn--standard > .q-btn__content > .block').click();
+        cy.get('.q-btn--flat > .q-btn__content > .block').;
+        /* ==== End Cypress Studio ==== */
+    });
+});
diff --git a/test/vitest/__tests__/pages/Agency/AgencyWorCenter.spec.js b/test/vitest/__tests__/pages/Agency/AgencyWorCenter.spec.js
new file mode 100644
index 000000000..965af14c4
--- /dev/null
+++ b/test/vitest/__tests__/pages/Agency/AgencyWorCenter.spec.js
@@ -0,0 +1,33 @@
+import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import AgencyWorkCenter from 'pages/Agency/Card/AgencyWorkcenter.vue';
+
+describe('AgencyWorkCenter', () => {
+    let vm;
+    beforeAll(() => {
+        vm = createWrapper(AgencyWorkCenter, {
+            global: {
+                claim: {
+                    id: 1,
+                },
+            },
+        }).vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('remove()', () => {
+        it('should delete the AgencyMode', async () => {
+            vi.spyOn(axios, 'delete').mockResolvedValue({ data: true });
+            vi.spyOn(vm.quasar, 'notify');
+
+            await vm.deleteWorCenter(1);
+
+            expect(vm.quasar.notify).toHaveBeenCalledWith(
+                expect.objectContaining({ type: 'positive' })
+            );
+        });
+    });
+});
diff --git a/test/vitest/setup-file.js b/test/vitest/setup-file.js
deleted file mode 100644
index 499204981..000000000
--- a/test/vitest/setup-file.js
+++ /dev/null
@@ -1 +0,0 @@
-// This file will be run before each test file

From 5cce1df7081dbb8a6ce27df47ffa6fa9a0141d89 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 23 Apr 2024 10:06:57 +0200
Subject: [PATCH 10/38] refs #6976 fix supplierConsumption

---
 .../Supplier/Card/SupplierConsumption.vue     | 64 +++++++++++++++----
 1 file changed, 50 insertions(+), 14 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 2b4dfe6b8..f9fa34c8e 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -1,9 +1,9 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import { computed, onMounted, watch, onUnmounted } from 'vue';
+import { computed, onMounted, watch, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-
+import VnLv from 'src/components/ui/VnLv.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import SupplierConsumptionFilter from './SupplierConsumptionFilter.vue';
@@ -25,7 +25,7 @@ const route = useRoute();
 const { openReport, sendEmail } = usePrintService();
 const quasar = useQuasar();
 const { notify } = useNotify();
-
+const totalRows = ref({});
 const arrayData = useArrayData('SupplierConsumption', {
     url: 'Suppliers/consumption',
     order: ['itemTypeFk', 'itemName', 'itemSize'],
@@ -34,7 +34,6 @@ const arrayData = useArrayData('SupplierConsumption', {
 
 const store = arrayData.store;
 
-console.log('route del principio', route.query.from);
 watch(() => route.query);
 
 onUnmounted(() => state.unset('SupplierConsumption'));
@@ -44,7 +43,6 @@ const dateRanges = computed(() => {
         to: null,
     };
 
-    console.log('route del if', route.query.from);
     if (route.query && route.query.params) {
         const params = JSON.parse(route.query.params);
         if (params.from && params.to) {
@@ -65,7 +63,10 @@ async function getSupplierConsumptionData() {
     await arrayData.fetch({ append: false });
 }
 
-const rows = computed(() => store.data || []);
+const rows = computed(() => {
+    console.log(store.data);
+    return totalEntryPrice(store.data) || [];
+});
 
 const openReportPdf = () => {
     openReport(`Suppliers/${route.params.id}/campaign-metrics-pdf`, reportParams.value);
@@ -112,11 +113,28 @@ const sendCampaignMetricsEmail = ({ address }) => {
     });
 };
 
-const calculateTotal = (buysArray = []) =>
-    buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
+const totalEntryPrice = (rows) => {
+    let totalPrice = 0;
+    let totalQuantity = 0;
+    if (!rows) return totalPrice;
+    for (const row of rows) {
+        let total = 0;
+        let quantity = 0;
+        for (const buy of row.buys) {
+            total = total + buy.total;
+            quantity = quantity + buy.quantity;
+        }
+        row.total = total;
+        row.quantity = quantity;
+        totalPrice = totalPrice + total;
+        totalQuantity = totalQuantity + quantity;
+    }
+    totalRows.value = { totalPrice, totalQuantity };
+    return rows;
+};
 
-const calculateTotalStems = (buysArray = []) =>
-    buysArray.reduce((accumulator, { quantity }) => accumulator + quantity, 0);
+totalEntryPrice(rows.value);
+console.log('row', rows.value);
 
 onMounted(async () => {
     stateStore.rightDrawer = true;
@@ -153,7 +171,23 @@ console.log('dateRange value', dateRanges.value);
             </QTooltip>
         </QBtn>
     </Teleport>
-
+    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
+        <div class="row q-gutter-md">
+            <div>
+                {{ t('Total entries') }}:
+                <QChip :dense="$q.screen.lt.sm" text-color="white">
+                    {{ totalRows.totalPrice }} €
+                </QChip>
+            </div>
+            <QSeparator dark vertical />
+            <div>
+                {{ t('Total stems entries') }}:
+                <QChip :dense="$q.screen.lt.sm" text-color="white">
+                    {{ totalRows.totalQuantity }}
+                </QChip>
+            </div>
+        </div>
+    </Teleport>
     <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">
@@ -186,7 +220,7 @@ console.log('dateRange value', dateRanges.value);
                 </QTr>
                 <QTr v-for="(buy, index) in row.buys" :key="index">
                     <QTd no-hover>
-                        <QBtn flat color="blue" dense>{{ buy.itemName }}</QBtn>
+                        <QBtn flat color="blue" dense no-caps>{{ buy.itemName }}</QBtn>
                         <ItemDescriptorProxy :id="buy.itemFk" />
                     </QTd>
 
@@ -201,11 +235,11 @@ console.log('dateRange value', dateRanges.value);
                 <QTr>
                     <QTd colspan="5" no-hover>
                         <span class="label">{{ t('Total entry') }}: </span>
-                        <span>{{ calculateTotal(row.buys) }}</span>
+                        <span>{{ row.total }} €</span>
                     </QTd>
                     <QTd no-hover>
                         <span class="label">{{ t('Total stems') }}: </span>
-                        <span>{{ calculateTotalStems(row.buys) }}</span>
+                        <span>{{ row.quantity }}</span>
                     </QTd>
                 </QTr>
             </template>
@@ -222,6 +256,8 @@ console.log('dateRange value', dateRanges.value);
 <i18n>
 es:
     Total entry: Total entrada
+    Total entries: Total de las entradas
+    Total stems entries: Total de tallos de las entradas
     Total stems: Total tallos
     Open as PDF: Abrir como PDF
     Send to email: Enviar por email

From 7f07b9780c9e91457e5b7fd72d6233d1fda8c6c8 Mon Sep 17 00:00:00 2001
From: jcasado <jcasado.verdnatura@gmail.com>
Date: Tue, 23 Apr 2024 13:03:32 +0200
Subject: [PATCH 11/38] refs: #6764 rename VnSelectFilter

---
 src/components/CreateBankEntityForm.vue       |  4 +--
 src/components/CreateManualInvoiceForm.vue    | 12 ++++-----
 src/components/CreateNewCityForm.vue          |  4 +--
 src/components/CreateNewPostcodeForm.vue      |  4 +--
 src/components/CreateNewProvinceForm.vue      |  4 +--
 src/components/CreateThermographForm.vue      |  8 +++---
 src/components/EditPictureForm.vue            |  4 +--
 src/components/EditTableCellValueForm.vue     |  4 +--
 src/components/FilterItemForm.vue             |  8 +++---
 src/components/FilterTravelForm.vue           |  8 +++---
 src/components/RegularizeStockForm.vue        |  4 +--
 src/components/TransferInvoiceForm.vue        | 14 +++++-----
 src/components/common/VnDms.vue               |  8 +++---
 src/components/common/VnLog.vue               |  8 +++---
 .../{VnSelectFilter.vue => VnSelect.vue}      |  0
 src/components/common/VnSelectDialog.vue      |  6 ++---
 src/pages/Claim/Card/ClaimAction.vue          |  8 +++---
 src/pages/Claim/Card/ClaimDevelopment.vue     |  8 +++---
 src/pages/Claim/ClaimFilter.vue               | 10 +++----
 src/pages/Customer/Card/CustomerBalance.vue   |  4 +--
 .../Customer/Card/CustomerBillingData.vue     |  4 +--
 .../Customer/Card/CustomerFiscalData.vue      |  6 ++---
 src/pages/Customer/Card/CustomerLog.vue       |  6 ++---
 src/pages/Customer/CustomerCreate.vue         |  6 ++---
 src/pages/Customer/CustomerFilter.vue         |  8 +++---
 .../Defaulter/CustomerDefaulterFilter.vue     | 10 +++----
 .../CustomerExtendedListFilter.vue            | 18 ++++++-------
 .../CustomerNotificationsFilter.vue           |  6 ++---
 .../components/CustomerConsigneeCreate.vue    |  6 ++---
 .../components/CustomerConsigneeEdit.vue      |  8 +++---
 .../components/CustomerGreugeCreate.vue       |  4 +--
 .../components/CustomerNewPayment.vue         |  8 +++---
 .../Department/Card/DepartmentBasicData.vue   |  6 ++---
 src/pages/Entry/Card/EntryBasicData.vue       | 10 +++----
 src/pages/Entry/Card/EntryBuys.vue            |  4 +--
 src/pages/Entry/Card/EntryBuysImport.vue      |  4 +--
 src/pages/Entry/Card/EntryNotes.vue           |  4 +--
 src/pages/Entry/EntryCreate.vue               | 12 ++++-----
 src/pages/Entry/EntryFilter.vue               | 10 +++----
 src/pages/Entry/EntryLatestBuys.vue           | 12 ++++-----
 src/pages/Entry/EntryLatestBuysFilter.vue     | 16 ++++++------
 .../InvoiceIn/Card/InvoiceInBasicData.vue     | 22 ++++++++--------
 .../InvoiceIn/Card/InvoiceInCorrective.vue    |  8 +++---
 .../InvoiceIn/Card/InvoiceInDescriptor.vue    |  8 +++---
 src/pages/InvoiceIn/Card/InvoiceInDueDay.vue  | 10 +++----
 .../InvoiceIn/Card/InvoiceInIntrastat.vue     | 14 +++++-----
 src/pages/InvoiceIn/Card/InvoiceInVat.vue     | 26 +++++++++----------
 src/pages/InvoiceIn/InvoiceInFilter.vue       |  6 ++---
 src/pages/InvoiceOut/InvoiceOutGlobalForm.vue |  8 +++---
 src/pages/Order/Card/OrderCatalogFilter.vue   | 14 +++++-----
 src/pages/Order/Card/OrderFilter.vue          | 10 +++----
 src/pages/Order/Card/OrderForm.vue            | 14 +++++-----
 .../Route/Card/RouteAutonomousFilter.vue      | 20 +++++++++-----
 src/pages/Route/Card/RouteFilter.vue          | 12 ++++-----
 src/pages/Route/Card/RouteForm.vue            | 14 +++++-----
 .../Route/Roadmap/RoadmapAddStopForm.vue      |  4 +--
 src/pages/Route/Roadmap/RoadmapBasicData.vue  | 14 ++++------
 src/pages/Route/Roadmap/RoadmapFilter.vue     |  6 ++---
 src/pages/Route/RouteList.vue                 | 10 +++----
 .../Supplier/Card/SupplierAddressesCreate.vue |  2 +-
 .../Card/SupplierAgencyTermCreate.vue         |  4 +--
 src/pages/Supplier/Card/SupplierBasicData.vue |  6 ++---
 .../Supplier/Card/SupplierBillingData.vue     |  6 ++---
 .../Card/SupplierConsumptionFilter.vue        | 10 +++----
 .../Supplier/Card/SupplierFiscalData.vue      | 10 +++----
 src/pages/Supplier/SupplierListFilter.vue     |  6 ++---
 src/pages/Travel/Card/TravelBasicData.vue     |  8 +++---
 .../Travel/Card/TravelThermographsForm.vue    |  8 +++---
 src/pages/Travel/ExtraCommunityFilter.vue     | 12 ++++-----
 src/pages/Travel/TravelCreate.vue             |  8 +++---
 src/pages/Travel/TravelFilter.vue             | 10 +++----
 src/pages/Worker/Card/WorkerPda.vue           |  6 ++---
 src/pages/Worker/WorkerCreate.vue             | 10 +++----
 73 files changed, 314 insertions(+), 310 deletions(-)
 rename src/components/common/{VnSelectFilter.vue => VnSelect.vue} (100%)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 2d098beb0..4acc7b749 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -3,7 +3,7 @@ import { reactive, ref, onMounted, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInput from 'src/components/common/VnInput.vue';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
@@ -78,7 +78,7 @@ onMounted(async () => {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('country')"
                         v-model="data.countryFk"
                         :options="countriesOptions"
diff --git a/src/components/CreateManualInvoiceForm.vue b/src/components/CreateManualInvoiceForm.vue
index f03afbf35..8ac3552ad 100644
--- a/src/components/CreateManualInvoiceForm.vue
+++ b/src/components/CreateManualInvoiceForm.vue
@@ -5,7 +5,7 @@ import { useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 import VnInputDate from './common/VnInputDate.vue';
@@ -73,7 +73,7 @@ const onDataSaved = async (formData, requestResponse) => {
             </span>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Ticket')"
                         :options="ticketsOptions"
                         hide-selected
@@ -92,13 +92,13 @@ const onDataSaved = async (formData, requestResponse) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
                 <span class="row items-center" style="max-width: max-content">{{
                     t('Or')
                 }}</span>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Client')"
                         :options="clientsOptions"
                         hide-selected
@@ -114,7 +114,7 @@ const onDataSaved = async (formData, requestResponse) => {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Serial')"
                         :options="invoiceOutSerialsOptions"
                         hide-selected
@@ -125,7 +125,7 @@ const onDataSaved = async (formData, requestResponse) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Area')"
                         :options="taxAreasOptions"
                         hide-selected
diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index 7326ea7a5..a78312d08 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
@@ -48,7 +48,7 @@ const onDataSaved = (dataSaved) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Province')"
                         :options="provincesOptions"
                         hide-selected
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 47836c05b..dfaf4c2a3 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CreateNewCityForm from './CreateNewCityForm.vue';
 import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
@@ -123,7 +123,7 @@ const onProvinceCreated = async ({ name }, formData) => {
                     </VnSelectDialog>
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Country')"
                         :options="countriesOptions"
                         hide-selected
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index b972db2c9..d38ff94df 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
@@ -48,7 +48,7 @@ const onDataSaved = (dataSaved) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Autonomy')"
                         :options="autonomiesOptions"
                         hide-selected
diff --git a/src/components/CreateThermographForm.vue b/src/components/CreateThermographForm.vue
index d4511a0e7..60c531529 100644
--- a/src/components/CreateThermographForm.vue
+++ b/src/components/CreateThermographForm.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
@@ -64,7 +64,7 @@ const onDataSaved = (dataSaved) => {
                 </div>
 
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Model')"
                         :options="thermographsModels"
                         hide-selected
@@ -78,7 +78,7 @@ const onDataSaved = (dataSaved) => {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-xl">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Warehouse')"
                         :options="warehousesOptions"
                         hide-selected
@@ -89,7 +89,7 @@ const onDataSaved = (dataSaved) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Temperature')"
                         :options="temperaturesOptions"
                         hide-selected
diff --git a/src/components/EditPictureForm.vue b/src/components/EditPictureForm.vue
index 3d7f3615b..2adbf5f83 100644
--- a/src/components/EditPictureForm.vue
+++ b/src/components/EditPictureForm.vue
@@ -2,7 +2,7 @@
 import { reactive, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -293,7 +293,7 @@ const makeRequest = async () => {
                     </VnRow>
                     <VnRow class="row q-gutter-md q-mb-md">
                         <div class="col">
-                            <VnSelectFilter
+                            <VnSelect
                                 :label="t('Orientation')"
                                 :options="viewportTypes"
                                 hide-selected
diff --git a/src/components/EditTableCellValueForm.vue b/src/components/EditTableCellValueForm.vue
index 9e48889a0..e4732b45d 100644
--- a/src/components/EditTableCellValueForm.vue
+++ b/src/components/EditTableCellValueForm.vue
@@ -2,7 +2,7 @@
 import { ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
 import axios from 'axios';
@@ -76,7 +76,7 @@ const closeForm = () => {
             <span class="title">{{ t('buy(s)') }}</span>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Field to edit')"
                         :options="fieldsOptions"
                         hide-selected
diff --git a/src/components/FilterItemForm.vue b/src/components/FilterItemForm.vue
index 4c329a8e8..1272a3370 100644
--- a/src/components/FilterItemForm.vue
+++ b/src/components/FilterItemForm.vue
@@ -6,7 +6,7 @@ import { useRoute } from 'vue-router';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
 import axios from 'axios';
@@ -160,7 +160,7 @@ const selectItem = ({ id }) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.buys.producer')"
                         :options="producersOptions"
                         hide-selected
@@ -170,7 +170,7 @@ const selectItem = ({ id }) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.buys.type')"
                         :options="ItemTypesOptions"
                         hide-selected
@@ -180,7 +180,7 @@ const selectItem = ({ id }) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.buys.color')"
                         :options="InksOptions"
                         hide-selected
diff --git a/src/components/FilterTravelForm.vue b/src/components/FilterTravelForm.vue
index 499d5bc4e..2e86f0e21 100644
--- a/src/components/FilterTravelForm.vue
+++ b/src/components/FilterTravelForm.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 
 import axios from 'axios';
@@ -146,7 +146,7 @@ const selectTravel = ({ id }) => {
             <h1 class="title">{{ t('Filter travels') }}</h1>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.basicData.agency')"
                         :options="agenciesOptions"
                         hide-selected
@@ -156,7 +156,7 @@ const selectTravel = ({ id }) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.basicData.warehouseOut')"
                         :options="warehousesOptions"
                         hide-selected
@@ -166,7 +166,7 @@ const selectTravel = ({ id }) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.basicData.warehouseIn')"
                         :options="warehousesOptions"
                         hide-selected
diff --git a/src/components/RegularizeStockForm.vue b/src/components/RegularizeStockForm.vue
index 28236be17..180ff2100 100644
--- a/src/components/RegularizeStockForm.vue
+++ b/src/components/RegularizeStockForm.vue
@@ -2,7 +2,7 @@
 import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
@@ -59,7 +59,7 @@ const onDataSaved = (data) => {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Warehouse')"
                         v-model="data.warehouseFk"
                         :options="warehousesOptions"
diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue
index b7d8f3081..de3196e2c 100644
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@@ -5,7 +5,7 @@ import { useRouter } from 'vue-router';
 
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import FormPopup from './FormPopup.vue';
 
 import axios from 'axios';
@@ -84,7 +84,7 @@ const transferInvoice = async () => {
         <template #form-inputs>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Client')"
                         :options="clientsOptions"
                         hide-selected
@@ -103,10 +103,10 @@ const transferInvoice = async () => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Rectificative type')"
                         :options="rectificativeTypeOptions"
                         hide-selected
@@ -119,7 +119,7 @@ const transferInvoice = async () => {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Class')"
                         :options="siiTypeInvoiceOutsOptions"
                         hide-selected
@@ -138,10 +138,10 @@ const transferInvoice = async () => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Type')"
                         :options="invoiceCorrectionTypesOptions"
                         hide-selected
diff --git a/src/components/common/VnDms.vue b/src/components/common/VnDms.vue
index 08255f8a5..18fd5146a 100644
--- a/src/components/common/VnDms.vue
+++ b/src/components/common/VnDms.vue
@@ -6,7 +6,7 @@ import axios from 'axios';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
 
@@ -123,7 +123,7 @@ function addDefaultData(data) {
             <div class="q-gutter-y-ms">
                 <VnRow>
                     <VnInput :label="t('globals.reference')" v-model="dms.reference" />
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('globals.company')"
                         v-model="dms.companyFk"
                         :options="companies"
@@ -133,7 +133,7 @@ function addDefaultData(data) {
                     />
                 </VnRow>
                 <VnRow>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('globals.warehouse')"
                         v-model="dms.warehouseFk"
                         :options="warehouses"
@@ -141,7 +141,7 @@ function addDefaultData(data) {
                         option-label="name"
                         input-debounce="0"
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('globals.type')"
                         v-model="dms.dmsTypeFk"
                         :options="dmsTypes"
diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 5c70b900d..9d1502754 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -12,7 +12,7 @@ import { useValidator } from 'src/composables/useValidator';
 import VnAvatar from '../ui/VnAvatar.vue';
 import VnJsonValue from '../common/VnJsonValue.vue';
 import FetchData from '../FetchData.vue';
-import VnSelectFilter from './VnSelectFilter.vue';
+import VnSelect from './VnSelect.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
 
 const stateStore = useStateStore();
@@ -659,7 +659,7 @@ setLogTree();
                     </QInput>
                 </QItem>
                 <QItem>
-                    <VnSelectFilter
+                    <VnSelect
                         class="full-width"
                         :label="t('globals.entity')"
                         v-model="selectedFilters.changedModel"
@@ -689,7 +689,7 @@ setLogTree();
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
                     <QItemSection v-if="workers && userRadio !== null">
-                        <VnSelectFilter
+                        <VnSelect
                             class="full-width"
                             :label="t('globals.user')"
                             v-model="userSelect"
@@ -713,7 +713,7 @@ setLogTree();
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </QItemSection>
                 </QItem>
                 <QItem class="q-mt-sm">
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelect.vue
similarity index 100%
rename from src/components/common/VnSelectFilter.vue
rename to src/components/common/VnSelect.vue
diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 95d6a44fe..3726691af 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed } from 'vue';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 import { useRole } from 'src/composables/useRole';
 
@@ -52,7 +52,7 @@ const toggleForm = () => {
 </script>
 
 <template>
-    <VnSelectFilter v-model="value" :options="options" v-bind="$attrs">
+    <VnSelect v-model="value" :options="options" v-bind="$attrs">
         <template v-if="isAllowedToCreate" #append>
             <QIcon
                 @click.stop.prevent="toggleForm()"
@@ -72,7 +72,7 @@ const toggleForm = () => {
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
             <slot :name="slotName" v-bind="slotData" :key="slotName" />
         </template>
-    </VnSelectFilter>
+    </VnSelect>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index ef45bf3dc..466e34a09 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -9,7 +9,7 @@ import { toDate, toPercentage, toCurrency } from 'filters/index';
 import { tMobile } from 'src/composables/tMobile';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import { useArrayData } from 'composables/useArrayData';
@@ -304,7 +304,7 @@ async function importToNewRefundTicket() {
                 </template>
                 <template #body-cell-destination="{ row }">
                     <QTd>
-                        <VnSelectFilter
+                        <VnSelect
                             v-model="row.claimDestinationFk"
                             :options="destinationTypes"
                             option-label="description"
@@ -346,7 +346,7 @@ async function importToNewRefundTicket() {
                                     </QItemSection>
                                     <QItemSection side>
                                         <QItemLabel v-if="column.name === 'destination'">
-                                            <VnSelectFilter
+                                            <VnSelect
                                                 v-model="props.row.claimDestinationFk"
                                                 :options="destinationTypes"
                                                 option-label="description"
@@ -420,7 +420,7 @@ async function importToNewRefundTicket() {
                 </QItem>
             </QCardSection>
             <QItemSection>
-                <VnSelectFilter
+                <VnSelect
                     class="q-pa-sm"
                     v-model="claimDestinationFk"
                     :options="destinationTypes"
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index 0b740cf64..7d8d3899a 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import CrudModel from 'components/CrudModel.vue';
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import { tMobile } from 'composables/tMobile';
 
 const route = useRoute();
@@ -163,7 +163,7 @@ const columns = computed(() => [
                         auto-width
                         @keyup.ctrl.enter.stop="claimDevelopmentForm.saveChanges()"
                     >
-                        <VnSelectFilter
+                        <VnSelect
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
@@ -183,7 +183,7 @@ const columns = computed(() => [
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </QTd>
                 </template>
                 <template #item="props">
@@ -200,7 +200,7 @@ const columns = computed(() => [
                             <QList dense>
                                 <QItem v-for="col in props.cols" :key="col.name">
                                     <QItemSection>
-                                        <VnSelectFilter
+                                        <VnSelect
                                             :label="col.label"
                                             v-model="props.row[col.model]"
                                             :options="col.options"
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index ee702ffdd..a0a3bedba 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
@@ -64,7 +64,7 @@ const states = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="workers">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Salesperson')"
                         v-model="params.salesPersonFk"
                         @update:model-value="searchFn()"
@@ -87,7 +87,7 @@ const states = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="workers">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Attender')"
                         v-model="params.attenderFk"
                         @update:model-value="searchFn()"
@@ -110,7 +110,7 @@ const states = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="workers">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Responsible')"
                         v-model="params.claimResponsibleFk"
                         @update:model-value="searchFn()"
@@ -133,7 +133,7 @@ const states = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="states">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('State')"
                         v-model="params.claimStateFk"
                         @update:model-value="searchFn()"
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 184667d6e..081be3606 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -9,7 +9,7 @@ import { toCurrency } from 'src/filters';
 import { useStateStore } from 'stores/useStateStore';
 
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
@@ -229,7 +229,7 @@ const updateCompanyId = (id) => {
 
     <QDrawer :width="256" show-if-above side="right" v-model="stateStore.rightDrawer">
         <div class="q-mt-xl q-px-md">
-            <VnSelectFilter
+            <VnSelect
                 :label="t('Company')"
                 :options="companiesOptions"
                 @update:model-value="updateCompanyId($event)"
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index fa926e2ad..11170357a 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -9,7 +9,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
 
@@ -50,7 +50,7 @@ const getBankEntities = () => {
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Billing data')"
                         :options="payMethods"
                         hide-selected
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 76c84509e..e8e894aab 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 
 const { t } = useI18n();
@@ -62,7 +62,7 @@ function handleLocation(data, location) {
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Sage tax type')"
                         :options="typesTaxes"
                         hide-selected
@@ -72,7 +72,7 @@ function handleLocation(data, location) {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Sage transaction type')"
                         :options="typesTransactions"
                         hide-selected
diff --git a/src/pages/Customer/Card/CustomerLog.vue b/src/pages/Customer/Card/CustomerLog.vue
index 36d79959d..0b6be30ea 100644
--- a/src/pages/Customer/Card/CustomerLog.vue
+++ b/src/pages/Customer/Card/CustomerLog.vue
@@ -8,7 +8,7 @@ import { useStateStore } from 'stores/useStateStore';
 import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -139,7 +139,7 @@ const setInq = (value, status) => {
                     </QIcon>
                 </template>
             </VnInput>
-            <VnSelectFilter
+            <VnSelect
                 :label="t('Entity')"
                 :options="[]"
                 class="q-mt-md"
@@ -179,7 +179,7 @@ const setInq = (value, status) => {
                 />
             </div>
 
-            <VnSelectFilter
+            <VnSelect
                 :label="t('User')"
                 :options="[]"
                 class="q-mt-sm"
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 5d36c6c37..783d998c9 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
@@ -65,7 +65,7 @@ function handleLocation(data, location) {
                         <QInput :label="t('Comercial name')" v-model="data.name" />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Salesperson')"
                             :options="workersOptions"
                             hide-selected
@@ -77,7 +77,7 @@ function handleLocation(data, location) {
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Business type')"
                             :options="businessTypesOptions"
                             hide-selected
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 593b45509..17c1a7c39 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
@@ -65,7 +65,7 @@ const zones = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="workers">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Salesperson')"
                         v-model="params.salesPersonFk"
                         @update:model-value="searchFn()"
@@ -88,7 +88,7 @@ const zones = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="provinces">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Province')"
                         v-model="params.provinceFk"
                         @update:model-value="searchFn()"
@@ -135,7 +135,7 @@ const zones = ref();
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
                     <QItemSection v-if="zones">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Zone')"
                             v-model="params.zoneFk"
                             @update:model-value="searchFn()"
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
index f26af5975..322a8bd2b 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
@@ -6,7 +6,7 @@ import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -48,7 +48,7 @@ const authors = ref();
         <template #body="{ params }">
             <QItem class="q-mb-sm q-mt-sm">
                 <QItemSection v-if="clients">
-                    <VnSelectFilter
+                    <VnSelect
                         :input-debounce="0"
                         :label="t('Client')"
                         :options="clients"
@@ -71,7 +71,7 @@ const authors = ref();
 
             <QItem class="q-mb-sm">
                 <QItemSection v-if="salespersons">
-                    <VnSelectFilter
+                    <VnSelect
                         :input-debounce="0"
                         :label="t('Salesperson')"
                         :options="salespersons"
@@ -94,7 +94,7 @@ const authors = ref();
 
             <QItem class="q-mb-sm">
                 <QItemSection v-if="countries">
-                    <VnSelectFilter
+                    <VnSelect
                         :input-debounce="0"
                         :label="t('Country')"
                         :options="countries"
@@ -137,7 +137,7 @@ const authors = ref();
 
             <QItem class="q-mb-sm">
                 <QItemSection v-if="authors">
-                    <VnSelectFilter
+                    <VnSelect
                         :input-debounce="0"
                         :label="t('Author')"
                         :options="authors"
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
index df898e7c1..1be20f26c 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import { dateRange } from 'src/filters';
@@ -169,7 +169,7 @@ const shouldRenderColumn = (colName) => {
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
                     <QItemSection v-if="clients">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Social name')"
                             v-model="params.socialName"
                             @update:model-value="searchFn()"
@@ -201,7 +201,7 @@ const shouldRenderColumn = (colName) => {
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="workers">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="
                             t('customer.extendedList.tableVisibleColumns.salesPersonFk')
                         "
@@ -270,7 +270,7 @@ const shouldRenderColumn = (colName) => {
             </QItem>
             <QItem v-if="shouldRenderColumn('countryFk')">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('customer.extendedList.tableVisibleColumns.countryFk')"
                         v-model="params.countryFk"
                         @update:model-value="searchFn()"
@@ -287,7 +287,7 @@ const shouldRenderColumn = (colName) => {
             </QItem>
             <QItem v-if="shouldRenderColumn('provinceFk')">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('customer.extendedList.tableVisibleColumns.provinceFk')"
                         v-model="params.provinceFk"
                         @update:model-value="searchFn()"
@@ -342,7 +342,7 @@ const shouldRenderColumn = (colName) => {
             </QItem>
             <QItem v-if="shouldRenderColumn('businessTypeFk')">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="
                             t('customer.extendedList.tableVisibleColumns.businessTypeFk')
                         "
@@ -361,7 +361,7 @@ const shouldRenderColumn = (colName) => {
             </QItem>
             <QItem v-if="shouldRenderColumn('payMethodFk')">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="
                             t('customer.extendedList.tableVisibleColumns.payMethodFk')
                         "
@@ -380,7 +380,7 @@ const shouldRenderColumn = (colName) => {
             </QItem>
             <QItem v-if="shouldRenderColumn('sageTaxTypeFk')">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="
                             t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk')
                         "
@@ -399,7 +399,7 @@ const shouldRenderColumn = (colName) => {
             </QItem>
             <QItem v-if="shouldRenderColumn('sageTransactionTypeFk')">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="
                             t(
                                 'customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'
diff --git a/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
index 957abb7a3..f07c4ca77 100644
--- a/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
+++ b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -51,7 +51,7 @@ const clients = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="clients">
-                    <VnSelectFilter
+                    <VnSelect
                         :input-debounce="0"
                         :label="t('Social name')"
                         :options="clients"
@@ -75,7 +75,7 @@ const clients = ref();
                     <QSkeleton type="QInput" class="full-width" />
                 </QItemSection>
                 <QItemSection v-if="cities">
-                    <VnSelectFilter
+                    <VnSelect
                         :input-debounce="0"
                         :label="t('City')"
                         :options="cities"
diff --git a/src/pages/Customer/components/CustomerConsigneeCreate.vue b/src/pages/Customer/components/CustomerConsigneeCreate.vue
index e4302ed65..23f3dab43 100644
--- a/src/pages/Customer/components/CustomerConsigneeCreate.vue
+++ b/src/pages/Customer/components/CustomerConsigneeCreate.vue
@@ -9,7 +9,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
@@ -103,7 +103,7 @@ function handleLocation(data, location) {
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Agency')"
                         :options="agencyModes"
                         hide-selected
@@ -125,7 +125,7 @@ function handleLocation(data, location) {
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Incoterms')"
                         :options="incoterms"
                         hide-selected
diff --git a/src/pages/Customer/components/CustomerConsigneeEdit.vue b/src/pages/Customer/components/CustomerConsigneeEdit.vue
index afa6afa5d..10ffbba7a 100644
--- a/src/pages/Customer/components/CustomerConsigneeEdit.vue
+++ b/src/pages/Customer/components/CustomerConsigneeEdit.vue
@@ -9,7 +9,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
@@ -157,7 +157,7 @@ function handleLocation(data, location) {
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Agency')"
                         :options="agencyModes"
                         hide-selected
@@ -179,7 +179,7 @@ function handleLocation(data, location) {
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Incoterms')"
                         :options="incoterms"
                         hide-selected
@@ -211,7 +211,7 @@ function handleLocation(data, location) {
                 v-for="(note, index) in notes"
             >
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Observation type')"
                         :options="observationTypes"
                         hide-selected
diff --git a/src/pages/Customer/components/CustomerGreugeCreate.vue b/src/pages/Customer/components/CustomerGreugeCreate.vue
index 1ff467d97..4479c9eee 100644
--- a/src/pages/Customer/components/CustomerGreugeCreate.vue
+++ b/src/pages/Customer/components/CustomerGreugeCreate.vue
@@ -8,7 +8,7 @@ import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -62,7 +62,7 @@ const toCustomerGreuges = () => {
                     <VnInput :label="t('Comment')" v-model="data.description" />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Type')"
                         :options="greugeTypes"
                         hide-selected
diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
index a141618d0..81d6bc1c1 100644
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
@@ -146,7 +146,7 @@ const onDataSaved = async () => {
                         />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Company')"
                             :options="companyOptions"
                             :required="true"
@@ -160,7 +160,7 @@ const onDataSaved = async () => {
 
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Bank')"
                             :options="bankOptions"
                             :required="true"
@@ -179,7 +179,7 @@ const onDataSaved = async () => {
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </div>
                     <div class="col">
                         <VnInput
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index 3b30a97e6..4210a62bc 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -68,7 +68,7 @@ const clientsOptions = ref([]);
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('department.bossDepartment')"
                         v-model="data.workerFk"
                         :options="workersOptions"
@@ -80,7 +80,7 @@ const clientsOptions = ref([]);
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('department.selfConsumptionCustomer')"
                         v-model="data.clientFk"
                         :options="clientsOptions"
diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index 4a8cf154a..6c5299fa9 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import FilterTravelForm from 'src/components/FilterTravelForm.vue';
 
@@ -66,7 +66,7 @@ const onFilterTravelSelected = (formData, id) => {
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.basicData.supplier')"
                         v-model="data.supplierFk"
                         :options="suppliersOptions"
@@ -86,7 +86,7 @@ const onFilterTravelSelected = (formData, id) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
                 <div class="col">
                     <VnSelectDialog
@@ -138,7 +138,7 @@ const onFilterTravelSelected = (formData, id) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.basicData.company')"
                         v-model="data.companyFk"
                         :options="companiesOptions"
@@ -152,7 +152,7 @@ const onFilterTravelSelected = (formData, id) => {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.basicData.currency')"
                         v-model="data.currencyFk"
                         :options="currenciesOptions"
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 0208b49ba..1e1e0f118 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -6,7 +6,7 @@ import { QBtn } from 'quasar';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
@@ -59,7 +59,7 @@ const tableColumnComponents = computed(() => ({
         event: getInputEvents,
     },
     packagingFk: {
-        component: VnSelectFilter,
+        component: VnSelect,
         props: {
             'option-value': 'id',
             'option-label': 'id',
diff --git a/src/pages/Entry/Card/EntryBuysImport.vue b/src/pages/Entry/Card/EntryBuysImport.vue
index 3e0ac1410..139f300c2 100644
--- a/src/pages/Entry/Card/EntryBuysImport.vue
+++ b/src/pages/Entry/Card/EntryBuysImport.vue
@@ -6,7 +6,7 @@ import { useI18n } from 'vue-i18n';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import FilterItemForm from 'src/components/FilterItemForm.vue';
 
@@ -274,7 +274,7 @@ const redirectToBuysView = () => {
                         </template>
                         <template #body-cell-packagingFk="{ row, col }">
                             <QTd auto-width>
-                                <VnSelectFilter
+                                <VnSelect
                                     v-model="row[col.field]"
                                     :options="col.options"
                                     :option-value="col.optionValue"
diff --git a/src/pages/Entry/Card/EntryNotes.vue b/src/pages/Entry/Card/EntryNotes.vue
index 02a0c020a..1aac82bea 100644
--- a/src/pages/Entry/Card/EntryNotes.vue
+++ b/src/pages/Entry/Card/EntryNotes.vue
@@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
 import CrudModel from 'components/CrudModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -50,7 +50,7 @@ onMounted(() => {
                     :key="index"
                     class="row q-gutter-md q-mb-md"
                 >
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('entry.notes.observationType')"
                         v-model="row.observationTypeFk"
                         :options="entryObservationsOptions"
diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
index 8c434217a..b04b8e8b7 100644
--- a/src/pages/Entry/EntryCreate.vue
+++ b/src/pages/Entry/EntryCreate.vue
@@ -5,7 +5,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
@@ -80,7 +80,7 @@ const redirectToEntryBasicData = (_, { id }) => {
             <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Supplier')"
                             class="full-width"
                             v-model="data.supplierFk"
@@ -101,12 +101,12 @@ const redirectToEntryBasicData = (_, { id }) => {
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </div>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Travel')"
                             class="full-width"
                             v-model="data.travelFk"
@@ -133,12 +133,12 @@ const redirectToEntryBasicData = (_, { id }) => {
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </div>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Company')"
                             class="full-width"
                             v-model="data.companyFk"
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index 22ddf0bbf..b8308ad85 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -3,7 +3,7 @@ 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 VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
@@ -92,7 +92,7 @@ const suppliersOptions = ref([]);
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.companyFk')"
                         v-model="params.companyFk"
                         @update:model-value="searchFn()"
@@ -108,7 +108,7 @@ const suppliersOptions = ref([]);
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.currencyFk')"
                         v-model="params.currencyFk"
                         @update:model-value="searchFn()"
@@ -124,7 +124,7 @@ const suppliersOptions = ref([]);
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.supplierFk')"
                         v-model="params.supplierFk"
                         @update:model-value="searchFn()"
@@ -145,7 +145,7 @@ const suppliersOptions = ref([]);
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 876fe6a9e..d565ecaad 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -9,7 +9,7 @@ import EntryDescriptorProxy from './Card/EntryDescriptorProxy.vue';
 import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import EditTableCellValueForm from 'src/components/EditTableCellValueForm.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
 import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
 
@@ -218,7 +218,7 @@ const columns = computed(() => [
         align: 'left',
         sortable: true,
         columnFilter: {
-            component: VnSelectFilter,
+            component: VnSelect,
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -237,7 +237,7 @@ const columns = computed(() => [
         align: 'left',
         sortable: true,
         columnFilter: {
-            component: VnSelectFilter,
+            component: VnSelect,
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -256,7 +256,7 @@ const columns = computed(() => [
         align: 'left',
         sortable: true,
         columnFilter: {
-            component: VnSelectFilter,
+            component: VnSelect,
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -309,7 +309,7 @@ const columns = computed(() => [
         align: 'left',
         sortable: true,
         columnFilter: {
-            component: VnSelectFilter,
+            component: VnSelect,
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -513,7 +513,7 @@ const columns = computed(() => [
         align: 'left',
         sortable: true,
         columnFilter: {
-            component: VnSelectFilter,
+            component: VnSelect,
             type: 'select',
             filterValue: null,
             event: getInputEvents,
diff --git a/src/pages/Entry/EntryLatestBuysFilter.vue b/src/pages/Entry/EntryLatestBuysFilter.vue
index 5eaf001d8..5a03da1f6 100644
--- a/src/pages/Entry/EntryLatestBuysFilter.vue
+++ b/src/pages/Entry/EntryLatestBuysFilter.vue
@@ -6,7 +6,7 @@ import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
 import axios from 'axios';
@@ -210,7 +210,7 @@ const removeTag = (index, params, search) => {
             </QItem>
             <QItem class="q-my-md">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.typeFk')"
                         v-model="params.typeFk"
                         :options="itemTypesOptions"
@@ -238,13 +238,13 @@ const removeTag = (index, params, search) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QSeparator />
             <QItem class="q-my-md">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.salesPersonFk')"
                         v-model="params.salesPersonFk"
                         :options="itemTypeWorkersOptions"
@@ -260,7 +260,7 @@ const removeTag = (index, params, search) => {
             </QItem>
             <QItem class="q-my-md">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.supplier')"
                         v-model="params.supplierFk"
                         :options="suppliersOptions"
@@ -282,7 +282,7 @@ const removeTag = (index, params, search) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem class="q-my-md">
@@ -340,7 +340,7 @@ const removeTag = (index, params, search) => {
                 class="q-mt-md filter-value"
             >
                 <QItemSection class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.tag')"
                         v-model="value.selectedTag"
                         :options="tagOptions"
@@ -355,7 +355,7 @@ const removeTag = (index, params, search) => {
                     />
                 </QItemSection>
                 <QItemSection class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         v-if="!value?.selectedTag?.isFree && value.valueOptions"
                         :label="t('params.value')"
                         v-model="value.value"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index f557c8ef4..0a676b500 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -7,7 +7,7 @@ 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 VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'src/components/FetchData.vue';
 
 import axios from 'axios';
@@ -183,7 +183,7 @@ async function upsert() {
         <template #form="{ data }">
             <div class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('supplierFk')"
                         v-model="data.supplierFk"
                         option-value="id"
@@ -202,7 +202,7 @@ async function upsert() {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
                 <div class="col">
                     <QInput
@@ -401,7 +401,7 @@ async function upsert() {
             </div>
             <div class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Currency')"
                         v-model="data.currencyFk"
                         :options="currencies"
@@ -410,7 +410,7 @@ async function upsert() {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         v-if="companiesRef"
                         :label="t('Company')"
                         v-model="data.companyFk"
@@ -451,7 +451,7 @@ async function upsert() {
                         clearable
                         clear-icon="close"
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         class="full-width q-pa-xs"
                         :label="`${t('Company')}*`"
                         v-model="dms.companyId"
@@ -462,7 +462,7 @@ async function upsert() {
                     />
                 </QItem>
                 <QItem>
-                    <VnSelectFilter
+                    <VnSelect
                         class="full-width q-pa-xs"
                         :label="`${t('Warehouse')}*`"
                         v-model="dms.warehouseId"
@@ -471,7 +471,7 @@ async function upsert() {
                         option-label="name"
                         :rules="[requiredFieldRule]"
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         class="full-width q-pa-xs"
                         :label="`${t('Type')}*`"
                         v-model="dms.dmsTypeId"
@@ -560,7 +560,7 @@ async function upsert() {
                         :label="t('Reference')"
                         v-model="dms.reference"
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         class="full-width q-pa-xs"
                         :label="`${t('Company')}*`"
                         v-model="dms.companyId"
@@ -571,7 +571,7 @@ async function upsert() {
                     />
                 </QItem>
                 <QItem>
-                    <VnSelectFilter
+                    <VnSelect
                         class="full-width q-pa-xs"
                         :label="`${t('Warehouse')}*`"
                         v-model="dms.warehouseId"
@@ -580,7 +580,7 @@ async function upsert() {
                         option-label="name"
                         :rules="[requiredFieldRule]"
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         class="full-width q-pa-xs"
                         :label="`${t('Type')}*`"
                         v-model="dms.dmsTypeId"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue b/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
index 6c05171e7..285bd635c 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
@@ -6,7 +6,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 import { useCapitalize } from 'src/composables/useCapitalize';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const router = useRouter();
 const route = useRoute();
@@ -117,7 +117,7 @@ const onSave = (data) => data.deletes && router.push(`/invoice-in/${invoiceId}/s
             >
                 <template #body-cell-type="{ row, col }">
                     <QTd>
-                        <VnSelectFilter
+                        <VnSelect
                             class="q-pb-md"
                             v-model="row[col.model]"
                             :options="col.options"
@@ -129,7 +129,7 @@ const onSave = (data) => data.deletes && router.push(`/invoice-in/${invoiceId}/s
                 </template>
                 <template #body-cell-class="{ row, col }">
                     <QTd>
-                        <VnSelectFilter
+                        <VnSelect
                             class="q-pb-md"
                             v-model="row[col.model]"
                             :options="col.options"
@@ -142,7 +142,7 @@ const onSave = (data) => data.deletes && router.push(`/invoice-in/${invoiceId}/s
                 </template>
                 <template #body-cell-reason="{ row, col }">
                     <QTd>
-                        <VnSelectFilter
+                        <VnSelect
                             class="q-pb-md"
                             v-model="row[col.model]"
                             :options="col.options"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 5adaeca94..ef43b54cd 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -15,7 +15,7 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import FetchData from 'src/components/FetchData.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import { useCapitalize } from 'src/composables/useCapitalize';
 
 const $props = defineProps({
@@ -480,7 +480,7 @@ const createInvoiceInCorrection = async () => {
                             v-model="entityId"
                             readonly
                         />
-                        <VnSelectFilter
+                        <VnSelect
                             :label="`${useCapitalize(t('globals.class'))}*`"
                             v-model="correctionFormData.invoiceClass"
                             :options="siiTypeInvoiceOuts"
@@ -490,7 +490,7 @@ const createInvoiceInCorrection = async () => {
                         />
                     </QItemSection>
                     <QItemSection>
-                        <VnSelectFilter
+                        <VnSelect
                             :label="`${useCapitalize(t('globals.type'))}*`"
                             v-model="correctionFormData.invoiceType"
                             :options="cplusRectificationTypes"
@@ -498,7 +498,7 @@ const createInvoiceInCorrection = async () => {
                             option-label="description"
                             :rules="[requiredFieldRule]"
                         />
-                        <VnSelectFilter
+                        <VnSelect
                             :label="`${useCapitalize(t('globals.reason'))}*`"
                             v-model="correctionFormData.invoiceReason"
                             :options="invoiceCorrectionTypes"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index e36cd97b6..2f015f65c 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -7,7 +7,7 @@ import { toDate } from 'src/filters';
 import { useArrayData } from 'src/composables/useArrayData';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnCurrency from 'src/components/common/VnCurrency.vue';
 
 const route = useRoute();
@@ -144,7 +144,7 @@ async function insert() {
                 </template>
                 <template #body-cell-bank="{ row, col }">
                     <QTd>
-                        <VnSelectFilter
+                        <VnSelect
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
@@ -159,7 +159,7 @@ async function insert() {
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </QTd>
                 </template>
                 <template #body-cell-amount="{ row }">
@@ -241,7 +241,7 @@ async function insert() {
                                     </QInput>
                                 </QItem>
                                 <QItem>
-                                    <VnSelectFilter
+                                    <VnSelect
                                         :label="t('Bank')"
                                         class="full-width"
                                         v-model="props.row['bankFk']"
@@ -258,7 +258,7 @@ async function insert() {
                                                 </QItemSection>
                                             </QItem>
                                         </template>
-                                    </VnSelectFilter>
+                                    </VnSelect>
                                 </QItem>
                                 <QItem>
                                     <QInput
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 58f521534..38d97bd42 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import { toCurrency } from 'src/filters';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
 const { t } = useI18n();
@@ -148,7 +148,7 @@ function getTotal(type) {
                     </template>
                     <template #body-cell-code="{ row, col }">
                         <QTd>
-                            <VnSelectFilter
+                            <VnSelect
                                 v-model="row[col.model]"
                                 :options="col.options"
                                 option-value="id"
@@ -160,12 +160,12 @@ function getTotal(type) {
                                         {{ `${scope.opt.id}: ${scope.opt.description}` }}
                                     </QItem>
                                 </template>
-                            </VnSelectFilter>
+                            </VnSelect>
                         </QTd>
                     </template>
                     <template #body-cell-country="{ row, col }">
                         <QTd>
-                            <VnSelectFilter
+                            <VnSelect
                                 v-model="row[col.model]"
                                 :options="col.options"
                                 option-value="id"
@@ -182,7 +182,7 @@ function getTotal(type) {
                                 <QSeparator />
                                 <QList>
                                     <QItem>
-                                        <VnSelectFilter
+                                        <VnSelect
                                             :label="t('code')"
                                             class="full-width"
                                             v-model="props.row['intrastatFk']"
@@ -198,7 +198,7 @@ function getTotal(type) {
                                                     }}
                                                 </QItem>
                                             </template>
-                                        </VnSelectFilter>
+                                        </VnSelect>
                                     </QItem>
                                     <QItem
                                         v-for="(value, index) of [
@@ -217,7 +217,7 @@ function getTotal(type) {
                                         />
                                     </QItem>
                                     <QItem>
-                                        <VnSelectFilter
+                                        <VnSelect
                                             :label="t('country')"
                                             class="full-width"
                                             v-model="props.row['countryFk']"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 8915a96ec..e4a54b7bf 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -7,7 +7,7 @@ import axios from 'axios';
 import { useArrayData } from 'src/composables/useArrayData';
 import { toCurrency } from 'src/filters';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import CrudModel from 'src/components/CrudModel.vue';
 import VnCurrency from 'src/components/common/VnCurrency.vue';
 
@@ -191,7 +191,7 @@ async function addExpense() {
             >
                 <template #body-cell-expense="{ row, col }">
                     <QTd auto-width>
-                        <VnSelectFilter
+                        <VnSelect
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
@@ -221,7 +221,7 @@ async function addExpense() {
                                     </QTooltip>
                                 </QBtn>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </QTd>
                 </template>
                 <template #body-cell-taxablebase="{ row }">
@@ -240,7 +240,7 @@ async function addExpense() {
                 </template>
                 <template #body-cell-sageiva="{ row, col }">
                     <QTd>
-                        <VnSelectFilter
+                        <VnSelect
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
@@ -259,12 +259,12 @@ async function addExpense() {
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </QTd>
                 </template>
                 <template #body-cell-sagetransaction="{ row, col }">
                     <QTd>
-                        <VnSelectFilter
+                        <VnSelect
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
@@ -285,7 +285,7 @@ async function addExpense() {
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </QTd>
                 </template>
                 <template #body-cell-foreignvalue="{ row }">
@@ -308,7 +308,7 @@ async function addExpense() {
                             <QSeparator />
                             <QList>
                                 <QItem>
-                                    <VnSelectFilter
+                                    <VnSelect
                                         :label="t('Expense')"
                                         class="full-width"
                                         v-model="props.row['expenseFk']"
@@ -322,7 +322,7 @@ async function addExpense() {
                                                 {{ `${scope.opt.id}: ${scope.opt.name}` }}
                                             </QItem>
                                         </template>
-                                    </VnSelectFilter>
+                                    </VnSelect>
                                 </QItem>
                                 <QItem>
                                     <VnCurrency
@@ -340,7 +340,7 @@ async function addExpense() {
                                     />
                                 </QItem>
                                 <QItem>
-                                    <VnSelectFilter
+                                    <VnSelect
                                         :label="t('Sage iva')"
                                         class="full-width"
                                         v-model="props.row['taxTypeSageFk']"
@@ -361,10 +361,10 @@ async function addExpense() {
                                                 </QItemSection>
                                             </QItem>
                                         </template>
-                                    </VnSelectFilter>
+                                    </VnSelect>
                                 </QItem>
                                 <QItem>
-                                    <VnSelectFilter
+                                    <VnSelect
                                         class="full-width"
                                         v-model="props.row['transactionTypeSageFk']"
                                         :options="sageTransactionTypes"
@@ -384,7 +384,7 @@ async function addExpense() {
                                                 </QItemSection>
                                             </QItem>
                                         </template>
-                                    </VnSelectFilter>
+                                    </VnSelect>
                                 </QItem>
                                 <QItem>
                                     {{ toCurrency(taxRate(props.row)) }}
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 8f8213f1c..5b55ac59e 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -80,7 +80,7 @@ const suppliersRef = ref();
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.supplierFk')"
                         v-model="params.supplierFk"
                         :options="suppliers"
@@ -91,7 +91,7 @@ const suppliersRef = ref();
                         outlined
                         rounded
                     >
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index a000d6d4f..78ec03a16 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { storeToRefs } from 'pinia';
 
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
 import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
@@ -83,7 +83,7 @@ onMounted(async () => {
                 :dark="true"
                 class="q-mb-sm"
             />
-            <VnSelectFilter
+            <VnSelect
                 v-if="clientsToInvoice === 'one'"
                 :label="t('client')"
                 v-model="formData.clientId"
@@ -105,7 +105,7 @@ onMounted(async () => {
                 :label="t('maxShipped')"
                 is-outlined
             />
-            <VnSelectFilter
+            <VnSelect
                 :label="t('company')"
                 v-model="formData.companyFk"
                 :options="companiesOptions"
@@ -116,7 +116,7 @@ onMounted(async () => {
                 outlined
                 rounded
             />
-            <VnSelectFilter
+            <VnSelect
                 :label="t('printer')"
                 v-model="formData.printer"
                 :options="printersOptions"
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 402df1173..04748a8c8 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -7,7 +7,7 @@ import axios from 'axios';
 import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
 const { t } = useI18n();
@@ -238,7 +238,7 @@ const getCategoryClass = (category, params) => {
             </QItem>
             <QItem class="q-my-md">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.type')"
                         v-model="params.typeFk"
                         :options="typeList"
@@ -267,13 +267,13 @@ const getCategoryClass = (category, params) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QSeparator />
             <QItem class="q-my-md">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.order')"
                         v-model="selectedOrder"
                         :options="orderList || []"
@@ -293,7 +293,7 @@ const getCategoryClass = (category, params) => {
             </QItem>
             <QItem class="q-mb-md">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.order')"
                         v-model="selectedOrderField"
                         :options="OrderFields || []"
@@ -314,7 +314,7 @@ const getCategoryClass = (category, params) => {
             <QSeparator />
             <QItem class="q-mt-md">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.tag')"
                         v-model="selectedTag"
                         :options="props.tags || []"
@@ -340,7 +340,7 @@ const getCategoryClass = (category, params) => {
                     is-outlined
                     class="filter-input"
                 />
-                <VnSelectFilter
+                <VnSelect
                     v-else
                     :label="t('params.value')"
                     v-model="value.value"
diff --git a/src/pages/Order/Card/OrderFilter.vue b/src/pages/Order/Card/OrderFilter.vue
index 62bfe0e02..347affb04 100644
--- a/src/pages/Order/Card/OrderFilter.vue
+++ b/src/pages/Order/Card/OrderFilter.vue
@@ -3,7 +3,7 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 
@@ -75,7 +75,7 @@ const sourceList = ref(null);
             </QItem>
             <QItem>
                 <QItemSection v-if="agencyList">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('agency')"
                         v-model="params.agencyModeFk"
                         :options="agencyList"
@@ -96,7 +96,7 @@ const sourceList = ref(null);
             </QItem>
             <QItem>
                 <QItemSection v-if="salesPersonList">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('salesPerson')"
                         v-model="params.workerFk"
                         :options="salesPersonList"
@@ -120,7 +120,7 @@ const sourceList = ref(null);
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
                 <QItemSection v-else>
                     <QSkeleton type="QInput" class="full-width" />
@@ -160,7 +160,7 @@ const sourceList = ref(null);
             </QItem>
             <QItem>
                 <QItemSection v-if="sourceList">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('application')"
                         v-model="params.sourceApp"
                         :options="sourceList"
diff --git a/src/pages/Order/Card/OrderForm.vue b/src/pages/Order/Card/OrderForm.vue
index 42aee7640..fa868fbed 100644
--- a/src/pages/Order/Card/OrderForm.vue
+++ b/src/pages/Order/Card/OrderForm.vue
@@ -7,7 +7,7 @@ import { useState } from 'composables/useState';
 import FormModel from 'components/FormModel.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
@@ -127,7 +127,7 @@ const orderFilter = {
             <template #form="{ data }">
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('order.form.clientFk')"
                             v-model="data.clientFk"
                             :options="clientList"
@@ -147,10 +147,10 @@ const orderFilter = {
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('order.form.addressFk')"
                             v-model="data.addressFk"
                             :options="addressList"
@@ -173,7 +173,7 @@ const orderFilter = {
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </div>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
@@ -190,7 +190,7 @@ const orderFilter = {
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('order.form.agencyModeFk')"
                             v-model="data.agencyModeFk"
                             :options="agencyList"
@@ -199,7 +199,7 @@ const orderFilter = {
                             hide-selected
                             :disable="!agencyList?.length"
                         >
-                        </VnSelectFilter>
+                        </VnSelect>
                     </div>
                 </VnRow>
             </template>
diff --git a/src/pages/Route/Card/RouteAutonomousFilter.vue b/src/pages/Route/Card/RouteAutonomousFilter.vue
index ec30458ce..eb3fa6f2c 100644
--- a/src/pages/Route/Card/RouteAutonomousFilter.vue
+++ b/src/pages/Route/Card/RouteAutonomousFilter.vue
@@ -3,7 +3,7 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 
@@ -87,7 +87,7 @@ const exprBuilder = (param, value) => {
                 </QItem>
                 <QItem class="q-my-sm" v-if="agencyList">
                     <QItemSection>
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Agency route')"
                             v-model="params.agencyModeFk"
                             :options="agencyList"
@@ -106,7 +106,7 @@ const exprBuilder = (param, value) => {
                 </QItem>
                 <QItem class="q-my-sm" v-if="agencyAgreementList">
                     <QItemSection>
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Agency agreement')"
                             v-model="params.agencyFk"
                             :options="agencyAgreementList"
@@ -125,7 +125,7 @@ const exprBuilder = (param, value) => {
                 </QItem>
                 <QItem class="q-my-sm" v-if="supplierList">
                     <QItemSection>
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Autonomous')"
                             v-model="params.supplierFk"
                             :options="supplierList"
@@ -172,7 +172,11 @@ const exprBuilder = (param, value) => {
                 </QItem>
                 <QItem class="q-my-sm">
                     <QItemSection>
-                        <VnInput v-model="params.packages" :label="t('Packages')" is-outlined />
+                        <VnInput
+                            v-model="params.packages"
+                            :label="t('Packages')"
+                            is-outlined
+                        />
                     </QItemSection>
                 </QItem>
                 <QItem class="q-my-sm">
@@ -192,7 +196,11 @@ const exprBuilder = (param, value) => {
                 </QItem>
                 <QItem class="q-my-sm">
                     <QItemSection>
-                        <VnInput v-model="params.invoiceInFk" :label="t('Received')" is-outlined />
+                        <VnInput
+                            v-model="params.invoiceInFk"
+                            :label="t('Received')"
+                            is-outlined
+                        />
                     </QItemSection>
                 </QItem>
             </QList>
diff --git a/src/pages/Route/Card/RouteFilter.vue b/src/pages/Route/Card/RouteFilter.vue
index 4be1981ab..a4b95935f 100644
--- a/src/pages/Route/Card/RouteFilter.vue
+++ b/src/pages/Route/Card/RouteFilter.vue
@@ -3,7 +3,7 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 
@@ -63,7 +63,7 @@ const warehouseList = ref([]);
         <template #body="{ params }">
             <QItem class="q-my-sm">
                 <QItemSection v-if="workerList">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Worker')"
                         v-model="params.workerFk"
                         :options="workerList"
@@ -87,12 +87,12 @@ const warehouseList = ref([]);
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem class="q-my-sm">
                 <QItemSection v-if="agencyList">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Agency')"
                         v-model="params.agencyModeFk"
                         :options="agencyList"
@@ -148,7 +148,7 @@ const warehouseList = ref([]);
             </QItem>
             <QItem class="q-my-sm">
                 <QItemSection v-if="vehicleList">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Vehicle')"
                         v-model="params.vehicleFk"
                         :options="vehicleList"
@@ -171,7 +171,7 @@ const warehouseList = ref([]);
             </QItem>
             <QItem class="q-my-sm">
                 <QItemSection v-if="vehicleList">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Warehouse')"
                         v-model="params.warehouseFk"
                         :options="warehouseList"
diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 60693cbf1..5119b8fbc 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -6,13 +6,13 @@ import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import axios from 'axios';
 import VnInputTime from 'components/common/VnInputTime.vue';
-import RouteSearchbar from "pages/Route/Card/RouteSearchbar.vue";
-import {useStateStore} from "stores/useStateStore";
+import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
+import { useStateStore } from 'stores/useStateStore';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -123,7 +123,7 @@ const onSave = (data, response) => {
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Worker')"
                         v-model="data.workerFk"
                         :options="workerList"
@@ -144,10 +144,10 @@ const onSave = (data, response) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Vehicle')"
                         v-model="data.vehicleFk"
                         :options="vehicleList"
@@ -162,7 +162,7 @@ const onSave = (data, response) => {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Agency')"
                         v-model="data.agencyModeFk"
                         :options="agencyList"
diff --git a/src/pages/Route/Roadmap/RoadmapAddStopForm.vue b/src/pages/Route/Roadmap/RoadmapAddStopForm.vue
index 6793e4513..736280e99 100644
--- a/src/pages/Route/Roadmap/RoadmapAddStopForm.vue
+++ b/src/pages/Route/Roadmap/RoadmapAddStopForm.vue
@@ -2,7 +2,7 @@
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 import VnInput from 'components/common/VnInput.vue';
@@ -38,7 +38,7 @@ const isDialog = computed(() => props.layout === 'dialog');
     />
     <div :class="[isDialog ? 'column' : 'form-gap', 'full-width flex']">
         <QCardSection class="flex-grow q-px-none flex-1">
-            <VnSelectFilter
+            <VnSelect
                 v-model.number="form.warehouseFk"
                 class="full-width"
                 :label="t('Warehouse')"
diff --git a/src/pages/Route/Roadmap/RoadmapBasicData.vue b/src/pages/Route/Roadmap/RoadmapBasicData.vue
index 8b10f5e57..b9df0bdd7 100644
--- a/src/pages/Route/Roadmap/RoadmapBasicData.vue
+++ b/src/pages/Route/Roadmap/RoadmapBasicData.vue
@@ -7,9 +7,9 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
-import {ref} from "vue";
+import { ref } from 'vue';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -69,7 +69,7 @@ const onSave = (data, response) => {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Carrier')"
                         v-model="data.supplierFk"
                         :options="supplierList"
@@ -89,7 +89,7 @@ const onSave = (data, response) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
                 <div class="col">
                     <VnInput
@@ -109,11 +109,7 @@ const onSave = (data, response) => {
                     />
                 </div>
                 <div class="col">
-                    <VnInput
-                        v-model="data.phone"
-                        :label="t('Phone')"
-                        clearable
-                    />
+                    <VnInput v-model="data.phone" :label="t('Phone')" clearable />
                 </div>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/pages/Route/Roadmap/RoadmapFilter.vue b/src/pages/Route/Roadmap/RoadmapFilter.vue
index b3fb7bf34..04c5c9696 100644
--- a/src/pages/Route/Roadmap/RoadmapFilter.vue
+++ b/src/pages/Route/Roadmap/RoadmapFilter.vue
@@ -3,7 +3,7 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 
@@ -90,7 +90,7 @@ const exprBuilder = (param, value) => {
             </QItem>
             <QItem v-if="supplierList" class="q-my-sm">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Carrier')"
                         v-model="params.supplierFk"
                         :options="supplierList"
@@ -113,7 +113,7 @@ const exprBuilder = (param, value) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem class="q-my-sm">
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 94c05ad54..c165b4d43 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -4,7 +4,7 @@ import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { dashIfEmpty, toHour } from 'src/filters';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import { useValidator } from 'composables/useValidator';
 import VnInputDate from 'components/common/VnInputDate.vue';
@@ -280,7 +280,7 @@ const openTicketsDialog = (id) => {
                         >
                             <template #body-cell-worker="{ row }">
                                 <QTd>
-                                    <VnSelectFilter
+                                    <VnSelect
                                         :label="t('Worker')"
                                         v-model="row.workerFk"
                                         :options="workers"
@@ -308,12 +308,12 @@ const openTicketsDialog = (id) => {
                                                 </QItemSection>
                                             </QItem>
                                         </template>
-                                    </VnSelectFilter>
+                                    </VnSelect>
                                 </QTd>
                             </template>
                             <template #body-cell-agency="{ row }">
                                 <QTd>
-                                    <VnSelectFilter
+                                    <VnSelect
                                         :label="t('Agency')"
                                         v-model="row.agencyModeFk"
                                         :options="agencyList"
@@ -330,7 +330,7 @@ const openTicketsDialog = (id) => {
                             </template>
                             <template #body-cell-vehicle="{ row }">
                                 <QTd>
-                                    <VnSelectFilter
+                                    <VnSelect
                                         :label="t('Vehicle')"
                                         v-model="row.vehicleFk"
                                         :options="vehicleList"
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index 69c180e0a..54f8580bd 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -4,7 +4,7 @@ import { reactive, ref, onMounted, onBeforeMount } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModel from 'components/FormModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
index 17786c1ea..ccd1cafd3 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
@@ -4,7 +4,7 @@ import { reactive, ref } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 
@@ -47,7 +47,7 @@ const onDataSaved = () => {
             <template #form="{ data }">
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('supplier.agencyTerms.agencyFk')"
                             v-model="data.agencyFk"
                             :options="agenciesOptions"
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 01741dd77..6a1d747d5 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -39,7 +39,7 @@ const workersOptions = ref([]);
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('supplier.basicData.workerFk')"
                         v-model="data.workerFk"
                         :options="workersOptions"
@@ -66,7 +66,7 @@ const workersOptions = ref([]);
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
index 26b6e5461..e6e61d339 100644
--- a/src/pages/Supplier/Card/SupplierBillingData.vue
+++ b/src/pages/Supplier/Card/SupplierBillingData.vue
@@ -6,7 +6,7 @@ import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -38,7 +38,7 @@ const formatPayDems = (data) => {
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('supplier.billingData.payMethodFk')"
                         v-model="data.payMethodFk"
                         :options="paymethodsOptions"
@@ -49,7 +49,7 @@ const formatPayDems = (data) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('supplier.billingData.payDemFk')"
                         v-model="data.payDemFk"
                         :options="payDemsOptions"
diff --git a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
index 339a9d0d9..781f8347a 100644
--- a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
+++ b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
@@ -3,7 +3,7 @@ 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 VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
@@ -78,7 +78,7 @@ const itemCategoriesOptions = ref([]);
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.buyerId')"
                         v-model="params.buyerId"
                         @update:model-value="searchFn()"
@@ -94,7 +94,7 @@ const itemCategoriesOptions = ref([]);
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.typeId')"
                         v-model="params.typeId"
                         @update:model-value="searchFn()"
@@ -116,12 +116,12 @@ const itemCategoriesOptions = ref([]);
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.categoryId')"
                         v-model="params.categoryId"
                         @update:model-value="searchFn()"
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index e633334c9..8aeebaebd 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 
 const route = useRoute();
@@ -81,7 +81,7 @@ function handleLocation(data, location) {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('supplier.fiscalData.sageTaxTypeFk')"
                         v-model="data.sageTaxTypeFk"
                         :options="sageTaxTypesOptions"
@@ -94,7 +94,7 @@ function handleLocation(data, location) {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('supplier.fiscalData.sageWithholdingFk')"
                         v-model="data.sageWithholdingFk"
                         :options="sageWithholdingsOptions"
@@ -105,7 +105,7 @@ function handleLocation(data, location) {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('supplier.fiscalData.sageTransactionTypeFk')"
                         v-model="data.sageTransactionTypeFk"
                         :options="sageTransactionTypesOptions"
@@ -118,7 +118,7 @@ function handleLocation(data, location) {
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('supplier.fiscalData.supplierActivityFk')"
                         v-model="data.supplierActivityFk"
                         :options="supplierActivitiesOptions"
diff --git a/src/pages/Supplier/SupplierListFilter.vue b/src/pages/Supplier/SupplierListFilter.vue
index ff90df6e1..471ca7e53 100644
--- a/src/pages/Supplier/SupplierListFilter.vue
+++ b/src/pages/Supplier/SupplierListFilter.vue
@@ -3,7 +3,7 @@ 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 VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 
@@ -70,7 +70,7 @@ const countriesOptions = ref([]);
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.provinceFk')"
                         v-model="params.provinceFk"
                         @update:model-value="searchFn()"
@@ -86,7 +86,7 @@ const countriesOptions = ref([]);
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.countryFk')"
                         v-model="params.countryFk"
                         @update:model-value="searchFn()"
diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index 2edaac853..f8c03a609 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
 const route = useRoute();
@@ -36,7 +36,7 @@ const agenciesOptions = ref([]);
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('travel.basicData.agency')"
                         v-model="data.agencyModeFk"
                         :options="agenciesOptions"
@@ -63,7 +63,7 @@ const agenciesOptions = ref([]);
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('travel.basicData.warehouseOut')"
                         v-model="data.warehouseOutFk"
                         :options="agenciesOptions"
@@ -74,7 +74,7 @@ const agenciesOptions = ref([]);
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('travel.basicData.warehouseIn')"
                         v-model="data.warehouseInFk"
                         :options="agenciesOptions"
diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 4462846cb..3464a29b3 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -4,7 +4,7 @@ import { reactive, ref, onBeforeMount } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -268,7 +268,7 @@ const onThermographCreated = async (data) => {
                         />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('travel.thermographs.type')"
                             v-model="thermographForm.dmsTypeId"
                             :options="dmsTypesOptions"
@@ -279,7 +279,7 @@ const onThermographCreated = async (data) => {
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('travel.thermographs.company')"
                             v-model="thermographForm.companyId"
                             :options="companiesOptions"
@@ -288,7 +288,7 @@ const onThermographCreated = async (data) => {
                         />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('travel.thermographs.warehouse')"
                             v-model="thermographForm.warehouseId"
                             :options="warehousesOptions"
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 0b8975165..7fe628180 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
@@ -113,7 +113,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.agencyModeFk')"
                         v-model="params.agencyModeFk"
                         @update:model-value="searchFn()"
@@ -149,7 +149,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.warehouseOutFk')"
                         v-model="params.warehouseOutFk"
                         @update:model-value="searchFn()"
@@ -165,7 +165,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.warehouseInFk')"
                         v-model="params.warehouseInFk"
                         @update:model-value="searchFn()"
@@ -181,7 +181,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('supplier.pageTitles.supplier')"
                         v-model="params.cargoSupplierFk"
                         @update:model-value="searchFn()"
@@ -197,7 +197,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.continent')"
                         v-model="params.continent"
                         @update:model-value="searchFn()"
diff --git a/src/pages/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
index abee03562..c8c26684c 100644
--- a/src/pages/Travel/TravelCreate.vue
+++ b/src/pages/Travel/TravelCreate.vue
@@ -4,7 +4,7 @@ import { reactive, ref, onBeforeMount } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -72,7 +72,7 @@ const redirectToTravelBasicData = (_, { id }) => {
                         <VnInput v-model="data.ref" :label="t('globals.reference')" />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('globals.agency')"
                             v-model="data.agencyModeFk"
                             :options="agenciesOptions"
@@ -95,7 +95,7 @@ const redirectToTravelBasicData = (_, { id }) => {
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('globals.wareHouseOut')"
                             v-model="data.warehouseOutFk"
                             :options="warehousesOptions"
@@ -105,7 +105,7 @@ const redirectToTravelBasicData = (_, { id }) => {
                         />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('globals.wareHouseIn')"
                             v-model="data.warehouseInFk"
                             :options="warehousesOptions"
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index c1c0d1bee..a91ade1b7 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -3,7 +3,7 @@ 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 VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
@@ -71,7 +71,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.agencyModeFk')"
                         v-model="params.agencyModeFk"
                         @update:model-value="searchFn()"
@@ -87,7 +87,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.warehouseOutFk')"
                         v-model="params.warehouseOutFk"
                         @update:model-value="searchFn()"
@@ -103,7 +103,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.warehouseInFk')"
                         v-model="params.warehouseInFk"
                         @update:model-value="searchFn()"
@@ -167,7 +167,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.continent')"
                         v-model="params.continent"
                         @update:model-value="searchFn()"
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index ef8c3fe8e..5e7c89326 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -4,7 +4,7 @@ import { useRoute } from 'vue-router';
 import { onMounted, ref, computed } from 'vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import { useRole } from 'src/composables/useRole';
@@ -107,7 +107,7 @@ onMounted(async () => await fetchCurrentDeviceRef.value.fetch());
                     </template>
                 </QField>
 
-                <VnSelectFilter
+                <VnSelect
                     v-else
                     :label="t('worker.pda.newPDA')"
                     v-model="data.pda"
@@ -128,7 +128,7 @@ onMounted(async () => await fetchCurrentDeviceRef.value.fetch());
                             </QItemSection>
                         </QItem>
                     </template>
-                </VnSelectFilter>
+                </VnSelect>
             </template>
         </FormModel>
     </QPage>
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index eef29a8a4..6c2c9f36e 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -6,7 +6,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
 import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
@@ -194,7 +194,7 @@ onMounted(async () => {
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('worker.create.company')"
                             v-model="data.companyFk"
                             :options="companiesOptions"
@@ -205,7 +205,7 @@ onMounted(async () => {
                         />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('worker.create.boss')"
                             v-model="data.bossFk"
                             :options="workersOptions"
@@ -225,12 +225,12 @@ onMounted(async () => {
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </div>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('worker.create.payMethods')"
                             v-model="data.payMethodFk"
                             :options="payMethodsOptions"

From 6391ed1360aa7092e026245a7dbc03cfbc97cc06 Mon Sep 17 00:00:00 2001
From: jcasado <jcasado.verdnatura@gmail.com>
Date: Wed, 24 Apr 2024 11:26:32 +0200
Subject: [PATCH 12/38] refs #6697 changes claim

---
 src/pages/Claim/Card/ClaimLines.vue       | 3 ---
 src/pages/Claim/Card/ClaimLinesImport.vue | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index 4a1d9c9d0..6fda6c3cc 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -20,7 +20,6 @@ const { t } = useI18n();
 const stateStore = useStateStore();
 const arrayData = useArrayData('ClaimLines');
 const store = arrayData.store;
-let claimedDefault = 0;
 const claimFilter = {
     fields: ['ticketFk'],
 };
@@ -79,7 +78,6 @@ const columns = computed(() => [
         label: t('Claimed'),
         field: (row) => row.quantity,
         sortable: true,
-        default: 0,
     },
     {
         name: 'description',
@@ -282,7 +280,6 @@ function showImportDialog() {
                                                         {{ column.value }}
                                                         <QPopupEdit
                                                             v-model="props.row.quantity"
-                                                            v-slot="scope"
                                                             :title="t('Claimed quantity')"
                                                             @update:model-value="
                                                                 updateQuantity(props.row)
diff --git a/src/pages/Claim/Card/ClaimLinesImport.vue b/src/pages/Claim/Card/ClaimLinesImport.vue
index be8914eec..77a7d542d 100644
--- a/src/pages/Claim/Card/ClaimLinesImport.vue
+++ b/src/pages/Claim/Card/ClaimLinesImport.vue
@@ -34,6 +34,7 @@ const columns = computed(() => [
         label: t('Quantity'),
         field: (row) => row.quantity,
         sortable: true,
+        default: 0,
     },
     {
         name: 'description',
@@ -74,7 +75,6 @@ async function importLines() {
     const body = sales.map((row) => ({
         claimFk: route.params.id,
         saleFk: row.saleFk,
-        quantity: row.quantity,
     }));
 
     canceller = new AbortController();

From c9ab98471e0f93803a1e460dfbba77581ce7a2c1 Mon Sep 17 00:00:00 2001
From: jcasado <jcasado.verdnatura@gmail.com>
Date: Wed, 24 Apr 2024 12:01:55 +0200
Subject: [PATCH 13/38] refs #6697 fix changes

---
 src/pages/Claim/Card/ClaimLines.vue | 285 +++++++++++++---------------
 1 file changed, 129 insertions(+), 156 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index 3039923be..c4a7db201 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -20,6 +20,7 @@ const { t } = useI18n();
 const stateStore = useStateStore();
 const arrayData = useArrayData('ClaimLines');
 const store = arrayData.store;
+
 const claimFilter = {
     fields: ['ticketFk'],
 };
@@ -179,163 +180,135 @@ function saveWhenHasChanges() {
         @on-fetch="onFetchClaim"
         auto-load
     />
-    <div class="column items-center">
-        <div class="list">
-            <CrudModel
-                data-key="ClaimLines"
-                ref="claimLinesForm"
-                :url="`Claims/${route.params.id}/lines`"
-                save-url="ClaimBeginnings/crud"
-                :filter="linesFilter"
-                @on-fetch="onFetch"
-                @save-changes="onFetch"
-                v-model:selected="selected"
-                :default-save="false"
-                :default-reset="false"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <QTable
-                        :columns="columns"
-                        :rows="rows"
-                        :dense="$q.screen.lt.md"
-                        :pagination="{ rowsPerPage: 0 }"
-                        row-key="id"
-                        selection="multiple"
-                        v-model:selected="selected"
-                        hide-pagination
-                        :grid="$q.screen.lt.md"
-                    >
-                        <template #body-cell-claimed="{ row, value }">
-                            <QTd auto-width align="right" class="text-primary">
-                                <span>{{ value }}</span>
-
-                                <QPopupEdit
-                                    v-model="row.quantity"
-                                    v-slot="scope"
-                                    :title="t('Claimed quantity')"
-                                    @update:model-value="updateQuantity(row)"
-                                    buttons
-                                >
-                                    <QInput
-                                        v-model="scope.value"
-                                        type="number"
-                                        dense
-                                        autofocus
-                                        @keyup.enter="scope.set"
-                                        @focus="($event) => $event.target.select()"
-                                    />
-                                </QPopupEdit>
-                            </QTd>
-                        </template>
-                        <template #body-cell-description="{ row, value }">
-                            <QTd auto-width align="right" class="text-primary">
-                                {{ value }}
-                                <ItemDescriptorProxy
-                                    :id="row.sale.itemFk"
-                                ></ItemDescriptorProxy>
-                            </QTd>
-                        </template>
-                        <template #body-cell-discount="{ row, value, rowIndex }">
-                            <QTd auto-width align="right" class="text-primary">
-                                {{ value }}
-                                <VnDiscount
-                                    :quantity="row.quantity"
-                                    :price="row.sale.price"
-                                    :discount="row.sale.discount"
-                                    :mana="mana"
-                                    :promise="updateDiscount"
-                                    :data="{ saleFk: row.sale.id, rowIndex: rowIndex }"
-                                    @on-update="onUpdateDiscount"
-                                />
-                            </QTd>
-                        </template>
-                        <!-- View for grid mode -->
-                        <template #item="props">
-                            <div
-                                class="q-mb-md col-12 grid-style-transition"
-                                :style="props.selected ? 'transform: scale(0.95);' : ''"
-                            >
-                                <QCard>
-                                    <QCardSection>
-                                        <QCheckbox v-model="props.selected" />
-                                    </QCardSection>
-                                    <QSeparator inset />
-                                    <QList dense>
-                                        <QItem
-                                            v-for="column of props.cols"
-                                            :key="column.name"
-                                        >
-                                            <QItemSection>
-                                                <QItemLabel caption>
-                                                    {{ column.label }}
+    <div class="q-pa-md">
+        <CrudModel
+            data-key="ClaimLines"
+            ref="claimLinesForm"
+            :url="`Claims/${route.params.id}/lines`"
+            save-url="ClaimBeginnings/crud"
+            :filter="linesFilter"
+            @on-fetch="onFetch"
+            @save-changes="onFetch"
+            v-model:selected="selected"
+            :default-save="false"
+            :default-reset="false"
+            auto-load
+            :limit="0"
+        >
+            <template #body="{ rows }">
+                <QTable
+                    :columns="columns"
+                    :rows="rows"
+                    :dense="$q.screen.lt.md"
+                    row-key="id"
+                    selection="multiple"
+                    v-model:selected="selected"
+                    :grid="$q.screen.lt.md"
+                >
+                    <template #body-cell-claimed="{ row }">
+                        <QTd auto-width align="right" class="text-primary">
+                            <QInput
+                                v-model="row.quantity"
+                                type="number"
+                                dense
+                                @keyup.enter="saveWhenHasChanges()"
+                                @blur="saveWhenHasChanges()"
+                            />
+                        </QTd>
+                    </template>
+                    <template #body-cell-description="{ row, value }">
+                        <QTd auto-width align="right" class="text-primary">
+                            {{ value }}
+                            <ItemDescriptorProxy
+                                :id="row.sale.itemFk"
+                            ></ItemDescriptorProxy>
+                        </QTd>
+                    </template>
+                    <template #body-cell-discount="{ row, value, rowIndex }">
+                        <QTd auto-width align="right" class="text-primary">
+                            {{ value }}
+                            <VnDiscount
+                                :quantity="row.quantity"
+                                :price="row.sale.price"
+                                :discount="row.sale.discount"
+                                :mana="mana"
+                                :promise="updateDiscount"
+                                :data="{ saleFk: row.sale.id, rowIndex: rowIndex }"
+                                @on-update="onUpdateDiscount"
+                            />
+                        </QTd>
+                    </template>
+                    <!-- View for grid mode -->
+                    <template #item="props">
+                        <div
+                            class="q-mb-md col-12 grid-style-transition"
+                            :style="props.selected ? 'transform: scale(0.95);' : ''"
+                        >
+                            <QCard>
+                                <QCardSection>
+                                    <QCheckbox v-model="props.selected" />
+                                </QCardSection>
+                                <QSeparator inset />
+                                <QList dense>
+                                    <QItem
+                                        v-for="column of props.cols"
+                                        :key="column.name"
+                                    >
+                                        <QItemSection>
+                                            <QItemLabel caption>
+                                                {{ column.label }}
+                                            </QItemLabel>
+                                        </QItemSection>
+                                        <QItemSection side>
+                                            <template v-if="column.name === 'claimed'">
+                                                <QItemLabel class="text-primary">
+                                                    <QInput
+                                                        v-model="props.row.quantity"
+                                                        type="number"
+                                                        dense
+                                                        autofocus
+                                                        @keyup.enter="
+                                                            saveWhenHasChanges()
+                                                        "
+                                                        @blur="saveWhenHasChanges()"
+                                                    />
                                                 </QItemLabel>
-                                            </QItemSection>
-                                            <QItemSection side>
-                                                <template
-                                                    v-if="column.name === 'claimed'"
-                                                >
-                                                    <QItemLabel class="text-primary">
-                                                        {{ column.value }}
-                                                        <QPopupEdit
-                                                            v-model="props.row.quantity"
-                                                            v-slot="scope"
-                                                            :title="t('Claimed quantity')"
-                                                            @update:model-value="
-                                                                updateQuantity(props.row)
-                                                            "
-                                                            buttons
-                                                        >
-                                                            <QInput
-                                                                v-model="scope.value"
-                                                                type="number"
-                                                                dense
-                                                                autofocus
-                                                                @keyup.enter="scope.set"
-                                                                @focus="
-                                                                    ($event) =>
-                                                                        $event.target.select()
-                                                                "
-                                                            />
-                                                        </QPopupEdit>
-                                                    </QItemLabel>
-                                                </template>
-                                                <template
-                                                    v-else-if="column.name === 'discount'"
-                                                >
-                                                    <QItemLabel class="text-primary">
-                                                        {{ column.value }}
-                                                        <VnDiscount
-                                                            :quantity="props.row.quantity"
-                                                            :price="props.row.sale.price"
-                                                            :discount="
-                                                                props.row.sale.discount
-                                                            "
-                                                            :mana="mana"
-                                                            :promise="updateDiscount"
-                                                            :data="{
-                                                                saleFk: props.row.sale.id,
-                                                                rowIndex: props.rowIndex,
-                                                            }"
-                                                            @on-update="onUpdateDiscount"
-                                                        />
-                                                    </QItemLabel>
-                                                </template>
-                                                <template v-else>
-                                                    <QItemLabel>
-                                                        {{ column.value }}
-                                                    </QItemLabel>
-                                                </template>
-                                            </QItemSection>
-                                        </QItem>
-                                    </QList>
-                                </QCard>
-                            </div>
-                        </template>
-                    </QTable>
-                </template>
-            </CrudModel>
-        </div>
+                                            </template>
+                                            <template
+                                                v-else-if="column.name === 'discount'"
+                                            >
+                                                <QItemLabel class="text-primary">
+                                                    {{ column.value }}
+                                                    <VnDiscount
+                                                        :quantity="props.row.quantity"
+                                                        :price="props.row.sale.price"
+                                                        :discount="
+                                                            props.row.sale.discount
+                                                        "
+                                                        :mana="mana"
+                                                        :promise="updateDiscount"
+                                                        :data="{
+                                                            saleFk: props.row.sale.id,
+                                                            rowIndex: props.rowIndex,
+                                                        }"
+                                                        @on-update="onUpdateDiscount"
+                                                    />
+                                                </QItemLabel>
+                                            </template>
+                                            <template v-else>
+                                                <QItemLabel>
+                                                    {{ column.value }}
+                                                </QItemLabel>
+                                            </template>
+                                        </QItemSection>
+                                    </QItem>
+                                </QList>
+                            </QCard>
+                        </div>
+                    </template>
+                </QTable>
+            </template>
+        </CrudModel>
     </div>
 
     <QPageSticky position="bottom-right" :offset="[25, 25]">

From 6961a048e506b54446be046197462c271ad38fc3 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 24 Apr 2024 13:29:32 +0200
Subject: [PATCH 14/38] refs #6905 fix bank select

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

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 5c143740e..af8689ea0 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -181,12 +181,21 @@ function copyUserToken() {
                 />
                 <VnSelectFilter
                     :label="t('components.userPanel.localBank')"
-                    hide-selected
                     v-model="user.localBankFk"
                     :options="accountBankData"
                     option-label="bank"
                     option-value="id"
-                ></VnSelectFilter>
+                >
+                    <template #option="{ itemProps, opt }">
+                        <QItem v-bind="itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ `${opt.id}: ${opt.bank}` }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelectFilter>
             </VnRow>
             <VnRow>
                 <VnSelectFilter

From 726699bbc5c884a3a2c3b6955d8f680953a0472c Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 24 Apr 2024 10:38:00 -0300
Subject: [PATCH 15/38] Item log

---
 src/i18n/locale/en.yml          |  1 +
 src/i18n/locale/es.yml          |  1 +
 src/pages/Item/Card/ItemLog.vue |  7 +++++++
 src/router/modules/item.js      | 12 +++++++++++-
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Item/Card/ItemLog.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 3ac3d18a0..c36903e20 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1119,6 +1119,7 @@ item:
         tags: Tags
         wasteBreakdown: Waste breakdown
         itemCreate: New item
+        log: Log
     descriptor:
         item: Item
         buyer: Buyer
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 4ecbcdbc0..b20b189e4 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1118,6 +1118,7 @@ item:
         tags: Etiquetas
         wasteBreakdown: Deglose de mermas
         itemCreate: Nuevo artículo
+        log: Historial
     descriptor:
         item: Artículo
         buyer: Comprador
diff --git a/src/pages/Item/Card/ItemLog.vue b/src/pages/Item/Card/ItemLog.vue
new file mode 100644
index 000000000..4da8063c5
--- /dev/null
+++ b/src/pages/Item/Card/ItemLog.vue
@@ -0,0 +1,7 @@
+<script setup>
+import VnLog from 'src/components/common/VnLog.vue';
+</script>
+
+<template>
+    <VnLog model="Item" url="/ItemLogs"></VnLog>
+</template>
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 41f3ec92a..aadb114f7 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -6,12 +6,13 @@ export default {
     meta: {
         title: 'items',
         icon: 'vn:item',
+        moduleName: 'Item',
     },
     component: RouterView,
     redirect: { name: 'ItemMain' },
     menus: {
         main: ['ItemList', 'WasteBreakdown'],
-        card: ['ItemBasicData'],
+        card: ['ItemBasicData', 'ItemLog'],
     },
     children: [
         {
@@ -94,6 +95,15 @@ export default {
                     },
                     component: () => import('src/pages/Item/Card/ItemBasicData.vue'),
                 },
+                {
+                    path: 'log',
+                    name: 'ItemLog',
+                    meta: {
+                        title: 'log',
+                        icon: 'history',
+                    },
+                    component: () => import('src/pages/Item/Card/ItemLog.vue'),
+                },
             ],
         },
     ],

From aa58838ad705f7e155714a99cec04200e73cb3df Mon Sep 17 00:00:00 2001
From: jcasado <jcasado.verdnatura@gmail.com>
Date: Thu, 25 Apr 2024 08:34:40 +0200
Subject: [PATCH 16/38] refs: #6764 rename VnSelect

---
 src/components/UserPanel.vue                  | 14 ++++++-------
 .../Customer/Card/CustomerFiscalData.vue      |  2 +-
 .../components/CustomerAddressCreate.vue      |  6 +++---
 .../CustomerFileManagementCreate.vue          |  8 ++++----
 .../components/CustomerFileManagementEdit.vue |  8 ++++----
 .../components/CustomerSamplesCreate.vue      | 10 +++++-----
 src/pages/Item/ItemCreate.vue                 | 16 +++++++--------
 src/pages/Item/ItemList.vue                   | 12 +++++------
 src/pages/Parking/Card/ParkingBasicData.vue   |  4 ++--
 src/pages/Parking/ParkingFilter.vue           |  4 ++--
 src/pages/Ticket/TicketCreate.vue             | 14 ++++++-------
 src/pages/Worker/Card/WorkerBasicData.vue     | 20 +++++++++++--------
 .../Worker/Card/WorkerCalendarFilter.vue      |  8 ++++----
 src/pages/Worker/Card/WorkerTimeForm.vue      |  4 ++--
 14 files changed, 67 insertions(+), 63 deletions(-)

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 5c143740e..fce41ef99 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -7,7 +7,7 @@ import axios from 'axios';
 import { useState } from 'src/composables/useState';
 import { useSession } from 'src/composables/useSession';
 import { localeEquivalence } from 'src/i18n/index';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 
@@ -172,24 +172,24 @@ function copyUserToken() {
         <QSeparator inset class="q-mx-lg" />
         <div class="col q-gutter-xs q-pa-md">
             <VnRow>
-                <VnSelectFilter
+                <VnSelect
                     :label="t('components.userPanel.localWarehouse')"
                     v-model="user.localWarehouseFk"
                     :options="warehousesData"
                     option-label="name"
                     option-value="id"
                 />
-                <VnSelectFilter
+                <VnSelect
                     :label="t('components.userPanel.localBank')"
                     hide-selected
                     v-model="user.localBankFk"
                     :options="accountBankData"
                     option-label="bank"
                     option-value="id"
-                ></VnSelectFilter>
+                ></VnSelect>
             </VnRow>
             <VnRow>
-                <VnSelectFilter
+                <VnSelect
                     :label="t('components.userPanel.localCompany')"
                     hide-selected
                     v-model="user.companyFk"
@@ -197,7 +197,7 @@ function copyUserToken() {
                     option-label="code"
                     option-value="id"
                 />
-                <VnSelectFilter
+                <VnSelect
                     :label="t('components.userPanel.userWarehouse')"
                     hide-selected
                     v-model="user.warehouseFk"
@@ -207,7 +207,7 @@ function copyUserToken() {
                 />
             </VnRow>
             <VnRow>
-                <VnSelectFilter
+                <VnSelect
                     :label="t('components.userPanel.userCompany')"
                     hide-selected
                     v-model="user.companyFk"
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index c1570db68..467ea1845 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -97,7 +97,7 @@ function handleLocation(data, location) {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </div>
             </VnRow>
 
diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 752024944..d92377f54 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -9,7 +9,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
@@ -101,7 +101,7 @@ function handleLocation(data, location) {
             />
 
             <div class="row justify-between q-gutter-md q-mb-md">
-                <VnSelectFilter
+                <VnSelect
                     :label="t('Agency')"
                     :options="agencyModes"
                     :rules="validate('route.agencyFk')"
@@ -121,7 +121,7 @@ function handleLocation(data, location) {
             </div>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnSelectFilter
+                <VnSelect
                     :label="t('Incoterms')"
                     :options="incoterms"
                     hide-selected
diff --git a/src/pages/Customer/components/CustomerFileManagementCreate.vue b/src/pages/Customer/components/CustomerFileManagementCreate.vue
index 8970eaaaf..bc218d1b2 100644
--- a/src/pages/Customer/components/CustomerFileManagementCreate.vue
+++ b/src/pages/Customer/components/CustomerFileManagementCreate.vue
@@ -11,7 +11,7 @@ import useNotify from 'src/composables/useNotify';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
 const { notify } = useNotify();
@@ -152,7 +152,7 @@ const toCustomerFileManagement = () => {
                         />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Company')"
                             :options="optionsCompanies"
                             :rules="validate('entry.companyFk')"
@@ -165,7 +165,7 @@ const toCustomerFileManagement = () => {
 
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Warehouse')"
                             :options="optionsWarehouses"
                             option-label="name"
@@ -174,7 +174,7 @@ const toCustomerFileManagement = () => {
                         />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Type')"
                             :options="optionsDmsTypes"
                             option-label="name"
diff --git a/src/pages/Customer/components/CustomerFileManagementEdit.vue b/src/pages/Customer/components/CustomerFileManagementEdit.vue
index b5e0d4b7d..d21305e32 100644
--- a/src/pages/Customer/components/CustomerFileManagementEdit.vue
+++ b/src/pages/Customer/components/CustomerFileManagementEdit.vue
@@ -10,7 +10,7 @@ import useNotify from 'src/composables/useNotify';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
 const { notify } = useNotify();
@@ -128,7 +128,7 @@ const toCustomerFileManagement = () => {
                         />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Company')"
                             :options="optionsCompanies"
                             :rules="validate('entry.companyFk')"
@@ -141,7 +141,7 @@ const toCustomerFileManagement = () => {
 
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Warehouse')"
                             :options="optionsWarehouses"
                             option-label="name"
@@ -150,7 +150,7 @@ const toCustomerFileManagement = () => {
                         />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Type')"
                             :options="optionsDmsTypes"
                             option-label="name"
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 4a28a3061..be614aa0b 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -12,7 +12,7 @@ import useNotify from 'src/composables/useNotify';
 
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import CustomerSamplesPreview from 'src/pages/Customer/components/CustomerSamplesPreview.vue';
@@ -253,7 +253,7 @@ const toCustomerSamples = () => {
         <QCard class="card-width q-pa-lg">
             <QForm>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('Sample')"
                         :options="optionsSamplesVisible"
                         @update:model-value="setSampleType"
@@ -306,7 +306,7 @@ const toCustomerSamples = () => {
                     v-if="sampleType?.hasCompany || sampleType?.datepickerEnabled"
                 >
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Company')"
                             :options="optionsCompanies"
                             :rules="validate('entry.companyFk')"
@@ -319,7 +319,7 @@ const toCustomerSamples = () => {
                         />
                     </div>
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('Address')"
                             :options="optionsClientsAddressess"
                             hide-selected
@@ -345,7 +345,7 @@ const toCustomerSamples = () => {
                                     <QTooltip>{{ t('Edit address') }}</QTooltip>
                                 </QIcon>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </div>
                 </VnRow>
 
diff --git a/src/pages/Item/ItemCreate.vue b/src/pages/Item/ItemCreate.vue
index 18e7522cb..baa51414c 100644
--- a/src/pages/Item/ItemCreate.vue
+++ b/src/pages/Item/ItemCreate.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -90,7 +90,7 @@ onBeforeMount(async () => {
                         v-model="data.provisionalName"
                         :label="t('item.create.name')"
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('item.create.tag')"
                         v-model="data.tag"
                         :options="tagsOptions"
@@ -98,7 +98,7 @@ onBeforeMount(async () => {
                         option-label="name"
                         hide-selected
                     />
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('item.create.priority')"
                         v-model="data.priority"
                         :options="validPriorities"
@@ -108,7 +108,7 @@ onBeforeMount(async () => {
                     />
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('item.create.type')"
                         v-model="data.typeFk"
                         :options="itemTypesOptions"
@@ -131,8 +131,8 @@ onBeforeMount(async () => {
                                 </QItemLabel>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
-                    <VnSelectFilter
+                    </VnSelect>
+                    <VnSelect
                         :label="t('item.create.intrastat')"
                         v-model="data.intrastatFk"
                         :options="intrastatsOptions"
@@ -152,10 +152,10 @@ onBeforeMount(async () => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('item.create.origin')"
                         v-model="data.originFk"
                         :options="originsOptions"
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 3e399e29f..b4e0173a4 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ItemSummary from '../Item/Card/ItemSummary.vue';
@@ -201,7 +201,7 @@ const columns = computed(() => [
         align: 'left',
         sortable: true,
         columnFilter: {
-            component: VnSelectFilter,
+            component: VnSelect,
             filterParamKey: 'typeFk',
             type: 'select',
             filterValue: null,
@@ -222,7 +222,7 @@ const columns = computed(() => [
         align: 'left',
         sortable: true,
         columnFilter: {
-            component: VnSelectFilter,
+            component: VnSelect,
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -242,7 +242,7 @@ const columns = computed(() => [
         align: 'left',
         sortable: true,
         columnFilter: {
-            component: VnSelectFilter,
+            component: VnSelect,
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -261,7 +261,7 @@ const columns = computed(() => [
         align: 'left',
         sortable: true,
         columnFilter: {
-            component: VnSelectFilter,
+            component: VnSelect,
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -280,7 +280,7 @@ const columns = computed(() => [
         align: 'left',
         sortable: true,
         columnFilter: {
-            component: VnSelectFilter,
+            component: VnSelect,
             filterParamKey: 'buyerFk',
             type: 'select',
             filterValue: null,
diff --git a/src/pages/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
index 26a1ed8be..81598e0a7 100644
--- a/src/pages/Parking/Card/ParkingBasicData.vue
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -7,7 +7,7 @@ import FetchData from 'src/components/FetchData.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModel from 'components/FormModel.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -40,7 +40,7 @@ const filter = {
                 <VnInput v-model="data.column" :label="t('parking.column')" />
             </VnRow>
             <VnRow>
-                <VnSelectFilter
+                <VnSelect
                     v-model="data.sectorFk"
                     option-value="id"
                     option-label="description"
diff --git a/src/pages/Parking/ParkingFilter.vue b/src/pages/Parking/ParkingFilter.vue
index 2e559a879..1d7c3a4b6 100644
--- a/src/pages/Parking/ParkingFilter.vue
+++ b/src/pages/Parking/ParkingFilter.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 defineProps({
@@ -45,7 +45,7 @@ const emit = defineEmits(['search']);
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         v-model="params.sectorFk"
                         option-value="id"
                         option-label="description"
diff --git a/src/pages/Ticket/TicketCreate.vue b/src/pages/Ticket/TicketCreate.vue
index 3fb9c0083..cb3e46d6a 100644
--- a/src/pages/Ticket/TicketCreate.vue
+++ b/src/pages/Ticket/TicketCreate.vue
@@ -6,7 +6,7 @@ import { useI18n } from 'vue-i18n';
 import FormModel from 'components/FormModel.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
@@ -134,7 +134,7 @@ const redirectToTicketList = (_, { id }) => {
             <template #form="{ data }">
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('ticket.create.client')"
                             v-model="data.clientId"
                             :options="clientOptions"
@@ -155,12 +155,12 @@ const redirectToTicketList = (_, { id }) => {
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </div>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('ticket.create.address')"
                             v-model="data.addressId"
                             :options="addressesOptions"
@@ -182,7 +182,7 @@ const redirectToTicketList = (_, { id }) => {
                                     </QItemSection>
                                 </QItem>
                             </template>
-                        </VnSelectFilter>
+                        </VnSelect>
                     </div>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
@@ -197,7 +197,7 @@ const redirectToTicketList = (_, { id }) => {
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('ticket.create.warehouse')"
                             v-model="data.warehouseId"
                             :options="warehousesOptions"
@@ -210,7 +210,7 @@ const redirectToTicketList = (_, { id }) => {
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectFilter
+                        <VnSelect
                             :label="t('ticket.create.agency')"
                             v-model="data.agencyModeId"
                             :options="agenciesOptions"
diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index 775472065..3295a2234 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -7,7 +7,7 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'src/components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -27,7 +27,7 @@ const workerFilter = {
         },
         { relation: 'sip', scope: { fields: ['extension', 'secret'] } },
         { relation: 'department', scope: { include: { relation: 'department' } } },
-        { relation: 'client', scope: {fields:['phone']} },
+        { relation: 'client', scope: { fields: ['phone'] } },
     ],
 };
 const workersFilter = {
@@ -87,11 +87,15 @@ const maritalStatus = [
                     :label="t('Mobile extension')"
                     clearable
                 />
-                <VnInput v-model="data.client.phone" :label="t('Personal phone')" clearable />
+                <VnInput
+                    v-model="data.client.phone"
+                    :label="t('Personal phone')"
+                    clearable
+                />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnSelectFilter
+                <VnSelect
                     :label="t('Boss')"
                     :options="workersOptions"
                     hide-selected
@@ -110,8 +114,8 @@ const maritalStatus = [
                             </QItemSection>
                         </QItem>
                     </template>
-                </VnSelectFilter>
-                <VnSelectFilter
+                </VnSelect>
+                <VnSelect
                     :label="t('Marital status')"
                     :options="maritalStatus"
                     hide-selected
@@ -122,7 +126,7 @@ const maritalStatus = [
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnSelectFilter
+                <VnSelect
                     :label="t('Origin country')"
                     :options="countriesOptions"
                     hide-selected
@@ -130,7 +134,7 @@ const maritalStatus = [
                     option-value="id"
                     v-model="data.originCountryFk"
                 />
-                <VnSelectFilter
+                <VnSelect
                     :label="t('Education level')"
                     :options="educationLevelsOptions"
                     hide-selected
diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index 374762ac1..2b81b6eaf 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -2,7 +2,7 @@
 import WorkerEventLabel from 'pages/Worker/Card/WorkerEventLabel.vue';
 import FetchData from 'components/FetchData.vue';
 import { useI18n } from 'vue-i18n';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import { useRoute } from 'vue-router';
 import { computed, ref } from 'vue';
 import { toDateFormat } from '../../../filters/date';
@@ -150,7 +150,7 @@ const yearList = ref(generateYears());
     <QList dense class="list q-gutter-y-sm q-my-lg">
         <QItem>
             <QItemSection>
-                <VnSelectFilter
+                <VnSelect
                     :label="t('Year')"
                     v-model="selectedYear"
                     :options="yearList"
@@ -164,7 +164,7 @@ const yearList = ref(generateYears());
         </QItem>
         <QItem>
             <QItemSection>
-                <VnSelectFilter
+                <VnSelect
                     :label="t('Contract')"
                     v-model="selectedBusinessFk"
                     :options="contractList"
@@ -191,7 +191,7 @@ const yearList = ref(generateYears());
                             </QItemSection>
                         </QItem>
                     </template>
-                </VnSelectFilter>
+                </VnSelect>
             </QItemSection>
         </QItem>
     </QList>
diff --git a/src/pages/Worker/Card/WorkerTimeForm.vue b/src/pages/Worker/Card/WorkerTimeForm.vue
index d6c893ad1..0a58a04ca 100644
--- a/src/pages/Worker/Card/WorkerTimeForm.vue
+++ b/src/pages/Worker/Card/WorkerTimeForm.vue
@@ -3,7 +3,7 @@ import { reactive, ref, computed, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 
@@ -84,7 +84,7 @@ onBeforeMount(() => {
                 :required="true"
                 :is-clearable="false"
             />
-            <VnSelectFilter
+            <VnSelect
                 :label="t('Type')"
                 v-model="data.direction"
                 :options="entryDirections"

From 4b3df372cdeb7dc66bc66db7277858b935a762ca Mon Sep 17 00:00:00 2001
From: jcasado <jcasado.verdnatura@gmail.com>
Date: Thu, 25 Apr 2024 08:49:40 +0200
Subject: [PATCH 17/38] refs: #6764 fixConflicts

---
 src/components/ItemsFilterPanel.vue     | 359 ++++++++++++++
 src/components/common/VnCard.vue        |  78 +++
 src/pages/Claim/locale/es.yml           |   2 +
 src/pages/InvoiceIn/locale/es.yml       |   2 +
 src/pages/InvoiceOut/locale/es.yml      |   2 +
 src/pages/Item/ItemFixedPrice.vue       | 605 ++++++++++++++++++++++++
 src/pages/Item/ItemFixedPriceFilter.vue | 108 +++++
 src/pages/Supplier/locale/es.yml        |   1 +
 src/pages/Ticket/locale/es.yml          |   2 +
 src/pages/Worker/locale/es.yml          |   2 +
 10 files changed, 1161 insertions(+)
 create mode 100644 src/components/ItemsFilterPanel.vue
 create mode 100644 src/components/common/VnCard.vue
 create mode 100644 src/pages/Claim/locale/es.yml
 create mode 100644 src/pages/InvoiceIn/locale/es.yml
 create mode 100644 src/pages/InvoiceOut/locale/es.yml
 create mode 100644 src/pages/Item/ItemFixedPrice.vue
 create mode 100644 src/pages/Item/ItemFixedPriceFilter.vue
 create mode 100644 src/pages/Supplier/locale/es.yml
 create mode 100644 src/pages/Ticket/locale/es.yml
 create mode 100644 src/pages/Worker/locale/es.yml

diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue
new file mode 100644
index 000000000..f7f07a5b0
--- /dev/null
+++ b/src/components/ItemsFilterPanel.vue
@@ -0,0 +1,359 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnInput from 'components/common/VnInput.vue';
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
+
+import axios from 'axios';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+    customTags: {
+        type: Array,
+        default: () => [],
+    },
+    exprBuilder: {
+        type: Function,
+        default: null,
+    },
+});
+
+const itemCategories = ref([]);
+const selectedCategoryFk = ref(null);
+const selectedTypeFk = ref(null);
+const itemTypesOptions = ref([]);
+const suppliersOptions = ref([]);
+const tagOptions = ref([]);
+const tagValues = ref([]);
+
+const categoryList = computed(() => {
+    return (itemCategories.value || [])
+        .filter((category) => category.display)
+        .map((category) => ({
+            ...category,
+            icon: `vn:${(category.icon || '').split('-')[1]}`,
+        }));
+});
+
+const selectedCategory = computed(() =>
+    (itemCategories.value || []).find(
+        (category) => category?.id === selectedCategoryFk.value
+    )
+);
+
+const selectedType = computed(() => {
+    return (itemTypesOptions.value || []).find(
+        (type) => type?.id === selectedTypeFk.value
+    );
+});
+
+const selectCategory = async (params, categoryId, search) => {
+    if (params.categoryFk === categoryId) {
+        resetCategory(params);
+        search();
+        return;
+    }
+    selectedCategoryFk.value = categoryId;
+    params.categoryFk = categoryId;
+    await fetchItemTypes(categoryId);
+    search();
+};
+
+const resetCategory = (params) => {
+    selectedCategoryFk.value = null;
+    itemTypesOptions.value = null;
+    if (params) {
+        params.categoryFk = null;
+        params.typeFk = null;
+    }
+};
+
+const applyTags = (params, search) => {
+    params.tags = tagValues.value
+        .filter((tag) => tag.selectedTag && tag.value)
+        .map((tag) => ({
+            tagFk: tag.selectedTag.id,
+            tagName: tag.selectedTag.name,
+            value: tag.value,
+        }));
+    search();
+};
+
+const fetchItemTypes = async (id) => {
+    try {
+        const filter = {
+            fields: ['id', 'name', 'categoryFk'],
+            where: { categoryFk: id },
+            include: 'category',
+            order: 'name ASC',
+        };
+        const { data } = await axios.get('ItemTypes', {
+            params: { filter: JSON.stringify(filter) },
+        });
+        itemTypesOptions.value = data;
+    } catch (err) {
+        console.error('Error fetching item types', err);
+    }
+};
+
+const getCategoryClass = (category, params) => {
+    if (category.id === params?.categoryFk) {
+        return 'active';
+    }
+};
+
+const getSelectedTagValues = async (tag) => {
+    try {
+        tag.value = null;
+        const filter = {
+            fields: ['value'],
+            order: 'value ASC',
+            limit: 30,
+        };
+
+        const params = { filter: JSON.stringify(filter) };
+        const { data } = await axios.get(`Tags/${tag.selectedTag.id}/filterValue`, {
+            params,
+        });
+        tag.valueOptions = data;
+    } catch (err) {
+        console.error('Error getting selected tag values');
+    }
+};
+
+const removeTag = (index, params, search) => {
+    (tagValues.value || []).splice(index, 1);
+    applyTags(params, search);
+};
+</script>
+
+<template>
+    <FetchData
+        url="ItemCategories"
+        limit="30"
+        auto-load
+        @on-fetch="(data) => (itemCategories = data)"
+    />
+    <FetchData
+        url="Suppliers"
+        limit="30"
+        auto-load
+        :filter="{ fields: ['id', 'name', 'nickname'], order: 'name ASC', limit: 30 }"
+        @on-fetch="(data) => (suppliersOptions = data)"
+    />
+    <FetchData
+        url="Tags"
+        :filter="{ fields: ['id', 'name', 'isFree'] }"
+        auto-load
+        limit="30"
+        @on-fetch="(data) => (tagOptions = data)"
+    />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :expr-builder="exprBuilder"
+        :custom-tags="customTags"
+    >
+        <template #tags="{ tag, formatFn }">
+            <strong v-if="tag.label === 'categoryFk'">
+                {{ t(selectedCategory?.name || '') }}
+            </strong>
+            <strong v-else-if="tag.label === 'typeFk'">
+                {{ t(selectedType?.name || '') }}
+            </strong>
+            <div v-else class="q-gutter-x-xs">
+                <strong>{{ t(`components.itemsFilterPanel.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #customTags="{ tags, params }">
+            <template v-for="tag in tags" :key="tag.label">
+                <VnFilterPanelChip
+                    v-for="chip in tag.value"
+                    :key="chip"
+                    removable
+                    @remove="removeTagChip(chip, params, searchFn)"
+                >
+                    <div class="q-gutter-x-xs">
+                        <strong>{{ chip.tagName }}: </strong>
+                        <span>"{{ chip.value }}"</span>
+                    </div>
+                </VnFilterPanelChip>
+            </template>
+        </template>
+        <template #body="{ params, searchFn }">
+            <QItem class="category-filter q-mt-md">
+                <QBtn
+                    dense
+                    flat
+                    round
+                    v-for="category in categoryList"
+                    :key="category.name"
+                    :class="['category', getCategoryClass(category, params)]"
+                    :icon="category.icon"
+                    @click="selectCategory(params, category.id, searchFn)"
+                >
+                    <QTooltip>
+                        {{ t(category.name) }}
+                    </QTooltip>
+                </QBtn>
+            </QItem>
+            <QItem class="q-my-md">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('components.itemsFilterPanel.typeFk')"
+                        v-model="params.typeFk"
+                        :options="itemTypesOptions"
+                        option-value="id"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        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 />
+            <slot name="body" :params="params" :search-fn="searchFn" />
+            <QItem
+                v-for="(value, index) in tagValues"
+                :key="value"
+                class="q-mt-md filter-value"
+            >
+                <QItemSection class="col">
+                    <VnSelectFilter
+                        :label="t('components.itemsFilterPanel.tag')"
+                        v-model="value.selectedTag"
+                        :options="tagOptions"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        :emit-value="false"
+                        use-input
+                        :is-clearable="false"
+                        @update:model-value="getSelectedTagValues(value)"
+                    />
+                </QItemSection>
+                <QItemSection class="col">
+                    <VnSelectFilter
+                        v-if="!value?.selectedTag?.isFree && value.valueOptions"
+                        :label="t('components.itemsFilterPanel.value')"
+                        v-model="value.value"
+                        :options="value.valueOptions || []"
+                        option-value="value"
+                        option-label="value"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        use-input
+                        :disable="!value"
+                        :is-clearable="false"
+                        @update:model-value="applyTags(params, searchFn)"
+                    />
+                    <VnInput
+                        v-else
+                        v-model="value.value"
+                        :label="t('components.itemsFilterPanel.value')"
+                        :disable="!value"
+                        is-outlined
+                        :is-clearable="false"
+                        @keyup.enter="applyTags(params, searchFn)"
+                    />
+                </QItemSection>
+                <QIcon
+                    name="delete"
+                    class="fill-icon-on-hover q-px-xs"
+                    color="primary"
+                    size="sm"
+                    @click="removeTag(index, params, searchFn)"
+                />
+            </QItem>
+            <QItem class="q-mt-lg">
+                <QIcon
+                    name="add_circle"
+                    class="fill-icon-on-hover q-px-xs"
+                    color="primary"
+                    size="sm"
+                    @click="tagValues.push({})"
+                />
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<style lang="scss" scoped>
+.category-filter {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: center;
+    gap: 12px;
+
+    .category {
+        padding: 8px;
+        width: 60px;
+        height: 60px;
+        font-size: 1.4rem;
+        background-color: var(--vn-accent-color);
+
+        &.active {
+            background-color: $primary;
+        }
+    }
+}
+
+.filter-value {
+    display: flex;
+    align-items: center;
+}
+</style>
+
+<i18n>
+en:
+    params:
+        supplier: Supplier
+        from: From
+        to: To
+        active: Is active
+        visible: Is visible
+        floramondo: Is floramondo
+        salesPersonFk: Buyer
+        categoryFk: Category
+
+es:
+    params:
+        supplier: Proveedor
+        from: Desde
+        to: Hasta
+        active: Activo
+        visible: Visible
+        floramondo: Floramondo
+        salesPersonFk: Comprador
+        categoryFk: Categoría
+</i18n>
diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
new file mode 100644
index 000000000..6d0badffb
--- /dev/null
+++ b/src/components/common/VnCard.vue
@@ -0,0 +1,78 @@
+<script setup>
+import { onBeforeMount, computed } from 'vue';
+import { useRoute, onBeforeRouteUpdate } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useArrayData } from 'src/composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+import useCardSize from 'src/composables/useCardSize';
+import VnSubToolbar from '../ui/VnSubToolbar.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import LeftMenu from 'components/LeftMenu.vue';
+
+const props = defineProps({
+    dataKey: { type: String, required: true },
+    baseUrl: { type: String, default: undefined },
+    customUrl: { type: String, default: undefined },
+    filter: { type: Object, default: () => {} },
+    descriptor: { type: Object, required: true },
+    searchbarDataKey: { type: String, default: undefined },
+    searchbarUrl: { type: String, default: undefined },
+    searchbarLabel: { type: String, default: '' },
+    searchbarInfo: { type: String, default: '' },
+});
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+const route = useRoute();
+const url = computed(() => {
+    if (props.baseUrl) return `${props.baseUrl}/${route.params.id}`;
+    return props.customUrl;
+});
+
+const arrayData = useArrayData(props.dataKey, {
+    url: url.value,
+    filter: props.filter,
+});
+
+onBeforeMount(async () => {
+    if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
+    await arrayData.fetch({ append: false });
+});
+
+if (props.baseUrl) {
+    onBeforeRouteUpdate(async (to, from) => {
+        if (to.params.id !== from.params.id) {
+            arrayData.store.url = `${props.baseUrl}/${route.params.id}`;
+            await arrayData.fetch({ append: false });
+        }
+    });
+}
+</script>
+<template>
+    <Teleport
+        to="#searchbar"
+        v-if="stateStore.isHeaderMounted() && props.searchbarDataKey"
+    >
+        <VnSearchbar
+            :data-key="props.searchbarDataKey"
+            :url="props.searchbarUrl"
+            :label="t(props.searchbarLabel)"
+            :info="t(props.searchbarInfo)"
+        />
+    </Teleport>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <component :is="descriptor" />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <VnSubToolbar />
+            <div :class="[useCardSize(), $attrs.class]">
+                <RouterView />
+            </div>
+        </QPage>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Claim/locale/es.yml b/src/pages/Claim/locale/es.yml
new file mode 100644
index 000000000..710d3485d
--- /dev/null
+++ b/src/pages/Claim/locale/es.yml
@@ -0,0 +1,2 @@
+Search claim: Buscar reclamación
+You can search by claim id or customer name: Puedes buscar por id de la reclamación o nombre del cliente
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
new file mode 100644
index 000000000..d7e38d7fa
--- /dev/null
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -0,0 +1,2 @@
+Search invoice: Buscar factura recibida
+You can search by invoice reference: Puedes buscar por referencia de la factura
diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml
new file mode 100644
index 000000000..b936c7b7e
--- /dev/null
+++ b/src/pages/InvoiceOut/locale/es.yml
@@ -0,0 +1,2 @@
+Search invoice: Buscar factura emitida
+You can search by invoice reference: Puedes buscar por referencia de la factura
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
new file mode 100644
index 000000000..0dd7ca07d
--- /dev/null
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -0,0 +1,605 @@
+<script setup>
+import { onMounted, ref, reactive, computed, onUnmounted, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import EditTableCellValueForm from 'src/components/EditTableCellValueForm.vue';
+import ItemFixedPriceFilter from './ItemFixedPriceFilter.vue';
+import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { dashIfEmpty } from 'src/filters';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useState } from 'src/composables/useState';
+import { toCurrency } from 'filters/index';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+import { useArrayData } from 'composables/useArrayData';
+import { isLower, isBigger } from 'src/filters/date.js';
+
+const stateStore = useStateStore();
+const { t } = useI18n();
+const { openConfirmationModal } = useVnConfirm();
+const state = useState();
+const { notify } = useNotify();
+
+const editTableCellDialogRef = ref(null);
+const user = state.getUser();
+const fixedPrices = ref([]);
+const fixedPricesOriginalData = ref([]);
+const warehousesOptions = ref([]);
+const itemsWithNameOptions = ref([]);
+const rowsSelected = ref([]);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+            return { 'i.name': { like: `%${value}%` } };
+        case 'itemFk':
+        case 'warehouseFk':
+        case 'rate2':
+        case 'rate3':
+            param = `fp.${param}`;
+            return { [param]: value };
+        case 'minPrice':
+            param = `i.${param}`;
+            return { [param]: value };
+    }
+};
+
+const params = reactive({});
+const arrayData = useArrayData('ItemFixedPrices', {
+    url: 'FixedPrices/filter',
+    userParams: params,
+    order: ['itemFk'],
+    exprBuilder: exprBuilder,
+});
+const store = arrayData.store;
+
+const fetchFixedPrices = async () => {
+    await arrayData.fetch({ append: false });
+};
+
+const onFixedPricesFetched = (data) => {
+    fixedPrices.value = data;
+    // el objetivo de guardar una copia de las rows es evitar guardar cambios si la data no cambió al disparar los eventos
+    fixedPricesOriginalData.value = JSON.parse(JSON.stringify(data));
+};
+
+watch(
+    () => store.data,
+    (data) => onFixedPricesFetched(data)
+);
+
+const applyColumnFilter = async (col) => {
+    try {
+        const paramKey = col.columnFilter?.filterParamKey || col.field;
+        params[paramKey] = col.columnFilter.filterValue;
+        await arrayData.addFilter({ params });
+    } catch (err) {
+        console.error('Error applying column filter', err);
+    }
+};
+
+const getColumnInputEvents = (col) => {
+    return col.columnFilter.type === 'select'
+        ? { 'update:modelValue': () => applyColumnFilter(col) }
+        : {
+              'keyup.enter': () => applyColumnFilter(col),
+          };
+};
+
+const defaultColumnFilter = {
+    component: VnInput,
+    type: 'text',
+    filterValue: null,
+    event: getColumnInputEvents,
+    attrs: {
+        dense: true,
+    },
+};
+
+const defaultColumnAttrs = {
+    align: 'left',
+    sortable: true,
+};
+
+const columns = computed(() => [
+    {
+        label: t('item.fixedPrice.itemId'),
+        name: 'itemId',
+        field: 'itemFk',
+        ...defaultColumnAttrs,
+        columnFilter: {
+            ...defaultColumnFilter,
+        },
+    },
+    {
+        label: t('globals.description'),
+        field: 'name',
+        name: 'description',
+        ...defaultColumnAttrs,
+        columnFilter: {
+            ...defaultColumnFilter,
+        },
+    },
+    {
+        label: t('item.fixedPrice.groupingPrice'),
+        field: 'rate2',
+        name: 'groupingPrice',
+        ...defaultColumnAttrs,
+        columnFilter: {
+            ...defaultColumnFilter,
+        },
+        format: (val) => toCurrency(val),
+    },
+    {
+        label: t('item.fixedPrice.packingPrice'),
+        field: 'rate3',
+        name: 'packingPrice',
+        ...defaultColumnAttrs,
+        columnFilter: {
+            ...defaultColumnFilter,
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+
+    {
+        label: t('item.fixedPrice.minPrice'),
+        field: 'minPrice',
+        name: 'minPrice',
+        ...defaultColumnAttrs,
+        columnFilter: {
+            ...defaultColumnFilter,
+        },
+    },
+    {
+        label: t('item.fixedPrice.started'),
+        field: 'started',
+        name: 'started',
+        ...defaultColumnAttrs,
+        columnFilter: null,
+    },
+    {
+        label: t('item.fixedPrice.ended'),
+        field: 'ended',
+        name: 'ended',
+        ...defaultColumnAttrs,
+        columnFilter: null,
+    },
+
+    {
+        label: t('item.fixedPrice.warehouse'),
+        field: 'warehouseFk',
+        name: 'warehouse',
+        ...defaultColumnAttrs,
+        columnFilter: {
+            component: VnSelectFilter,
+            type: 'select',
+            filterValue: null,
+            event: getColumnInputEvents,
+            attrs: {
+                options: warehousesOptions.value,
+                'option-value': 'id',
+                'option-label': 'name',
+                dense: true,
+            },
+        },
+    },
+    { name: 'deleteAction', align: 'center' },
+]);
+
+const editTableFieldsOptions = [
+    {
+        field: 'rate2',
+        label: t('item.fixedPrice.groupingPrice'),
+        component: 'input',
+        attrs: {
+            type: 'number',
+        },
+    },
+    {
+        field: 'rate3',
+        label: t('item.fixedPrice.packingPrice'),
+        component: 'input',
+        attrs: {
+            type: 'number',
+        },
+    },
+    {
+        field: 'minPrice',
+        label: t('item.fixedPrice.minPrice'),
+        component: 'input',
+        attrs: {
+            type: 'number',
+        },
+    },
+    {
+        field: 'hasMinPrice',
+        label: t('item.fixedPrice.hasMinPrice'),
+        component: 'checkbox',
+        attrs: {
+            'false-value': 0,
+            'true-value': 1,
+        },
+    },
+    {
+        field: 'started',
+        label: t('item.fixedPrice.started'),
+        component: 'date',
+    },
+    {
+        field: 'ended',
+        label: t('item.fixedPrice.ended'),
+        component: 'date',
+    },
+    {
+        field: 'warehouseFk',
+        label: t('item.fixedPrice.warehouse'),
+        component: 'select',
+        attrs: {
+            options: [],
+            'option-label': 'name',
+            'option-value': 'id',
+        },
+    },
+];
+
+const getRowUpdateInputEvents = (props, resetMinPrice, inputType = 'text') => {
+    return inputType === 'text'
+        ? {
+              'keyup.enter': () => upsertPrice(props, resetMinPrice),
+              blur: () => upsertPrice(props, resetMinPrice),
+          }
+        : { 'update:modelValue': () => upsertPrice(props, resetMinPrice) };
+};
+
+const validations = (row, rowIndex, col) => {
+    const isNew = !row.id;
+    // Si la row no tiene id significa que fue agregada con addRow y no se ha guardado en la base de datos
+    // Si isNew es falso no se checkea si el valor es igual a la original
+    if (!isNew)
+        if (fixedPricesOriginalData.value[rowIndex][col.field] == row[col.field])
+            return false;
+
+    const requiredFields = ['itemFk', 'started', 'ended', 'rate2', 'rate3'];
+    return requiredFields.every(
+        (field) => row[field] !== null && row[field] !== undefined
+    );
+};
+
+const upsertPrice = async ({ row, col, rowIndex }, resetMinPrice = false) => {
+    if (!validations(row, rowIndex, col)) return;
+
+    try {
+        if (resetMinPrice) row.hasMinPrice = 0;
+
+        const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row);
+        row = data;
+        fixedPricesOriginalData.value[rowIndex][col.field] = row[col.field];
+    } catch (err) {
+        console.error('Error editing price', err);
+    }
+};
+
+const addRow = () => {
+    if (!fixedPrices.value || fixedPrices.value.length === 0) {
+        fixedPrices.value = [];
+
+        const today = Date.vnNew();
+        const millisecsInDay = 86400000;
+        const daysInWeek = 7;
+        const nextWeek = new Date(today.getTime() + daysInWeek * millisecsInDay);
+
+        const newPrice = {
+            started: today,
+            ended: nextWeek,
+            hasMinPrice: 0,
+        };
+
+        fixedPricesOriginalData.value.push({ ...newPrice });
+        fixedPrices.value.push({ ...newPrice });
+        return;
+    }
+
+    const lastItemCopy = JSON.parse(
+        JSON.stringify(fixedPrices.value[fixedPrices.value.length - 1])
+    );
+    const { id, ...restOfItem } = lastItemCopy;
+    fixedPricesOriginalData.value.push(restOfItem);
+    fixedPrices.value.push(restOfItem);
+};
+
+const openEditTableCellDialog = () => {
+    editTableCellDialogRef.value.show();
+};
+
+const onEditCellDataSaved = async () => {
+    rowsSelected.value = [];
+    await fetchFixedPrices();
+};
+
+const onWarehousesFetched = (data) => {
+    warehousesOptions.value = data;
+    // Actualiza las 'options' del elemento con field 'warehouseFk' en 'editTableFieldsOptions'.
+    const warehouseField = editTableFieldsOptions.find(
+        (field) => field.field === 'warehouseFk'
+    );
+    warehouseField.attrs.options = data;
+};
+
+const removePrice = async (id, rowIndex) => {
+    try {
+        await axios.delete(`FixedPrices/${id}`);
+        fixedPrices.value.splice(rowIndex, 1);
+        fixedPricesOriginalData.value.splice(rowIndex, 1);
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (err) {
+        console.error('Error removing price', err);
+    }
+};
+
+const updateMinPrice = async (value, props) => {
+    // El checkbox hasMinPrice se encuentra en la misma columna que el input hasMinPrice
+    // Por lo tanto le mandamos otro objeto con las mismas propiedades pero con el campo 'field' cambiado
+    props.row.hasMinPrice = value;
+    await upsertPrice({
+        row: props.row,
+        col: { field: 'hasMinPrice' },
+        rowIndex: props.rowIndex,
+    });
+};
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    params.warehouseFk = user.value.warehouseFk;
+    await fetchFixedPrices();
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <FetchData
+        url="Warehouses"
+        :filter="{ order: ['name'] }"
+        auto-load
+        @on-fetch="(data) => onWarehousesFetched(data)"
+    />
+    <FetchData
+        url="Items/withName"
+        :filter="{ fields: ['id', 'name'], order: 'id DESC' }"
+        auto-load
+        @on-fetch="(data) => (itemsWithNameOptions = data)"
+    />
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <ItemFixedPriceFilter
+                data-key="ItemFixedPrices"
+                :warehouses-options="warehousesOptions"
+            />
+        </QScrollArea>
+    </QDrawer>
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :rows="fixedPrices"
+            :columns="columns"
+            row-key="id"
+            selection="multiple"
+            v-model:selected="rowsSelected"
+            :pagination="{ rowsPerPage: 0 }"
+            class="full-width q-mt-md"
+            :no-data-label="t('globals.noResults')"
+        >
+            <template #top-row="{ cols }">
+                <QTr>
+                    <QTd />
+                    <QTd
+                        v-for="(col, index) in cols"
+                        :key="index"
+                        style="max-width: 100px"
+                    >
+                        <component
+                            :is="col.columnFilter.component"
+                            v-if="col.columnFilter"
+                            v-model="col.columnFilter.filterValue"
+                            v-bind="col.columnFilter.attrs"
+                            v-on="col.columnFilter.event(col)"
+                            dense
+                        />
+                    </QTd>
+                </QTr>
+            </template>
+
+            <template #body-cell-itemId="props">
+                <QTd>
+                    <VnSelectFilter
+                        :options="itemsWithNameOptions"
+                        hide-selected
+                        option-label="id"
+                        option-value="id"
+                        v-model="props.row.itemFk"
+                        v-on="getRowUpdateInputEvents(props, true, 'select')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                    <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QTd>
+            </template>
+            <template #body-cell-description="{ row }">
+                <QTd class="col">
+                    <span class="link">
+                        {{ row.name }}
+                    </span>
+                    <ItemDescriptorProxy :id="row.itemFk" />
+                    <fetched-tags :item="row" :max-length="6" />
+                </QTd>
+            </template>
+            <template #body-cell-groupingPrice="props">
+                <QTd class="col">
+                    <VnInput
+                        v-model.number="props.row.rate2"
+                        v-on="getRowUpdateInputEvents(props)"
+                    >
+                        <template #append>€</template>
+                    </VnInput>
+                </QTd>
+            </template>
+            <template #body-cell-packingPrice="props">
+                <QTd class="col">
+                    <VnInput
+                        v-model.number="props.row.rate3"
+                        v-on="getRowUpdateInputEvents(props)"
+                    >
+                        <template #append>€</template>
+                    </VnInput>
+                </QTd>
+            </template>
+            <template #body-cell-minPrice="props">
+                <QTd class="col">
+                    <div class="row">
+                        <QCheckbox
+                            class="col"
+                            :model-value="props.row.hasMinPrice"
+                            @update:model-value="updateMinPrice($event, props)"
+                            :false-value="0"
+                            :true-value="1"
+                            :toggle-indeterminate="false"
+                        />
+                        <VnInput
+                            class="col"
+                            :disable="!props.row.hasMinPrice"
+                            v-model.number="props.row.minPrice"
+                            v-on="getRowUpdateInputEvents(props)"
+                            type="number"
+                        />
+                    </div>
+                </QTd>
+            </template>
+            <template #body-cell-started="props">
+                <QTd class="col" style="min-width: 160px">
+                    <VnInputDate
+                        v-model="props.row.started"
+                        v-on="getRowUpdateInputEvents(props, false, 'date')"
+                        v-bind="
+                            isBigger(props.row.started)
+                                ? { 'bg-color': 'warning', 'is-outlined': true }
+                                : {}
+                        "
+                    />
+                </QTd>
+            </template>
+            <template #body-cell-ended="props">
+                <QTd class="col" style="min-width: 150px">
+                    <VnInputDate
+                        v-model="props.row.ended"
+                        v-on="getRowUpdateInputEvents(props, false, 'date')"
+                        v-bind="
+                            isLower(props.row.ended)
+                                ? { 'bg-color': 'warning', 'is-outlined': true }
+                                : {}
+                        "
+                    />
+                </QTd>
+            </template>
+            <template #body-cell-warehouse="props">
+                <QTd class="col">
+                    <VnSelectFilter
+                        :options="warehousesOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="props.row.warehouseFk"
+                        v-on="getRowUpdateInputEvents(props, false, 'select')"
+                    />
+                </QTd>
+            </template>
+            <template #body-cell-deleteAction="{ row, rowIndex }">
+                <QTd class="col">
+                    <QIcon
+                        name="delete"
+                        size="sm"
+                        class="cursor-pointer fill-icon-on-hover"
+                        color="primary"
+                        @click.stop="
+                            openConfirmationModal(
+                                t('This row will be removed'),
+                                t('Do you want to clone this item?'),
+                                () => removePrice(row.id, rowIndex)
+                            )
+                        "
+                    >
+                        <QTooltip class="text-no-wrap">
+                            {{ t('Delete') }}
+                        </QTooltip>
+                    </QIcon>
+                </QTd>
+            </template>
+            <template #bottom-row>
+                <QTd align="center">
+                    <QIcon
+                        @click.stop="addRow()"
+                        class="fill-icon-on-hover"
+                        color="primary"
+                        name="add_circle"
+                        size="sm"
+                    >
+                        <QTooltip>
+                            {{ t('Add fixed price') }}
+                        </QTooltip>
+                    </QIcon>
+                </QTd>
+            </template>
+        </QTable>
+        <QPageSticky v-if="rowsSelected.length > 0" :offset="[20, 20]">
+            <QBtn @click="openEditTableCellDialog()" color="primary" fab icon="edit" />
+            <QTooltip>
+                {{ t('Edit fixed price(s)') }}
+            </QTooltip>
+        </QPageSticky>
+        <QDialog ref="editTableCellDialogRef">
+            <EditTableCellValueForm
+                edit-url="FixedPrices/editFixedPrice"
+                :rows="rowsSelected"
+                :fields-options="editTableFieldsOptions"
+                @on-data-saved="onEditCellDataSaved()"
+            />
+        </QDialog>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Add fixed price: Añadir precio fijado
+    Edit fixed price(s): Editar precio(s) fijado(s)
+    This row will be removed: Esta linea se eliminará
+    Are you sure you want to continue?: ¿Seguro que quieres continuar?
+    Delete: Eliminar
+</i18n>
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
new file mode 100644
index 000000000..cd86b5f71
--- /dev/null
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -0,0 +1,108 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
+
+const { t } = useI18n();
+
+defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+    warehousesOptions: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const itemTypeWorkersOptions = ref([]);
+</script>
+
+<template>
+    <FetchData
+        url="TicketRequests/getItemTypeWorker"
+        limit="30"
+        auto-load
+        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC', limit: 30 }"
+        @on-fetch="(data) => (itemTypeWorkersOptions = data)"
+    />
+    <ItemsFilterPanel :data-key="dataKey" :custom-tags="['tags']">
+        <template #body="{ params, searchFn }">
+            <QItem class="q-my-md">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('components.itemsFilterPanel.buyerFk')"
+                        v-model="params.buyerFk"
+                        :options="itemTypeWorkersOptions"
+                        option-value="id"
+                        option-label="nickname"
+                        dense
+                        outlined
+                        rounded
+                        use-input
+                        @update:model-value="searchFn()"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-md">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('components.itemsFilterPanel.warehouseFk')"
+                        v-model="params.warehouseFk"
+                        :options="warehousesOptions"
+                        option-label="name"
+                        option-value="id"
+                        dense
+                        outlined
+                        rounded
+                        use-input
+                        @update:model-value="searchFn()"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-md">
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('components.itemsFilterPanel.started')"
+                        v-model="params.started"
+                        is-outlined
+                        @update:model-value="searchFn()"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-md">
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('components.itemsFilterPanel.ended')"
+                        v-model="params.ended"
+                        is-outlined
+                        @update:model-value="searchFn()"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('components.itemsFilterPanel.mine')"
+                        v-model="params.mine"
+                        toggle-indeterminate
+                        @update:model-value="searchFn()"
+                    />
+                </QItemSection>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('components.itemsFilterPanel.hasMinPrice')"
+                        v-model="params.hasMinPrice"
+                        toggle-indeterminate
+                        @update:model-value="searchFn()"
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </ItemsFilterPanel>
+</template>
diff --git a/src/pages/Supplier/locale/es.yml b/src/pages/Supplier/locale/es.yml
new file mode 100644
index 000000000..e7e484f6a
--- /dev/null
+++ b/src/pages/Supplier/locale/es.yml
@@ -0,0 +1 @@
+Search suppliers: Buscar proveedores
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
new file mode 100644
index 000000000..5348b29b9
--- /dev/null
+++ b/src/pages/Ticket/locale/es.yml
@@ -0,0 +1,2 @@
+Search ticket: Buscar ticket
+You can search by ticket id or alias: Puedes buscar por id o alias del ticket
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
new file mode 100644
index 000000000..86dd9d0d9
--- /dev/null
+++ b/src/pages/Worker/locale/es.yml
@@ -0,0 +1,2 @@
+Search worker: Buscar trabajador
+You can search by worker id or name: Puedes buscar por id o nombre del trabajador

From c6c925a105766ec26074bc23a1045da0e7ca5536 Mon Sep 17 00:00:00 2001
From: jcasado <jcasado.verdnatura@gmail.com>
Date: Thu, 25 Apr 2024 08:50:12 +0200
Subject: [PATCH 18/38] refs: #6764 fixConflicts

---
 src/components/EditTableCellValueForm.vue     |  49 +--
 src/components/FormModel.vue                  |   2 +-
 src/components/FormModelPopup.vue             |  10 +-
 src/components/ui/CardDescriptor.vue          |  13 +-
 src/components/ui/CardSummary.vue             |   7 +-
 src/components/ui/VnSearchbar.vue             |   7 -
 src/components/ui/VnSubToolbar.vue            |  25 +-
 src/composables/useArrayData.js               |   7 +-
 src/css/app.scss                              |  22 ++
 src/filters/date.js                           |  18 ++
 src/i18n/locale/en.yml                        |  29 ++
 src/i18n/locale/es.yml                        |  29 ++
 src/pages/Claim/Card/ClaimCard.vue            |  51 +--
 src/pages/Customer/Card/CustomerCard.vue      |  48 +--
 src/pages/Customer/locale/es.yml              |   2 +
 src/pages/Department/Card/DepartmentCard.vue  |  29 +-
 .../Department/Card/DepartmentSummary.vue     |   1 +
 src/pages/Entry/Card/EntryCard.vue            |  53 +--
 src/pages/Entry/EntryLatestBuys.vue           |   2 +-
 src/pages/Entry/EntryLatestBuysFilter.vue     | 302 +-----------------
 src/pages/Entry/locale/es.yml                 |   2 +
 src/pages/InvoiceIn/Card/InvoiceInCard.vue    |  86 +----
 src/pages/InvoiceIn/InvoiceInFilter.vue       |  31 --
 src/pages/InvoiceOut/Card/InvoiceOutCard.vue  |  48 +--
 .../InvoiceOut/Card/InvoiceOutSummary.vue     |  21 +-
 .../InvoiceOut/InvoiceOutNegativeBases.vue    |  13 +-
 src/pages/Item/Card/ItemCard.vue              |  25 +-
 src/pages/Order/Card/OrderCard.vue            |  20 +-
 src/pages/Parking/Card/ParkingBasicData.vue   |   2 -
 src/pages/Parking/Card/ParkingCard.vue        |  58 +---
 src/pages/Parking/Card/ParkingSummary.vue     |   4 +-
 src/pages/Route/Card/RouteCard.vue            |  19 +-
 src/pages/Shelving/Card/ShelvingCard.vue      |  18 +-
 src/pages/Supplier/Card/SupplierCard.vue      |  77 +----
 src/pages/Ticket/Card/TicketCard.vue          |  78 +----
 src/pages/Ticket/Card/TicketSummary.vue       |   4 +-
 src/pages/Travel/Card/TravelCard.vue          |  52 +--
 src/pages/Wagon/Card/WagonCard.vue            |  30 +-
 src/pages/Worker/Card/WorkerCard.vue          |  50 +--
 src/pages/Worker/Card/WorkerDescriptor.vue    |   4 +-
 src/pages/Worker/Card/WorkerSummary.vue       |  17 +-
 src/router/modules/item.js                    |  13 +-
 42 files changed, 357 insertions(+), 1021 deletions(-)

diff --git a/src/components/EditTableCellValueForm.vue b/src/components/EditTableCellValueForm.vue
index e4732b45d..e45eac87e 100644
--- a/src/components/EditTableCellValueForm.vue
+++ b/src/components/EditTableCellValueForm.vue
@@ -1,9 +1,12 @@
 <script setup>
-import { ref, reactive } from 'vue';
+import { ref, markRaw } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import { QCheckbox } from 'quasar';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -28,11 +31,16 @@ const $props = defineProps({
 const { t } = useI18n();
 const { notify } = useNotify();
 
-const formData = reactive({
-    field: null,
-    newValue: null,
-});
+const inputs = {
+    input: markRaw(VnInput),
+    number: markRaw(VnInput),
+    date: markRaw(VnInputDate),
+    checkbox: markRaw(QCheckbox),
+    select: markRaw(VnSelectFilter),
+};
 
+const newValue = ref(null);
+const selectedField = ref(null);
 const closeButton = ref(null);
 const isLoading = ref(false);
 
@@ -47,8 +55,8 @@ const submitData = async () => {
         isLoading.value = true;
         const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk }));
         const payload = {
-            field: formData.field,
-            newValue: formData.newValue,
+            field: selectedField.value.field,
+            newValue: newValue.value,
             lines: rowsToEdit,
         };
 
@@ -75,19 +83,20 @@ const closeForm = () => {
             <span class="countLines">{{ ` ${rows.length} ` }}</span>
             <span class="title">{{ t('buy(s)') }}</span>
             <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelect
-                        :label="t('Field to edit')"
-                        :options="fieldsOptions"
-                        hide-selected
-                        option-label="label"
-                        option-value="field"
-                        v-model="formData.field"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput :label="t('Value')" v-model="formData.newValue" />
-                </div>
+                <VnSelect
+                    :label="t('Field to edit')"
+                    :options="fieldsOptions"
+                    hide-selected
+                    option-label="label"
+                    v-model="selectedField"
+                />
+                <component
+                    :is="inputs[selectedField?.component || 'input']"
+                    v-bind="selectedField?.attrs || {}"
+                    v-model="newValue"
+                    :label="t('Value')"
+                    style="width: 200px"
+                />
             </VnRow>
             <div class="q-mt-lg row justify-end">
                 <QBtn
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 39cef2a4a..b18433d4e 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -102,7 +102,7 @@ onMounted(async () => {
 });
 
 onBeforeRouteLeave((to, from, next) => {
-    if (hasChanges.value)
+    if (hasChanges.value && $props.observeFormChanges)
         quasar.dialog({
             component: VnConfirm,
             componentProps: {
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index 74abd2726..e0a60fadc 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -76,14 +76,6 @@ defineExpose({
             <p>{{ subtitle }}</p>
             <slot name="form-inputs" :data="data" :validate="validate" />
             <div class="q-mt-lg row justify-end">
-                <QBtn
-                    :label="t('globals.save')"
-                    :title="t('globals.save')"
-                    type="submit"
-                    color="primary"
-                    :disabled="isLoading"
-                    :loading="isLoading"
-                />
                 <QBtn
                     :label="t('globals.cancel')"
                     :title="t('globals.cancel')"
@@ -96,9 +88,9 @@ defineExpose({
                 />
                 <QBtn
                     :label="t('globals.save')"
+                    :title="t('globals.save')"
                     type="submit"
                     color="primary"
-                    class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"
                 />
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index f30ea8937..d2ba21888 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onBeforeMount, useSlots, watch, computed, ref } from 'vue';
+import { onBeforeMount, watch, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
@@ -38,7 +38,6 @@ const $props = defineProps({
 });
 
 const state = useState();
-const slots = useSlots();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const arrayData = useArrayData($props.dataKey || $props.module, {
@@ -47,7 +46,7 @@ const arrayData = useArrayData($props.dataKey || $props.module, {
     skip: 0,
 });
 const { store } = arrayData;
-const entity = computed(() =>Array.isArray( store.data) ? store.data[0] : store.data);
+const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
 const isLoading = ref(false);
 
 defineExpose({
@@ -55,14 +54,12 @@ defineExpose({
 });
 onBeforeMount(async () => {
     await getData();
-    watch(
-        () => $props.url,
-        async () => await getData()
-    );
+    watch($props, async () => await getData());
 });
 
 async function getData() {
     store.url = $props.url;
+    store.filter = $props.filter ?? {};
     isLoading.value = true;
     try {
         const { data } = await arrayData.fetch({ append: false, updateRouter: false });
@@ -117,7 +114,7 @@ const emit = defineEmits(['onFetch']);
                     icon="more_vert"
                     round
                     size="md"
-                    :class="{ invisible: !slots.menu }"
+                    :class="{ invisible: !$slots.menu }"
                 >
                     <QTooltip>
                         {{ t('components.cardDescriptor.moreOptions') }}
diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index a06837cf4..1a4514ef5 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -15,7 +15,7 @@ const props = defineProps({
         default: null,
     },
     entityId: {
-        type: Number,
+        type: [Number, String],
         default: null,
     },
     dataKey: {
@@ -32,7 +32,7 @@ const arrayData = useArrayData(props.dataKey || route.meta.moduleName, {
     skip: 0,
 });
 const { store } = arrayData;
-const entity = computed(() => Array.isArray(store.data) ? store.data[0] : store.data);
+const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
 const isLoading = ref(false);
 
 defineExpose({
@@ -48,9 +48,10 @@ onBeforeMount(async () => {
 
 async function fetch() {
     store.url = props.url;
+    store.filter = props.filter ?? {};
     isLoading.value = true;
     const { data } = await arrayData.fetch({ append: false, updateRouter: false });
-    emit('onFetch', data);
+    emit('onFetch', Array.isArray(data) ? data[0] : data);
     isLoading.value = false;
 }
 </script>
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index ddf520d0f..fc8475ace 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -131,13 +131,6 @@ async function search() {
                 />
             </template>
             <template #append>
-                <QIcon
-                    v-if="searchText !== ''"
-                    name="close"
-                    @click="searchText = ''"
-                    class="cursor-pointer"
-                />
-
                 <QIcon
                     v-if="props.info && $q.screen.gt.xs"
                     name="info"
diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index 22eebdf36..c0d129613 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -1,11 +1,27 @@
 <script setup>
-import { onMounted, onUnmounted } from 'vue';
+import { onMounted, onUnmounted, ref } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
-
 const stateStore = useStateStore();
+const actions = ref(null);
+const data = ref(null);
+const opts = { subtree: true, childList: true, attributes: true };
+const hasContent = ref(false);
 
 onMounted(() => {
     stateStore.toggleSubToolbar();
+    actions.value = document.querySelector('#st-actions');
+    data.value = document.querySelector('#st-data');
+
+    if (!actions.value && !data.value) return;
+
+    // Check if there's content to display
+    const observer = new MutationObserver(
+        () =>
+            (hasContent.value =
+                actions.value.childNodes.length + data.value.childNodes.length)
+    );
+    if (actions.value) observer.observe(actions.value, opts);
+    if (data.value) observer.observe(data.value, opts);
 });
 
 onUnmounted(() => {
@@ -14,7 +30,10 @@ onUnmounted(() => {
 </script>
 
 <template>
-    <QToolbar class="bg-vn-section-color justify-end sticky">
+    <QToolbar
+        class="justify-end sticky"
+        v-show="hasContent || $slots['st-actions'] || $slots['st-data']"
+    >
         <slot name="st-data">
             <div id="st-data"></div>
         </slot>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 490186e77..525cf6e6b 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -151,9 +151,10 @@ export function useArrayData(key, userOptions) {
                 delete store.userParams[param];
                 delete params[param];
                 if (store.filter?.where) {
-                    delete store.filter.where[
-                        Object.keys(exprBuilder ? exprBuilder(param) : param)[0]
-                    ];
+                    const key = Object.keys(
+                        exprBuilder && exprBuilder(param) ? exprBuilder(param) : param
+                    );
+                    if (key[0]) delete store.filter.where[key[0]];
                     if (Object.keys(store.filter.where).length === 0) {
                         delete store.filter.where;
                     }
diff --git a/src/css/app.scss b/src/css/app.scss
index b33c615e1..770df8e01 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -119,6 +119,11 @@ select:-webkit-autofill {
     font-variation-settings: 'FILL' 1;
 }
 
+.fill-icon-on-hover:hover {
+    font-variation-settings: 'FILL' 1;
+    cursor: pointer;
+}
+
 .vn-table-separation-row {
     height: 16px !important;
     background-color: var(--vn-section-color) !important;
@@ -136,6 +141,19 @@ select:-webkit-autofill {
     background-color: var(--vn-section-color);
 }
 
+.q-checkbox {
+    & .q-checkbox__label {
+        color: var(--vn-text-color);
+    }
+    & .q-checkbox__inner {
+        color: var(--vn-label-color);
+    }
+}
+
+.tr-header {
+    color: var(--vn-label-color);
+}
+
 .q-chip,
 .q-notification__message,
 .q-notification__icon {
@@ -169,3 +187,7 @@ input::-webkit-inner-spin-button {
     -webkit-appearance: none;
     -moz-appearance: none;
 }
+
+.q-scrollarea__content {
+    max-width: 100%;
+}
diff --git a/src/filters/date.js b/src/filters/date.js
index fc341ae32..f9fd1e0b2 100644
--- a/src/filters/date.js
+++ b/src/filters/date.js
@@ -112,3 +112,21 @@ export function secondsToHoursMinutes(seconds, includeHSuffix = true) {
     // Return formatted string
     return formattedHours + ':' + formattedMinutes + suffix;
 }
+
+export function getTimeDifferenceWithToday(date) {
+    let today = Date.vnNew();
+    today.setHours(0, 0, 0, 0);
+
+    date = new Date(date);
+    date.setHours(0, 0, 0, 0);
+
+    return today - date;
+}
+
+export function isLower(date) {
+    return getTimeDifferenceWithToday(date) > 0;
+}
+
+export function isBigger(date) {
+    return getTimeDifferenceWithToday(date) < 0;
+}
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 1bab871e1..ff57bf968 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1119,6 +1119,7 @@ item:
         list: List
         diary: Diary
         tags: Tags
+        fixedPrice: Fixed prices
         wasteBreakdown: Waste breakdown
         itemCreate: New item
     descriptor:
@@ -1148,6 +1149,15 @@ item:
         stemMultiplier: Multiplier
         producer: Producer
         landed: Landed
+    fixedPrice:
+        itemId: Item ID
+        groupingPrice: Grouping price
+        packingPrice: Packing price
+        hasMinPrice: Has min price
+        minPrice: Min price
+        started: Started
+        ended: Ended
+        warehouse: Warehouse
     create:
         name: Name
         tag: Tag
@@ -1157,6 +1167,25 @@ item:
         origin: Origin
 components:
     topbar: {}
+    itemsFilterPanel:
+        typeFk: Type
+        tag: Tag
+        value: Value
+        # ItemFixedPriceFilter
+        buyerFk: Buyer
+        warehouseFk: Warehouse
+        started: From
+        ended: To
+        mine: For me
+        hasMinPrice: Minimum price
+        # LatestBuysFilter
+        salesPersonFk: Buyer
+        supplierFk: Supplier
+        from: From
+        to: To
+        active: Is active
+        visible: Is visible
+        floramondo: Is floramondo
     userPanel:
         copyToken: Token copied to clipboard
         settings: Settings
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 01775dfee..f9278a9b0 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1118,6 +1118,7 @@ item:
         list: Listado
         diary: Histórico
         tags: Etiquetas
+        fixedPrice: Precios fijados
         wasteBreakdown: Deglose de mermas
         itemCreate: Nuevo artículo
     descriptor:
@@ -1147,6 +1148,15 @@ item:
         stemMultiplier: Multiplicador
         producer: Productor
         landed: F. entrega
+    fixedPrice:
+        itemId: ID Artículo
+        groupingPrice: Precio grouping
+        packingPrice: Precio packing
+        hasMinPrice: Tiene precio mínimo
+        minPrice: Precio min
+        started: Inicio
+        ended: Fin
+        warehouse: Almacén
     create:
         name: Nombre
         tag: Etiqueta
@@ -1156,6 +1166,25 @@ item:
         origin: Origen
 components:
     topbar: {}
+    itemsFilterPanel:
+        typeFk: Tipo
+        tag: Etiqueta
+        value: Valor
+        # ItemFixedPriceFilter
+        buyerFk: Comprador
+        warehouseFk: Almacén
+        started: Desde
+        ended: Hasta
+        mine: Para mi
+        hasMinPrice: Precio mínimo
+        # LatestBuysFilter
+        salesPersonFk: Comprador
+        supplierFk: Proveedor
+        from: Desde
+        to: Hasta
+        active: Activo
+        visible: Visible
+        floramondo: Floramondo
     userPanel:
         copyToken: Token copiado al portapapeles
         settings: Configuración
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index 78eec9e8d..b2f9c4d2e 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -1,46 +1,15 @@
 <script setup>
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import { useStateStore } from 'stores/useStateStore';
-import { useI18n } from 'vue-i18n';
+import VnCard from 'components/common/VnCard.vue';
 import ClaimDescriptor from './ClaimDescriptor.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import useCardSize from 'src/composables/useCardSize';
-
-const stateStore = useStateStore();
-const { t } = useI18n();
 </script>
 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <VnSearchbar
-            data-key="ClaimList"
-            url="Claims/filter"
-            :label="t('Search claim')"
-            :info="t('You can search by claim id or customer name')"
-        />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <ClaimDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="Claim"
+        base-url="Claims"
+        :descriptor="ClaimDescriptor"
+        searchbar-data-key="ClaimList"
+        searchbar-url="Claims/filter"
+        searchbar-label="Search claim"
+        searchbar-info="You can search by claim id or customer name"
+    />
 </template>
-
-<i18n>
-es:
-    Search claim: Buscar reclamación
-    You can search by claim id or customer name: Puedes buscar por id de la reclamación o nombre del cliente
-    Details: Detalles
-    Notes: Notas
-    Action: Acción
-</i18n>
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index f3ca74eaf..872bd7da7 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -1,43 +1,15 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
+import VnCard from 'components/common/VnCard.vue';
 import CustomerDescriptor from './CustomerDescriptor.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import useCardSize from 'src/composables/useCardSize';
-
-const stateStore = useStateStore();
-const { t } = useI18n();
 </script>
 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <VnSearchbar
-            data-key="CustomerList"
-            url="Clients/filter"
-            :label="t('Search customer')"
-            :info="t('You can search by customer id or name')"
-        />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <CustomerDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="Client"
+        base-url="Clients"
+        :descriptor="CustomerDescriptor"
+        searchbar-data-key="CustomerList"
+        searchbar-url="Clients/filter"
+        searchbar-label="Search customer"
+        searchbar-info="You can search by customer id or name"
+    />
 </template>
-
-<i18n>
-es:
-    Search customer: Buscar cliente
-    You can search by customer id or name: Puedes buscar por id o nombre del cliente
-</i18n>
diff --git a/src/pages/Customer/locale/es.yml b/src/pages/Customer/locale/es.yml
index 8fed37092..111696f21 100644
--- a/src/pages/Customer/locale/es.yml
+++ b/src/pages/Customer/locale/es.yml
@@ -1,3 +1,5 @@
+Search customer: Buscar cliente
+You can search by customer id or name: Puedes buscar por id o nombre del cliente
 customerFilter:
     filter:
         name: Nombre
diff --git a/src/pages/Department/Card/DepartmentCard.vue b/src/pages/Department/Card/DepartmentCard.vue
index da9accee1..21247ca5a 100644
--- a/src/pages/Department/Card/DepartmentCard.vue
+++ b/src/pages/Department/Card/DepartmentCard.vue
@@ -1,26 +1,13 @@
 <script setup>
-import { useStateStore } from 'stores/useStateStore';
+import VnCard from 'components/common/VnCard.vue';
 import DepartmentDescriptor from 'pages/Department/Card/DepartmentDescriptor.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
-const stateStore = useStateStore();
 </script>
 <template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <DepartmentDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-
-            <div class="q-pa-md column items-center">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        class="q-pa-md column items-center"
+        v-bind="{ ...$attrs }"
+        data-key="Department"
+        base-url="Departments"
+        :descriptor="DepartmentDescriptor"
+    />
 </template>
diff --git a/src/pages/Department/Card/DepartmentSummary.vue b/src/pages/Department/Card/DepartmentSummary.vue
index 1d42183c3..6377ac779 100644
--- a/src/pages/Department/Card/DepartmentSummary.vue
+++ b/src/pages/Department/Card/DepartmentSummary.vue
@@ -27,6 +27,7 @@ onMounted(async () => {
 
 <template>
     <CardSummary
+        data-key="DepartmentSummary"
         ref="summary"
         :url="`Departments/${entityId}`"
         class="full-width"
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index 5a2bef186..3eb4bd776 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -1,48 +1,15 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnCard from 'components/common/VnCard.vue';
 import EntryDescriptor from './EntryDescriptor.vue';
-
-import { useStateStore } from 'stores/useStateStore';
-import useCardSize from 'src/composables/useCardSize';
-
-const { t } = useI18n();
-const stateStore = useStateStore();
 </script>
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="EntryList"
-                url="Entries/filter"
-                :label="t('Search entries')"
-                :info="t('You can search by entry reference')"
-            />
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <EntryDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="Entry"
+        base-url="Entries"
+        :descriptor="EntryDescriptor"
+        searchbar-data-key="EntryList"
+        searchbar-url="Entries/filter"
+        searchbar-label="Search entries"
+        searchbar-info="You can search by entry reference"
+    />
 </template>
-
-<i18n>
-es:
-    Search entries: Buscar entradas
-    You can search by entry reference: Puedes buscar por referencia de la entrada
-</i18n>
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 951c4b5fb..c3e83c96f 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -650,7 +650,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     </QToolbar>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
-            <EntryLatestBuysFilter data-key="EntryLatestBuys" :tags="tags" />
+            <EntryLatestBuysFilter data-key="EntryLatestBuys" />
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
diff --git a/src/pages/Entry/EntryLatestBuysFilter.vue b/src/pages/Entry/EntryLatestBuysFilter.vue
index 5a03da1f6..933919a24 100644
--- a/src/pages/Entry/EntryLatestBuysFilter.vue
+++ b/src/pages/Entry/EntryLatestBuysFilter.vue
@@ -1,141 +1,26 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
-import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
-
-import axios from 'axios';
+import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
 
 const { t } = useI18n();
-const props = defineProps({
+
+defineProps({
     dataKey: {
         type: String,
         required: true,
     },
 });
 
-const itemCategories = ref([]);
-const selectedCategoryFk = ref(null);
-const selectedTypeFk = ref(null);
-const itemTypesOptions = ref([]);
 const itemTypeWorkersOptions = ref([]);
 const suppliersOptions = ref([]);
-const tagOptions = ref([]);
-const tagValues = ref([]);
-
-const categoryList = computed(() => {
-    return (itemCategories.value || [])
-        .filter((category) => category.display)
-        .map((category) => ({
-            ...category,
-            icon: `vn:${(category.icon || '').split('-')[1]}`,
-        }));
-});
-
-const selectedCategory = computed(() =>
-    (itemCategories.value || []).find(
-        (category) => category?.id === selectedCategoryFk.value
-    )
-);
-
-const selectedType = computed(() => {
-    return (itemTypesOptions.value || []).find(
-        (type) => type?.id === selectedTypeFk.value
-    );
-});
-
-const selectCategory = async (params, categoryId, search) => {
-    if (params.categoryFk === categoryId) {
-        resetCategory(params);
-        search();
-        return;
-    }
-    selectedCategoryFk.value = categoryId;
-    params.categoryFk = categoryId;
-    await fetchItemTypes(categoryId);
-    search();
-};
-
-const resetCategory = (params) => {
-    selectedCategoryFk.value = null;
-    itemTypesOptions.value = null;
-    if (params) {
-        params.categoryFk = null;
-        params.typeFk = null;
-    }
-};
-
-const applyTags = (params, search) => {
-    params.tags = tagValues.value
-        .filter((tag) => tag.selectedTag && tag.value)
-        .map((tag) => ({
-            tagFk: tag.selectedTag.id,
-            tagName: tag.selectedTag.name,
-            value: tag.value,
-        }));
-    search();
-};
-
-const fetchItemTypes = async (id) => {
-    try {
-        const filter = {
-            fields: ['id', 'name', 'categoryFk'],
-            where: { categoryFk: id },
-            include: 'category',
-            order: 'name ASC',
-        };
-        const { data } = await axios.get('ItemTypes', {
-            params: { filter: JSON.stringify(filter) },
-        });
-        itemTypesOptions.value = data;
-    } catch (err) {
-        console.error('Error fetching item types', err);
-    }
-};
-
-const getCategoryClass = (category, params) => {
-    if (category.id === params?.categoryFk) {
-        return 'active';
-    }
-};
-
-const getSelectedTagValues = async (tag) => {
-    try {
-        tag.value = null;
-        const filter = {
-            fields: ['value'],
-            order: 'value ASC',
-            limit: 30,
-        };
-
-        const params = { filter: JSON.stringify(filter) };
-        const { data } = await axios.get(`Tags/${tag.selectedTag.id}/filterValue`, {
-            params,
-        });
-        tag.valueOptions = data;
-    } catch (err) {
-        console.error('Error getting selected tag values');
-    }
-};
-
-const removeTag = (index, params, search) => {
-    (tagValues.value || []).splice(index, 1);
-    applyTags(params, search);
-};
 </script>
 
 <template>
-    <FetchData
-        url="ItemCategories"
-        limit="30"
-        auto-load
-        @on-fetch="(data) => (itemCategories = data)"
-    />
     <FetchData
         url="TicketRequests/getItemTypeWorker"
         limit="30"
@@ -150,102 +35,12 @@ const removeTag = (index, params, search) => {
         :filter="{ fields: ['id', 'name', 'nickname'], order: 'name ASC', limit: 30 }"
         @on-fetch="(data) => (suppliersOptions = data)"
     />
-    <FetchData
-        url="Tags"
-        :filter="{ fields: ['id', 'name', 'isFree'] }"
-        auto-load
-        limit="30"
-        @on-fetch="(data) => (tagOptions = data)"
-    />
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :expr-builder="exprBuilder"
-        :custom-tags="['tags']"
-        @init="onFilterInit"
-        @remove="clearFilter"
-    >
-        <template #tags="{ tag, formatFn }">
-            <strong v-if="tag.label === 'categoryFk'">
-                {{ t(selectedCategory?.name || '') }}
-            </strong>
-            <strong v-else-if="tag.label === 'typeFk'">
-                {{ t(selectedType?.name || '') }}
-            </strong>
-            <div v-else class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #customTags="{ tags: customTags, params }">
-            <template v-for="tag in customTags" :key="tag.label">
-                <VnFilterPanelChip
-                    v-for="chip in tag.value"
-                    :key="chip"
-                    removable
-                    @remove="removeTagChip(chip, params, searchFn)"
-                >
-                    <div class="q-gutter-x-xs">
-                        <strong>{{ chip.tagName }}: </strong>
-                        <span>"{{ chip.value }}"</span>
-                    </div>
-                </VnFilterPanelChip>
-            </template>
-        </template>
+    <ItemsFilterPanel :data-key="dataKey" :custom-tags="['tags']">
         <template #body="{ params, searchFn }">
-            <QItem class="category-filter q-mt-md">
-                <QBtn
-                    dense
-                    flat
-                    round
-                    v-for="category in categoryList"
-                    :key="category.name"
-                    :class="['category', getCategoryClass(category, params)]"
-                    :icon="category.icon"
-                    @click="selectCategory(params, category.id, searchFn)"
-                >
-                    <QTooltip>
-                        {{ t(category.name) }}
-                    </QTooltip>
-                </QBtn>
-            </QItem>
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnSelect
-                        :label="t('params.typeFk')"
-                        v-model="params.typeFk"
-                        :options="itemTypesOptions"
-                        option-value="id"
-                        option-label="name"
-                        dense
-                        outlined
-                        rounded
-                        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>
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <QSeparator />
-            <QItem class="q-my-md">
-                <QItemSection>
-                    <VnSelect
-                        :label="t('params.salesPersonFk')"
+                        :label="t('components.itemsFilterPanel.salesPersonFk')"
                         v-model="params.salesPersonFk"
                         :options="itemTypeWorkersOptions"
                         option-value="id"
@@ -288,7 +83,7 @@ const removeTag = (index, params, search) => {
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnInputDate
-                        :label="t('params.from')"
+                        :label="t('components.itemsFilterPanel.from')"
                         v-model="params.from"
                         is-outlined
                         @update:model-value="searchFn()"
@@ -298,7 +93,7 @@ const removeTag = (index, params, search) => {
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnInputDate
-                        :label="t('params.to')"
+                        :label="t('components.itemsFilterPanel.to')"
                         v-model="params.to"
                         is-outlined
                         @update:model-value="searchFn()"
@@ -308,7 +103,7 @@ const removeTag = (index, params, search) => {
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.active')"
+                        :label="t('components.itemsFilterPanel.active')"
                         v-model="params.active"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
@@ -316,7 +111,7 @@ const removeTag = (index, params, search) => {
                 </QItemSection>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.visible')"
+                        :label="t('components.itemsFilterPanel.visible')"
                         v-model="params.visible"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
@@ -326,7 +121,7 @@ const removeTag = (index, params, search) => {
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.floramondo')"
+                        :label="t('components.itemsFilterPanel.floramondo')"
                         v-model="params.floramondo"
                         toggle-indeterminate
                         @update:model-value="searchFn()"
@@ -397,78 +192,5 @@ const removeTag = (index, params, search) => {
                 />
             </QItem>
         </template>
-    </VnFilterPanel>
+    </ItemsFilterPanel>
 </template>
-
-<style lang="scss" scoped>
-.category-filter {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: center;
-    gap: 12px;
-
-    .category {
-        padding: 8px;
-        width: 60px;
-        height: 60px;
-        font-size: 1.4rem;
-        background-color: var(--vn-accent-color);
-
-        &.active {
-            background-color: $primary;
-        }
-    }
-}
-
-.filter-icon {
-    font-size: 24px;
-    color: $primary;
-    padding: 0 4px;
-    cursor: pointer;
-}
-
-.filter-input {
-    flex-shrink: 1;
-    min-width: 0;
-}
-
-.filter-value {
-    display: flex;
-    align-items: center;
-}
-</style>
-
-<i18n>
-en:
-    params:
-        supplier: Supplier
-        from: From
-        to: To
-        active: Is active
-        visible: Is visible
-        floramondo: Is floramondo
-        salesPersonFk: Buyer
-        categoryFk: Category
-        typeFk: Type
-        tag: Tag
-        value: Value
-es:
-    params:
-        supplier: Proveedor
-        from: Desde
-        to: Hasta
-        active: Activo
-        visible: Visible
-        floramondo: Floramondo
-        salesPersonFk: Comprador
-        categoryFk: Categoría
-        typeFk: Tipo
-        tag: Etiqueta
-        value: Valor
-    Plant: Planta
-    Flower: Flor
-    Handmade: Confección
-    Green: Verde
-    Accessories: Complemento
-    Fruit: Fruta
-</i18n>
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 192d03542..5d317a24a 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -1,3 +1,5 @@
+Search entries: Buscar entradas
+You can search by entry reference: Puedes buscar por referencia de la entrada
 entryList:
     list:
         inventoryEntry: Es inventario
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index 0de31c183..ceec5042d 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -1,18 +1,6 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
+import VnCard from 'components/common/VnCard.vue';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import { useArrayData } from 'src/composables/useArrayData';
-import { onMounted, watch } from 'vue';
-import { useRoute } from 'vue-router';
-import useCardSize from 'src/composables/useCardSize';
-
-const stateStore = useStateStore();
-const { t } = useI18n();
-const route = useRoute();
 
 const filter = {
     include: [
@@ -21,69 +9,25 @@ const filter = {
             scope: {
                 include: {
                     relation: 'contacts',
-                    scope: {
-                        where: {
-                            email: { neq: null },
-                        },
-                    },
+                    scope: { where: { email: { neq: null } } },
                 },
             },
         },
-        {
-            relation: 'invoiceInDueDay',
-        },
-        {
-            relation: 'company',
-        },
-        {
-            relation: 'currency',
-        },
+        { relation: 'invoiceInDueDay' },
+        { relation: 'company' },
+        { relation: 'currency' },
     ],
 };
-const arrayData = useArrayData('InvoiceIn', {
-    url: `InvoiceIns/${route.params.id}`,
-    filter,
-});
-
-onMounted(async () => await arrayData.fetch({ append: false }));
-watch(
-    () => route.params.id,
-    async (newId, oldId) => {
-        if (newId) {
-            arrayData.store.url = `InvoiceIns/${newId}`;
-            await arrayData.fetch({ append: false });
-        }
-    }
-);
 </script>
 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <VnSearchbar
-            data-key="InvoiceInList"
-            url="InvoiceIns/filter"
-            :label="t('Search invoice')"
-            :info="t('You can search by invoice reference')"
-        />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <InvoiceInDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="InvoiceIn"
+        base-url="InvoiceIns"
+        :filter="filter"
+        :descriptor="InvoiceInDescriptor"
+        searchbar-data-key="InvoiceInList"
+        searchbar-url="InvoiceIns/filter"
+        searchbar-label="Search invoice"
+        searchbar-info="You can search by invoice reference"
+    />
 </template>
-
-<i18n>
-    es:
-        Search invoice: Buscar factura recibida
-        You can search by invoice reference: Puedes buscar por referencia de la factura
-    </i18n>
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 5126ea2f4..4601c9af6 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -7,7 +7,6 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
-import { useCapitalize } from 'src/composables/useCapitalize';
 import VnCurrency from 'src/components/common/VnCurrency.vue';
 
 const { t } = useI18n();
@@ -83,36 +82,6 @@ const suppliersRef = ref();
                     </VnInput>
                 </QItemSection>
             </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        :label="t('params.supplierFk')"
-                        v-model="params.supplierFk"
-                        :options="suppliers"
-                        option-value="id"
-                        option-label="nickname"
-                        @input-value="suppliersRef.fetch()"
-                        dense
-                        outlined
-                        rounded
-                    >
-                    </VnSelect>
-                </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>
                     <VnInputDate :label="t('From')" v-model="params.from" is-outlined />
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
index 6844df2dd..218e01d83 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
@@ -1,43 +1,15 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import useCardSize from 'src/composables/useCardSize';
-
-const stateStore = useStateStore();
-const { t } = useI18n();
+import VnCard from 'components/common/VnCard.vue';
 </script>
 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <VnSearchbar
-            data-key="InvoiceOutList"
-            url="InvoiceOuts/filter"
-            :label="t('Search invoice')"
-            :info="t('You can search by invoice reference')"
-        />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <InvoiceOutDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="InvoiceOut"
+        base-url="InvoiceOuts"
+        :descriptor="InvoiceOutDescriptor"
+        searchbar-data-key="InvoiceOutList"
+        searchbar-url="InvoiceOuts/filter"
+        searchbar-label="Search invoice"
+        searchbar-info="You can search by invoice reference"
+    />
 </template>
-
-<i18n>
-    es:
-        Search invoice: Buscar factura emitida
-        You can search by invoice reference: Puedes buscar por referencia de la factura
-    </i18n>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index a6a28bdde..e98de6b30 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -138,7 +138,7 @@ const ticketsColumns = ref([
                 <VnTitle :text="t('invoiceOut.summary.taxBreakdown')" />
                 <QTable :columns="taxColumns" :rows="invoiceOut.taxesBreakdown" flat>
                     <template #header="props">
-                        <QTr :props="props">
+                        <QTr class="tr-header" :props="props">
                             <QTh v-for="col in props.cols" :key="col.name" :props="props">
                                 {{ t(col.label) }}
                             </QTh>
@@ -149,6 +149,18 @@ const ticketsColumns = ref([
             <QCard class="vn-three">
                 <VnTitle :text="t('invoiceOut.summary.tickets')" />
                 <QTable v-if="tickets" :columns="ticketsColumns" :rows="tickets" flat>
+                    <template #header="props">
+                        <QTr :props="props">
+                            <QTh
+                                class="tr-header"
+                                v-for="col in props.cols"
+                                :key="col.name"
+                                :props="props"
+                            >
+                                {{ t(col.label) }}
+                            </QTh>
+                        </QTr>
+                    </template>
                     <template #body-cell-item="{ value }">
                         <QTd>
                             <QBtn flat color="primary">
@@ -159,7 +171,7 @@ const ticketsColumns = ref([
                     </template>
                     <template #body-cell-quantity="{ value, row }">
                         <QTd>
-                            <QBtn flat color="primary" dense>
+                            <QBtn class="no-uppercase" flat color="primary" dense>
                                 {{ value }}
                                 <CustomerDescriptorProxy :id="row.id" />
                             </QBtn>
@@ -170,3 +182,8 @@ const ticketsColumns = ref([
         </template>
     </CardSummary>
 </template>
+<style lang="scss" scoped>
+.no-uppercase {
+    text-transform: none;
+}
+</style>
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index fb434124c..182de2c83 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -119,8 +119,8 @@ const columns = computed(() => [
     },
     {
         label: t('invoiceOut.negativeBases.comercial'),
-        field: 'workerSocialName',
-        name: 'comercial',
+        field: 'workerName',
+        name: 'worker',
         align: 'left',
     },
 ]);
@@ -181,9 +181,11 @@ const downloadCSV = async () => {
                     <TicketDescriptorProxy :id="row.ticketFk" />
                 </QTd>
             </template>
-            <template #body-cell-comercial="{ row }">
+            <template #body-cell-worker="{ row }">
                 <QTd>
-                    <QBtn flat dense color="blue">{{ row.comercialName }}</QBtn>
+                    <QBtn class="no-uppercase" flat dense color="blue">{{
+                        row.workerName
+                    }}</QBtn>
                     <WorkerDescriptorProxy :id="row.comercialId" />
                 </QTd>
             </template>
@@ -211,6 +213,9 @@ const downloadCSV = async () => {
     border-radius: 4px;
     padding: 6px;
 }
+.no-uppercase {
+    text-transform: none;
+}
 </style>
 
 <i18n>
diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue
index 3b3750b2a..4eca6137c 100644
--- a/src/pages/Item/Card/ItemCard.vue
+++ b/src/pages/Item/Card/ItemCard.vue
@@ -1,28 +1,7 @@
 <script setup>
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnCard from 'components/common/VnCard.vue';
 import ItemDescriptor from './ItemDescriptor.vue';
-
-import { useStateStore } from 'stores/useStateStore';
-import useCardSize from 'src/composables/useCardSize';
-
-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="useCardSize()">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard data-key="Item" base-url="Items" :descriptor="ItemDescriptor" />
 </template>
diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index 7ac083c37..ef7b30d86 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -1,23 +1,7 @@
 <script setup>
-import LeftMenu from 'components/LeftMenu.vue';
-import { useStateStore } from 'stores/useStateStore';
+import VnCard from 'components/common/VnCard.vue';
 import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
-const stateStore = useStateStore();
 </script>
 <template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <OrderDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-            <RouterView></RouterView>
-        </QPage>
-    </QPageContainer>
+    <VnCard data-key="Order" base-url="Orders" :descriptor="OrderDescriptor" />
 </template>
diff --git a/src/pages/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
index 81598e0a7..c1a9dcee8 100644
--- a/src/pages/Parking/Card/ParkingBasicData.vue
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -4,7 +4,6 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FormModel from 'components/FormModel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
@@ -28,7 +27,6 @@ const filter = {
         @on-fetch="(data) => (sectors = data)"
         auto-load
     />
-    <VnSubToolbar />
     <FormModel :url="`Parkings/${parkingId}`" model="parking" :filter="filter" auto-load>
         <template #form="{ data }">
             <VnRow>
diff --git a/src/pages/Parking/Card/ParkingCard.vue b/src/pages/Parking/Card/ParkingCard.vue
index 621680985..5a0b552d6 100644
--- a/src/pages/Parking/Card/ParkingCard.vue
+++ b/src/pages/Parking/Card/ParkingCard.vue
@@ -1,57 +1,21 @@
 <script setup>
-import { onMounted, watch } from 'vue';
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
-import { useArrayData } from 'src/composables/useArrayData';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import VnCard from 'components/common/VnCard.vue';
 import ParkingDescriptor from 'pages/Parking/Card/ParkingDescriptor.vue';
 
-const { t } = useI18n();
-const route = useRoute();
-const stateStore = useStateStore();
-
 const filter = {
     fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
 };
-
-const arrayData = useArrayData('Parking', {
-    url: `Parkings/${route.params.id}`,
-    filter,
-});
-const { store } = arrayData;
-onMounted(async () => await arrayData.fetch({ append: false }));
-watch(
-    () => route.params.id,
-    async (newId) => {
-        if (newId) {
-            store.url = `Parkings/${newId}`;
-            store.filter = filter;
-            await arrayData.fetch({ append: false });
-        }
-    }
-);
 </script>
 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <VnSearchbar
-            :info="t('parking.searchBar.info')"
-            :label="t('parking.searchBar.label')"
-            data-key="Parking"
-        />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <ParkingDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <RouterView></RouterView>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="Parking"
+        base-url="Parkings"
+        :filter="filter"
+        :descriptor="ParkingDescriptor"
+        searchbar-data-key="ParkingList"
+        searchbar-url="Parkings"
+        searchbar-label="parking.searchBar.label"
+        searchbar-info="parking.searchBar.info"
+    />
 </template>
diff --git a/src/pages/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue
index a30705068..9a79f428b 100644
--- a/src/pages/Parking/Card/ParkingSummary.vue
+++ b/src/pages/Parking/Card/ParkingSummary.vue
@@ -11,9 +11,9 @@ const $props = defineProps({
         default: 0,
     },
 });
-const { params } = useRoute();
+const router = useRoute();
 const { t } = useI18n();
-const entityId = computed(() => $props.id || params.id);
+const entityId = computed(() => $props.id || router.params.id);
 
 const filter = {
     fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
diff --git a/src/pages/Route/Card/RouteCard.vue b/src/pages/Route/Card/RouteCard.vue
index 46b997b65..fd0a8a507 100644
--- a/src/pages/Route/Card/RouteCard.vue
+++ b/src/pages/Route/Card/RouteCard.vue
@@ -1,22 +1,7 @@
 <script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'components/LeftMenu.vue';
+import VnCard from 'components/common/VnCard.vue';
 import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
-// import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
-
-const stateStore = useStateStore();
 </script>
 <template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <RouteDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <RouterView></RouterView>
-        </QPage>
-    </QPageContainer>
+    <VnCard data-key="Route" base-url="Routes" :descriptor="RouteDescriptor" />
 </template>
diff --git a/src/pages/Shelving/Card/ShelvingCard.vue b/src/pages/Shelving/Card/ShelvingCard.vue
index 221740486..f4a2fcf60 100644
--- a/src/pages/Shelving/Card/ShelvingCard.vue
+++ b/src/pages/Shelving/Card/ShelvingCard.vue
@@ -1,21 +1,7 @@
 <script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'components/LeftMenu.vue';
+import VnCard from 'components/common/VnCard.vue';
 import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
-
-const stateStore = useStateStore();
 </script>
 <template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <ShelvingDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <RouterView></RouterView>
-        </QPage>
-    </QPageContainer>
+    <VnCard data-key="Shelving" base-url="Shelvings" :descriptor="ShelvingDescriptor" />
 </template>
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index fdf1d785a..c8c503056 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -1,73 +1,14 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import LeftMenu from 'components/LeftMenu.vue';
+import VnCard from 'components/common/VnCard.vue';
 import SupplierDescriptor from './SupplierDescriptor.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import useCardSize from 'src/composables/useCardSize';
-
-const stateStore = useStateStore();
-const { t } = useI18n();
 </script>
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <VnSearchbar
-                data-key="SuppliersList"
-                url="Suppliers/filter"
-                :limit="20"
-                :label="t('Search suppliers')"
-            />
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <SupplierDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="Supplier"
+        base-url="Suppliers"
+        :descriptor="SupplierDescriptor"
+        searchbar-data-key="SupplierList"
+        searchbar-url="Suppliers/filter"
+        searchbar-label="Search suppliers"
+    />
 </template>
-
-<style lang="scss">
-.q-scrollarea__content {
-    max-width: 100%;
-}
-</style>
-
-<style lang="scss" scoped>
-.descriptor {
-    max-width: 256px;
-
-    h5 {
-        margin: 0 15px;
-    }
-
-    .header {
-        display: flex;
-        justify-content: space-between;
-    }
-
-    .q-card__actions {
-        justify-content: center;
-    }
-
-    #descriptor-skeleton .q-card__actions {
-        justify-content: space-between;
-    }
-}
-</style>
-
-<i18n>
-    es:
-        Search suppliers: Buscar proveedores
-</i18n>
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index 0d5d3803e..471bfe490 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -1,73 +1,15 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
+import VnCard from 'components/common/VnCard.vue';
 import TicketDescriptor from './TicketDescriptor.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import useCardSize from 'src/composables/useCardSize';
-
-const stateStore = useStateStore();
-const { t } = useI18n();
 </script>
 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <VnSearchbar
-            data-key="TicketList"
-            url="Tickets/filter"
-            :label="t('Search ticket')"
-            :info="t('You can search by ticket id or alias')"
-        />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <TicketDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="Ticket"
+        base-url="Tickets"
+        :descriptor="TicketDescriptor"
+        searchbar-data-key="TicketList"
+        searchbar-url="Tickets/filter"
+        searchbar-label="Search ticket"
+        searchbar-info="You can search by ticket id or alias"
+    />
 </template>
-
-<style lang="scss">
-.q-scrollarea__content {
-    max-width: 100%;
-}
-</style>
-
-<style lang="scss" scoped>
-.descriptor {
-    max-width: 256px;
-
-    h5 {
-        margin: 0 15px;
-    }
-
-    .header {
-        display: flex;
-        justify-content: space-between;
-    }
-
-    .q-card__actions {
-        justify-content: center;
-    }
-
-    #descriptor-skeleton .q-card__actions {
-        justify-content: space-between;
-    }
-}
-</style>
-
-<i18n>
-es:
-    Search ticket: Buscar ticket
-    You can search by ticket id or alias: Puedes buscar por id o alias del ticket
-</i18n>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index d648433b0..364ae04a6 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -91,8 +91,8 @@ async function changeState(value) {
     >
         <template #header="{ entity }">
             <div>
-                Ticket #{{ entity.id }} - {{ entity.client.name }} ({{
-                    entity.client.id
+                Ticket #{{ entity.id }} - {{ entity.client?.name }} ({{
+                    entity.client?.id
                 }}) -
                 {{ entity.nickname }}
             </div>
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index e6c7b7e28..1d591f064 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -1,55 +1,7 @@
 <script setup>
-import { useStateStore } from 'stores/useStateStore';
+import VnCard from 'components/common/VnCard.vue';
 import TravelDescriptor from './TravelDescriptor.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import useCardSize from 'src/composables/useCardSize';
-
-const stateStore = useStateStore();
 </script>
 <template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <TravelDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard data-key="Travel" base-url="Travels" :descriptor="TravelDescriptor" />
 </template>
-
-<style lang="scss">
-.q-scrollarea__content {
-    max-width: 100%;
-}
-</style>
-
-<style lang="scss" scoped>
-.descriptor {
-    max-width: 256px;
-
-    h5 {
-        margin: 0 15px;
-    }
-
-    .header {
-        display: flex;
-        justify-content: space-between;
-    }
-
-    .q-card__actions {
-        justify-content: center;
-    }
-
-    #descriptor-skeleton .q-card__actions {
-        justify-content: space-between;
-    }
-}
-</style>
diff --git a/src/pages/Wagon/Card/WagonCard.vue b/src/pages/Wagon/Card/WagonCard.vue
index 5ac18fb47..ed6c83778 100644
--- a/src/pages/Wagon/Card/WagonCard.vue
+++ b/src/pages/Wagon/Card/WagonCard.vue
@@ -1,32 +1,6 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
-import { useRoute } from 'vue-router';
-import LeftMenu from 'components/LeftMenu.vue';
-import useCardSize from 'src/composables/useCardSize';
-
-const stateStore = useStateStore();
-const route = useRoute();
-const { t } = useI18n();
+import VnCard from 'components/common/VnCard.vue';
 </script>
 <template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard data-key="Wagon" base-url="Wagons" />
 </template>
-
-<i18n>
-es:
-    Search customer: Buscar cliente
-    You can search by customer id or name: Puedes buscar por id o nombre del cliente
-</i18n>
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 0d62dcfc1..e0047bf9e 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -1,44 +1,18 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
+import VnCard from 'components/common/VnCard.vue';
 import WorkerDescriptor from './WorkerDescriptor.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import useCardSize from 'src/composables/useCardSize';
 
-const stateStore = useStateStore();
-const { t } = useI18n();
+const filter = { where: {} };
 </script>
 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <VnSearchbar
-            data-key="WorkerList"
-            url="Workers/filter"
-            :label="t('Search worker')"
-            :info="t('You can search by worker id or name')"
-        />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <WorkerDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-
-            <div :class="useCardSize()">
-                <RouterView></RouterView>
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="Worker"
+        custom-url="Workers/Summary"
+        :descriptor="WorkerDescriptor"
+        :filter="filter"
+        searchbar-data-key="WorkerList"
+        searchbar-url="Workers/filter"
+        searchbar-label="Search worker"
+        searchbar-info="You can search by worker id or name"
+    />
 </template>
-
-<i18n>
-es:
-    Search worker: Buscar trabajador
-    You can search by worker id or name: Puedes buscar por id o nombre del trabajador
-</i18n>
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 6f876b8fa..6f05fcdfb 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -31,7 +31,9 @@ const entityId = computed(() => {
 });
 
 const worker = ref();
-const filter = { where: { id: entityId } };
+const filter = computed(() => {
+    return { where: { id: entityId.value } };
+});
 
 const sip = ref(null);
 
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 43c493565..3a79d12bb 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -10,7 +10,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 
-const { params } = useRoute();
+const route = useRoute();
 const { t } = useI18n();
 
 const $props = defineProps({
@@ -20,18 +20,25 @@ const $props = defineProps({
     },
 });
 
-const entityId = computed(() => $props.id || params.id);
+const entityId = computed(() => $props.id || route.params.id);
 const workerUrl = ref();
 
 onMounted(async () => {
     workerUrl.value = (await getUrl('')) + `worker/${entityId.value}/`;
 });
 
-const filter = { where: { id: entityId.value } };
+const filter = computed(() => {
+    return { where: { id: entityId.value } };
+});
 </script>
 
 <template>
-    <CardSummary ref="summary" :url="`Workers/summary`" :filter="filter">
+    <CardSummary
+        data-key="workerData"
+        ref="summary"
+        :url="`Workers/summary`"
+        :filter="filter"
+    >
         <template #header="{ entity }">
             <div>{{ entity.id }} - {{ entity.firstName }} {{ entity.lastName }}</div>
         </template>
@@ -41,7 +48,7 @@ const filter = { where: { id: entityId.value } };
                     :url="workerUrl + `basic-data`"
                     :text="t('worker.summary.basicData')"
                 />
-                <VnLv :label="t('worker.card.name')" :value="worker.user.nickname" />
+                <VnLv :label="t('worker.card.name')" :value="worker.user?.nickname" />
                 <VnLv
                     :label="t('worker.list.department')"
                     :value="worker.department?.department?.name"
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 41f3ec92a..2a8e87194 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -10,7 +10,7 @@ export default {
     component: RouterView,
     redirect: { name: 'ItemMain' },
     menus: {
-        main: ['ItemList', 'WasteBreakdown'],
+        main: ['ItemList', 'WasteBreakdown', 'ItemFixedPrice'],
         card: ['ItemBasicData'],
     },
     children: [
@@ -29,11 +29,20 @@ export default {
                     },
                     component: () => import('src/pages/Item/ItemList.vue'),
                 },
+                {
+                    path: 'fixed-price',
+                    name: 'ItemFixedPrice',
+                    meta: {
+                        title: 'fixedPrice',
+                        icon: 'vn:fixedPrice',
+                    },
+                    component: () => import('src/pages/Item/ItemFixedPrice.vue'),
+                },
                 {
                     path: 'create',
                     name: 'ItemCreate',
                     meta: {
-                        title: 'create',
+                        title: 'itemCreate',
                     },
                     component: () => import('src/pages/Item/ItemCreate.vue'),
                 },

From 897ddc44fed3536df643bb6d4189792a26df358d Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 25 Apr 2024 09:57:04 +0200
Subject: [PATCH 19/38] fix: search bar

---
 src/pages/Agency/AgencyList.vue      | 2 ++
 src/pages/Agency/Card/AgencyCard.vue | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/Agency/AgencyList.vue b/src/pages/Agency/AgencyList.vue
index 930cae563..c04206625 100644
--- a/src/pages/Agency/AgencyList.vue
+++ b/src/pages/Agency/AgencyList.vue
@@ -13,6 +13,8 @@ function navigate(id) {
     router.push({ path: `/agency/${id}` });
 }
 function exprBuilder(param, value) {
+    if (!value) return;
+    console.log('value: ', value);
     if (param !== 'search') return;
 
     if (!isNaN(value)) return { id: value };
diff --git a/src/pages/Agency/Card/AgencyCard.vue b/src/pages/Agency/Card/AgencyCard.vue
index db2e6381c..ec90abf66 100644
--- a/src/pages/Agency/Card/AgencyCard.vue
+++ b/src/pages/Agency/Card/AgencyCard.vue
@@ -32,7 +32,7 @@ watch(
         <VnSearchbar
             :info="t('Agency.searchBar.info')"
             :label="t('Agency.searchBar.label')"
-            data-key="Agency"
+            data-key="AgencyList"
         />
     </Teleport>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">

From d490d85ecc1863a0031a38b15bc4f65b10f3dc1c Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 25 Apr 2024 12:34:19 +0200
Subject: [PATCH 20/38] feat: agencyWorkCenter

---
 src/i18n/locale/es.yml                       |  3 ++
 src/pages/Agency/Card/AgencyBasicData.vue    |  2 -
 src/pages/Agency/Card/AgencyCard.vue         | 37 +++++-----------
 src/pages/Agency/Card/AgencyWorkcenter.vue   |  1 +
 test/cypress/integration/agency/spec.spec.js | 46 +++++++++++++++-----
 5 files changed, 51 insertions(+), 38 deletions(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 3e5099c4b..10b77ef49 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1177,6 +1177,9 @@ agency:
         removeItemError: Error al eliminar la agencia
     pageTitles:
         agency: Agencia
+    searchBar:
+        info: Puedes buscar por nombre o id
+        label: Buscar agencia...
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/pages/Agency/Card/AgencyBasicData.vue b/src/pages/Agency/Card/AgencyBasicData.vue
index 40510a205..5999f853b 100644
--- a/src/pages/Agency/Card/AgencyBasicData.vue
+++ b/src/pages/Agency/Card/AgencyBasicData.vue
@@ -6,7 +6,6 @@ import { useI18n } from 'vue-i18n';
 import FormModel from 'components/FormModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 
@@ -22,7 +21,6 @@ const warehouses = ref([]);
         @on-fetch="(data) => (warehouses = data)"
         auto-load
     />
-    <VnSubToolbar />
     <FormModel :url="`Agencies/${routeId}`" model="agency" auto-load>
         <template #form="{ data }">
             <VnRow>
diff --git a/src/pages/Agency/Card/AgencyCard.vue b/src/pages/Agency/Card/AgencyCard.vue
index ec90abf66..e78d1cc55 100644
--- a/src/pages/Agency/Card/AgencyCard.vue
+++ b/src/pages/Agency/Card/AgencyCard.vue
@@ -1,17 +1,12 @@
 <script setup>
 import { onMounted, watch } from 'vue';
 import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'src/composables/useArrayData';
-import LeftMenu from 'components/LeftMenu.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+
 import AgencyDescriptor from 'pages/Agency/Card/AgencyDescriptor.vue';
+import VnCard from 'components/common/VnCard.vue';
 
-const { t } = useI18n();
 const route = useRoute();
-const stateStore = useStateStore();
-
 const arrayData = useArrayData('Agency', {
     url: `Agencies/${route.params.id}`,
 });
@@ -28,23 +23,13 @@ watch(
 );
 </script>
 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <VnSearchbar
-            :info="t('Agency.searchBar.info')"
-            :label="t('Agency.searchBar.label')"
-            data-key="AgencyList"
-        />
-    </Teleport>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit">
-            <AgencyDescriptor />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <QPage>
-            <RouterView></RouterView>
-        </QPage>
-    </QPageContainer>
+    <VnCard
+        data-key="Agency"
+        base-url="Agencies"
+        :descriptor="AgencyDescriptor"
+        searchbar-data-key="AgencyList"
+        searchbar-url="Agencies"
+        searchbar-label="agency.searchBar.label"
+        searchbar-info="agency.searchBar.info"
+    />
 </template>
diff --git a/src/pages/Agency/Card/AgencyWorkcenter.vue b/src/pages/Agency/Card/AgencyWorkcenter.vue
index 83231e6c2..ed9f15689 100644
--- a/src/pages/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Agency/Card/AgencyWorkcenter.vue
@@ -133,6 +133,7 @@ async function deleteWorCenter(id) {
         isAnyVolumeAllowed: Permite cualquier volumen
         Search agency: Buscar agencia
         You can search by name: Puedes buscar por nombre
+        This workCenter is already assigned to this agency: Este workCenter ya está asignado a esta agencia
     en:
         isOwn: Has owner
         isAnyVolumeAllowed: Allows any volume
diff --git a/test/cypress/integration/agency/spec.spec.js b/test/cypress/integration/agency/spec.spec.js
index dd6b0da6f..c3f5f7c88 100644
--- a/test/cypress/integration/agency/spec.spec.js
+++ b/test/cypress/integration/agency/spec.spec.js
@@ -1,25 +1,51 @@
 describe('template spec', () => {
+    const agencyId = 11;
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/agency`);
     });
 
-    it('passes', () => {
+    it('assign workCenter', () => {
         cy.visit(`/#/agency`);
-        /* ==== Generated with Cypress Studio ==== */
         cy.get(':nth-child(1) > :nth-child(1) > .card-list-body > .list-items').click();
-        cy.get('[href="#/agency/1/workCenter"] > .q-item__section--main').click();
+        cy.get('[href="#/agency/11/workCenter"] > .q-item__section--main').click();
         cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('#f_fa5833a2-f919-4542-b663-e72b3ba4ffe5').click();
-        cy.get('#f_fa5833a2-f919-4542-b663-e72b3ba4ffe5_0').click();
-        cy.get('#formModel > .q-card').click();
+        cy.get(
+            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
+        ).type('workCenterOne{enter}');
         cy.get('.q-btn--standard > .q-btn__content > .block').click();
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+    });
+
+    it('delete workCenter', () => {
+        cy.get(':nth-child(1) > :nth-child(1) > .card-list-body > .list-items').click();
+        cy.get('[href="#/agency/11/workCenter"] > .q-item__section--main').click();
+        cy.get('.q-item__section--side > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('.q-notification__message').should(
+            'have.text',
+            'Agency removed successfully'
+        );
+    });
+
+    it('error on duplicate workCenter', () => {
+        cy.visit(`/#/agency`);
+        cy.get(':nth-child(1) > :nth-child(1) > .card-list-body > .list-items').click();
+        cy.get('[href="#/agency/11/workCenter"] > .q-item__section--main').click();
         cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('#f_94743509-f7a7-4e5c-83f4-61ab52c7cd72').click();
-        cy.get('#f_94743509-f7a7-4e5c-83f4-61ab52c7cd72_1 > .q-item__section').click();
+        cy.get(
+            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
+        ).type('workCenterOne{enter}');
         cy.get('.q-btn--standard > .q-btn__content > .block').click();
-        cy.get('.q-btn--flat > .q-btn__content > .block').;
-        /* ==== End Cypress Studio ==== */
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get(
+            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
+        ).type('workCenterOne{enter}');
+        cy.get('.q-btn--standard > .q-btn__content > .block').click();
+
+        cy.get(
+            ':nth-child(2) > .q-notification__wrapper > .q-notification__content > .q-notification__message'
+        ).should('have.text', 'This workCenter is already assigned to this agency');
     });
 });

From 914c3fb1698387080b8d19ede9f35f19954095a9 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 25 Apr 2024 12:40:17 +0200
Subject: [PATCH 21/38] fix: test and console log

---
 src/components/common/VnBreadcrumbs.vue                        | 1 -
 .../agency/{spec.spec.js => agencyWorkCenter.spec.js}          | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)
 rename test/cypress/integration/agency/{spec.spec.js => agencyWorkCenter.spec.js} (97%)

diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 65f6946f4..337507233 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -30,7 +30,6 @@ watchEffect(() => {
 });
 
 function getBreadcrumb(param) {
-    console.log('param.meta.title: ', param.meta.title);
     const breadcrumb = {
         icon: param.meta.icon,
         path: param.path,
diff --git a/test/cypress/integration/agency/spec.spec.js b/test/cypress/integration/agency/agencyWorkCenter.spec.js
similarity index 97%
rename from test/cypress/integration/agency/spec.spec.js
rename to test/cypress/integration/agency/agencyWorkCenter.spec.js
index c3f5f7c88..7f875179b 100644
--- a/test/cypress/integration/agency/spec.spec.js
+++ b/test/cypress/integration/agency/agencyWorkCenter.spec.js
@@ -1,5 +1,4 @@
-describe('template spec', () => {
-    const agencyId = 11;
+describe('AgencyWorkCenter', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');

From a3ba68e86501bd54d20b07caa5a49827ec8a5520 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 25 Apr 2024 13:04:50 +0200
Subject: [PATCH 22/38] fix: test

---
 test/vitest/setup-file.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 test/vitest/setup-file.js

diff --git a/test/vitest/setup-file.js b/test/vitest/setup-file.js
new file mode 100644
index 000000000..e69de29bb

From f2d0d3f3ffc5419a5595335eef3c6b49942d440a Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 25 Apr 2024 13:09:54 +0200
Subject: [PATCH 23/38] fix: remove test from vitest

---
 .../pages/Agency/AgencyWorCenter.spec.js      | 33 -------------------
 1 file changed, 33 deletions(-)
 delete mode 100644 test/vitest/__tests__/pages/Agency/AgencyWorCenter.spec.js

diff --git a/test/vitest/__tests__/pages/Agency/AgencyWorCenter.spec.js b/test/vitest/__tests__/pages/Agency/AgencyWorCenter.spec.js
deleted file mode 100644
index 965af14c4..000000000
--- a/test/vitest/__tests__/pages/Agency/AgencyWorCenter.spec.js
+++ /dev/null
@@ -1,33 +0,0 @@
-import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
-import AgencyWorkCenter from 'pages/Agency/Card/AgencyWorkcenter.vue';
-
-describe('AgencyWorkCenter', () => {
-    let vm;
-    beforeAll(() => {
-        vm = createWrapper(AgencyWorkCenter, {
-            global: {
-                claim: {
-                    id: 1,
-                },
-            },
-        }).vm;
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('remove()', () => {
-        it('should delete the AgencyMode', async () => {
-            vi.spyOn(axios, 'delete').mockResolvedValue({ data: true });
-            vi.spyOn(vm.quasar, 'notify');
-
-            await vm.deleteWorCenter(1);
-
-            expect(vm.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({ type: 'positive' })
-            );
-        });
-    });
-});

From 7875df4b023b1a55470d31960ed69718b8cf150f Mon Sep 17 00:00:00 2001
From: jcasado <jcasado.verdnatura@gmail.com>
Date: Thu, 25 Apr 2024 14:03:00 +0200
Subject: [PATCH 24/38] refs #6697 fix tfront

---
 .../pages/Claims/ClaimLinesImport.spec.js     | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/test/vitest/__tests__/pages/Claims/ClaimLinesImport.spec.js b/test/vitest/__tests__/pages/Claims/ClaimLinesImport.spec.js
index 085118b14..d93c96132 100644
--- a/test/vitest/__tests__/pages/Claims/ClaimLinesImport.spec.js
+++ b/test/vitest/__tests__/pages/Claims/ClaimLinesImport.spec.js
@@ -5,7 +5,6 @@ import ClaimLinesImport from 'pages/Claim/Card/ClaimLinesImport.vue';
 describe('ClaimLinesImport', () => {
     let vm;
 
-
     beforeAll(() => {
         vm = createWrapper(ClaimLinesImport, {
             global: {
@@ -13,7 +12,7 @@ describe('ClaimLinesImport', () => {
                 mocks: {
                     fetch: vi.fn(),
                 },
-            }
+            },
         }).vm;
     });
 
@@ -26,25 +25,23 @@ describe('ClaimLinesImport', () => {
             vi.spyOn(axios, 'post').mockResolvedValue({ data: true });
             vi.spyOn(vm.quasar, 'notify');
 
-            vm.selected = [
-                { id: 1, saleFk: 1, claimFk: 1, quantity: 10 }
-            ]
+            vm.selected = [{ id: 1, saleFk: 1, claimFk: 1 }];
 
-            vm.route.params.id = 1
+            vm.route.params.id = 1;
 
             await vm.importLines();
-            const expectedData = [{ saleFk: 1, claimFk: 1, quantity: 10 }]
+            const expectedData = [{ saleFk: 1, claimFk: 1 }];
 
             expect(axios.post).toHaveBeenCalledWith('ClaimBeginnings', expectedData, {
-                signal: expect.any(Object)
-            })
+                signal: expect.any(Object),
+            });
             expect(vm.quasar.notify).toHaveBeenCalledWith(
                 expect.objectContaining({
                     message: 'Lines added to claim',
-                    type: 'positive'
+                    type: 'positive',
                 })
             );
-            expect(vm.canceller).toEqual(null)
+            expect(vm.canceller).toEqual(null);
         });
     });
 });

From fb4170d83db6049566f2d1be44746cfea961951b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 25 Apr 2024 15:25:20 +0200
Subject: [PATCH 25/38] fix Double request when update row

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

diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue
index 67a107ea4..4734260e0 100644
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@@ -296,7 +296,7 @@ onBeforeMount(() => {
                 <QTd>
                     <VnInput
                         v-model.number="row.saleQuantity"
-                        @change="changeQuantity(row)"
+                        @change.stop="changeQuantity(row)"
                         type="number"
                         :disable="!row.itemFk || row.isOk != null"
                         dense

From e5eb3010a36048c86513e97c82de2f28484f8bc8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 25 Apr 2024 15:31:14 +0200
Subject: [PATCH 26/38] fix: Change method because X updates row

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

diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue
index 4734260e0..1872ad859 100644
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@@ -296,7 +296,7 @@ onBeforeMount(() => {
                 <QTd>
                     <VnInput
                         v-model.number="row.saleQuantity"
-                        @change.stop="changeQuantity(row)"
+                        @blur="changeQuantity(row)"
                         type="number"
                         :disable="!row.itemFk || row.isOk != null"
                         dense

From 823351f76dc5dcd192d3db88c4070be682e3501f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 25 Apr 2024 10:55:48 -0300
Subject: [PATCH 27/38] Item botanical

---
 src/i18n/locale/en.yml                   |   1 +
 src/i18n/locale/es.yml                   |   1 +
 src/pages/Item/Card/CreateGenusForm.vue  |  50 ++++++++++
 src/pages/Item/Card/CreateSpecieForm.vue |  50 ++++++++++
 src/pages/Item/Card/ItemBotanical.vue    | 111 +++++++++++++++++++++++
 src/router/modules/item.js               |  11 ++-
 6 files changed, 223 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Item/Card/CreateGenusForm.vue
 create mode 100644 src/pages/Item/Card/CreateSpecieForm.vue
 create mode 100644 src/pages/Item/Card/ItemBotanical.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index ff57bf968..6ccb1a177 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1122,6 +1122,7 @@ item:
         fixedPrice: Fixed prices
         wasteBreakdown: Waste breakdown
         itemCreate: New item
+        botanical: Botanical
     descriptor:
         item: Item
         buyer: Buyer
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f9278a9b0..4bcf01400 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1121,6 +1121,7 @@ item:
         fixedPrice: Precios fijados
         wasteBreakdown: Deglose de mermas
         itemCreate: Nuevo artículo
+        botanical: Botánico
     descriptor:
         item: Artículo
         buyer: Comprador
diff --git a/src/pages/Item/Card/CreateGenusForm.vue b/src/pages/Item/Card/CreateGenusForm.vue
new file mode 100644
index 000000000..637a1137e
--- /dev/null
+++ b/src/pages/Item/Card/CreateGenusForm.vue
@@ -0,0 +1,50 @@
+<script setup>
+import { reactive, ref, onMounted, nextTick } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+
+const { t } = useI18n();
+const emit = defineEmits(['onDataSaved']);
+
+const genusInputRef = ref(null);
+const genusFormData = reactive({});
+
+const onDataSaved = (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
+};
+
+onMounted(async () => {
+    await nextTick();
+    genusInputRef.value.focus();
+});
+</script>
+
+<template>
+    <FormModelPopup
+        url-create="genera"
+        model="itemGenus"
+        :title="t('New genus')"
+        :form-initial-data="genusFormData"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    ref="genusInputRef"
+                    :label="t('Latin genus name')"
+                    v-model="data.name"
+                    :required="true"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    New genus: Nuevo genus
+    Latin genus name: Nombre del genus en latín
+</i18n>
diff --git a/src/pages/Item/Card/CreateSpecieForm.vue b/src/pages/Item/Card/CreateSpecieForm.vue
new file mode 100644
index 000000000..2731820ba
--- /dev/null
+++ b/src/pages/Item/Card/CreateSpecieForm.vue
@@ -0,0 +1,50 @@
+<script setup>
+import { reactive, ref, onMounted, nextTick } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+
+const { t } = useI18n();
+const emit = defineEmits(['onDataSaved']);
+
+const specieInputRef = ref(null);
+const specieFormData = reactive({});
+
+const onDataSaved = (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
+};
+
+onMounted(async () => {
+    await nextTick();
+    specieInputRef.value.focus();
+});
+</script>
+
+<template>
+    <FormModelPopup
+        url-create="species"
+        model="itemSpecie"
+        :title="t('New species')"
+        :form-initial-data="specieFormData"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    ref="specieInputRef"
+                    :label="t('Latin species name')"
+                    v-model="data.name"
+                    :required="true"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    New species: Nueva especie
+    Latin species name: Nombre de la especie en latín
+</i18n>
diff --git a/src/pages/Item/Card/ItemBotanical.vue b/src/pages/Item/Card/ItemBotanical.vue
new file mode 100644
index 000000000..0a28b05b8
--- /dev/null
+++ b/src/pages/Item/Card/ItemBotanical.vue
@@ -0,0 +1,111 @@
+<script setup>
+import { ref, onMounted, reactive } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
+import CreateGenusForm from './CreateGenusForm.vue';
+import CreateSpecieForm from './CreateSpecieForm.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const itemBotanicalsRef = ref(null);
+const itemGenusOptions = ref([]);
+const itemSpeciesOptions = ref([]);
+const itemBotanicals = ref([]);
+let itemBotanicalsForm = reactive({});
+
+const onGenusCreated = (response, formData) => {
+    itemGenusOptions.value = [...itemGenusOptions.value, response];
+    formData.genusFk = response.id;
+};
+
+const onSpecieCreated = (response, formData) => {
+    itemSpeciesOptions.value = [...itemSpeciesOptions.value, response];
+    formData.specieFk = response.id;
+};
+
+onMounted(async () => {
+    itemBotanicals.value = await itemBotanicalsRef.value.fetch();
+    if (itemBotanicals.value.length > 0)
+        Object.assign(itemBotanicalsForm, itemBotanicals.value[0]);
+});
+</script>
+<template>
+    <FetchData
+        ref="itemBotanicalsRef"
+        url="ItemBotanicals"
+        :filter="{
+            where: { itemFk: route.params.id },
+        }"
+        @on-fetch="(data) => (itemBotanicals = data)"
+    />
+    <FetchData
+        url="Genera"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        @on-fetch="(data) => (itemGenusOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Species"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        @on-fetch="(data) => (itemSpeciesOptions = data)"
+        auto-load
+    />
+    <FormModel
+        url-update="ItemBotanicals"
+        model="entry"
+        auto-load
+        :form-initial-data="itemBotanicalsForm"
+        :clear-store-on-unmount="false"
+    >
+        <template #form="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelectDialog
+                    :label="t('Genus')"
+                    v-model="data.genusFk"
+                    :options="itemGenusOptions"
+                    option-label="name"
+                    option-value="id"
+                    hide-selected
+                >
+                    <template #form>
+                        <CreateGenusForm
+                            @on-data-saved="
+                                (_, requestResponse) =>
+                                    onGenusCreated(requestResponse, data)
+                            "
+                        />
+                    </template>
+                </VnSelectDialog>
+                <VnSelectDialog
+                    :label="t('Species')"
+                    v-model="data.specieFk"
+                    :options="itemSpeciesOptions"
+                    option-label="name"
+                    option-value="id"
+                    hide-selected
+                >
+                    <template #form>
+                        <CreateSpecieForm
+                            @on-data-saved="
+                                (_, requestResponse) =>
+                                    onSpecieCreated(requestResponse, data)
+                            "
+                        />
+                    </template>
+                </VnSelectDialog>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
+
+<i18n>
+es:
+    Genus: Genus
+    Species: Especies
+</i18n>
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 2a8e87194..c787d05f2 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -11,7 +11,7 @@ export default {
     redirect: { name: 'ItemMain' },
     menus: {
         main: ['ItemList', 'WasteBreakdown', 'ItemFixedPrice'],
-        card: ['ItemBasicData'],
+        card: ['ItemBasicData', 'ItemBotanical'],
     },
     children: [
         {
@@ -103,6 +103,15 @@ export default {
                     },
                     component: () => import('src/pages/Item/Card/ItemBasicData.vue'),
                 },
+                {
+                    path: 'botanical',
+                    name: 'ItemBotanical',
+                    meta: {
+                        title: 'botanical',
+                        icon: 'vn:botanical',
+                    },
+                    component: () => import('src/pages/Item/Card/ItemBotanical.vue'),
+                },
             ],
         },
     ],

From 5544676a1b4a3f0bab4c79e4d88e743dc5b69c07 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 25 Apr 2024 16:18:06 +0200
Subject: [PATCH 28/38] fix: mistakes like console.log an disables

---
 src/i18n/locale/en.yml                                 | 3 ++-
 src/i18n/locale/es.yml                                 | 2 ++
 src/pages/Agency/AgencyList.vue                        | 8 --------
 src/pages/Agency/Card/AgencyDescriptor.vue             | 1 -
 src/pages/Agency/Card/AgencyModes.vue                  | 1 -
 src/pages/Agency/Card/AgencySummary.vue                | 7 ++++++-
 src/pages/Agency/Card/AgencyWorkcenter.vue             | 2 ++
 src/pages/Customer/components/CustomerCreditCreate.vue | 1 -
 src/pages/Ticket/TicketCreate.vue                      | 1 -
 9 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 4de062ab0..636774d54 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -98,6 +98,7 @@ globals:
     worker: Worker
     now: Now
     name: Name
+    new: New
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -1174,8 +1175,8 @@ agency:
     isOwn: Own
     isAnyVolumeAllowed: Any volume allowed
     notification:
-        removeItem: Agency removed successfully
         removeItemError: Error removing agency
+        removeItem: WorkCenter removed successfully
     pageTitles:
         agency: Agency
     searchBar:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 10b77ef49..a2c7dd4dc 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -98,6 +98,7 @@ globals:
     worker: Trabajador
     now: Ahora
     name: Nombre
+    new: Nuevo
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -1175,6 +1176,7 @@ agency:
     removeItem: Agencia eliminada correctamente
     notification:
         removeItemError: Error al eliminar la agencia
+        removeItem: Centro de trabajo eliminado correctamente
     pageTitles:
         agency: Agencia
     searchBar:
diff --git a/src/pages/Agency/AgencyList.vue b/src/pages/Agency/AgencyList.vue
index c04206625..88abba3eb 100644
--- a/src/pages/Agency/AgencyList.vue
+++ b/src/pages/Agency/AgencyList.vue
@@ -14,7 +14,6 @@ function navigate(id) {
 }
 function exprBuilder(param, value) {
     if (!value) return;
-    console.log('value: ', value);
     if (param !== 'search') return;
 
     if (!isNaN(value)) return { id: value };
@@ -62,13 +61,6 @@ function exprBuilder(param, value) {
                                 :disable="true"
                             />
                         </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openCard')"
-                                @click.stop="navigate(row.id)"
-                                outline
-                            />
-                        </template>
                     </CardList>
                 </template>
             </VnPaginate>
diff --git a/src/pages/Agency/Card/AgencyDescriptor.vue b/src/pages/Agency/Card/AgencyDescriptor.vue
index 311f5d3a5..0fa89d07d 100644
--- a/src/pages/Agency/Card/AgencyDescriptor.vue
+++ b/src/pages/Agency/Card/AgencyDescriptor.vue
@@ -19,7 +19,6 @@ const { params } = useRoute();
 const entityId = computed(() => props.id || params.id);
 const { store } = useArrayData('Parking');
 const card = computed(() => store.data);
-console.log('card: ', card);
 </script>
 <template>
     <CardDescriptor
diff --git a/src/pages/Agency/Card/AgencyModes.vue b/src/pages/Agency/Card/AgencyModes.vue
index 4b145f227..c4a92bca9 100644
--- a/src/pages/Agency/Card/AgencyModes.vue
+++ b/src/pages/Agency/Card/AgencyModes.vue
@@ -8,7 +8,6 @@ import VnLv from 'src/components/ui/VnLv.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-console.log('route: ', route.path);
 const routeId = route.params.id;
 </script>
 <template>
diff --git a/src/pages/Agency/Card/AgencySummary.vue b/src/pages/Agency/Card/AgencySummary.vue
index 4c9e7052f..0e80813aa 100644
--- a/src/pages/Agency/Card/AgencySummary.vue
+++ b/src/pages/Agency/Card/AgencySummary.vue
@@ -38,10 +38,15 @@ const filter = {
                         />
                     </QCardSection>
                     <VnLv :label="t('globals.name')" :value="agency.name" />
-                    <QCheckbox :label="t('agency.isOwn')" v-model="agency.isOwn" />
+                    <QCheckbox
+                        :label="t('agency.isOwn')"
+                        v-model="agency.isOwn"
+                        :disable="true"
+                    />
                     <QCheckbox
                         :label="t('agency.isAnyVolumeAllowed')"
                         v-model="agency.isAnyVolumeAllowed"
+                        :disable="true"
                     />
                 </QCard>
             </template>
diff --git a/src/pages/Agency/Card/AgencyWorkcenter.vue b/src/pages/Agency/Card/AgencyWorkcenter.vue
index ed9f15689..b5e846300 100644
--- a/src/pages/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Agency/Card/AgencyWorkcenter.vue
@@ -134,6 +134,8 @@ async function deleteWorCenter(id) {
         Search agency: Buscar agencia
         You can search by name: Puedes buscar por nombre
         This workCenter is already assigned to this agency: Este workCenter ya está asignado a esta agencia
+        Add work center: Añadir centro de trabajo
+        workCenter: Centro de trabajo
     en:
         isOwn: Has owner
         isAnyVolumeAllowed: Allows any volume
diff --git a/src/pages/Customer/components/CustomerCreditCreate.vue b/src/pages/Customer/components/CustomerCreditCreate.vue
index ae6d4de89..729deb258 100644
--- a/src/pages/Customer/components/CustomerCreditCreate.vue
+++ b/src/pages/Customer/components/CustomerCreditCreate.vue
@@ -13,7 +13,6 @@ const router = useRouter();
 const initialData = ref({});
 
 const setClient = (data) => {
-    console.log(data.credit);
     initialData.value.credit = data.credit;
 };
 
diff --git a/src/pages/Ticket/TicketCreate.vue b/src/pages/Ticket/TicketCreate.vue
index 3fb9c0083..c6cd25244 100644
--- a/src/pages/Ticket/TicketCreate.vue
+++ b/src/pages/Ticket/TicketCreate.vue
@@ -73,7 +73,6 @@ const fetchAddresses = async (formData) => {
 
         const { defaultAddress } = selectedClient.value;
         formData.addressId = defaultAddress.id;
-        console.log();
     } catch (err) {
         console.error(`Error fetching addresses`, err);
         return err.response;

From 436f24b674fb43b30d8e32db040070934bf5db7c Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 25 Apr 2024 17:11:30 +0200
Subject: [PATCH 29/38] fix: translates

---
 src/pages/Agency/Card/AgencyModes.vue      |  2 ++
 src/pages/Agency/Card/AgencyWorkcenter.vue |  8 +-------
 src/pages/Agency/locale/en.yml             | 11 +++++++++++
 src/pages/Agency/locale/es,yml             | 12 ++++++++++++
 4 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 src/pages/Agency/locale/en.yml
 create mode 100644 src/pages/Agency/locale/es,yml

diff --git a/src/pages/Agency/Card/AgencyModes.vue b/src/pages/Agency/Card/AgencyModes.vue
index c4a92bca9..4fb81914a 100644
--- a/src/pages/Agency/Card/AgencyModes.vue
+++ b/src/pages/Agency/Card/AgencyModes.vue
@@ -52,6 +52,8 @@ const routeId = route.params.id;
         isAnyVolumeAllowed: Permite cualquier volumen
         Search agency: Buscar agencia
         You can search by name: Puedes buscar por nombre
+        deliveryMethod: Método de entrega
+        inflation: Inflación
     en:
         isOwn: Has owner
         isAnyVolumeAllowed: Allows any volume
diff --git a/src/pages/Agency/Card/AgencyWorkcenter.vue b/src/pages/Agency/Card/AgencyWorkcenter.vue
index b5e846300..31be90af4 100644
--- a/src/pages/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Agency/Card/AgencyWorkcenter.vue
@@ -129,14 +129,8 @@ async function deleteWorCenter(id) {
 </style>
 <i18n>
     es: 
-        isOwn: Tiene propietario
-        isAnyVolumeAllowed: Permite cualquier volumen
-        Search agency: Buscar agencia
-        You can search by name: Puedes buscar por nombre
+        workCenter removed successfully: Centro de trabajo eliminado correctamente
         This workCenter is already assigned to this agency: Este workCenter ya está asignado a esta agencia
         Add work center: Añadir centro de trabajo
         workCenter: Centro de trabajo
-    en:
-        isOwn: Has owner
-        isAnyVolumeAllowed: Allows any volume
 </i18n>
diff --git a/src/pages/Agency/locale/en.yml b/src/pages/Agency/locale/en.yml
new file mode 100644
index 000000000..3cc3d69e8
--- /dev/null
+++ b/src/pages/Agency/locale/en.yml
@@ -0,0 +1,11 @@
+agency:
+    isOwn: Own
+    isAnyVolumeAllowed: Any volume allowed
+    notification:
+        removeItemError: Error removing agency
+        removeItem: WorkCenter removed successfully
+    pageTitles:
+        agency: Agency
+    searchBar:
+        info: You can search by agency code
+        label: Search agency...
diff --git a/src/pages/Agency/locale/es,yml b/src/pages/Agency/locale/es,yml
new file mode 100644
index 000000000..2607472bd
--- /dev/null
+++ b/src/pages/Agency/locale/es,yml
@@ -0,0 +1,12 @@
+agency:
+    isOwn: Propio
+    isAnyVolumeAllowed: Cualquier volumen
+    removeItem: Agencia eliminada correctamente
+    notification:
+        removeItemError: Error al eliminar la agencia
+        removeItem: Centro de trabajo eliminado correctamente
+    pageTitles:
+        agency: Agencia
+    searchBar:
+        info: Puedes buscar por nombre o id
+        label: Buscar agencia...

From fff9ec41845bff6405535e9c6f4310fb84ae0512 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 25 Apr 2024 17:17:28 +0200
Subject: [PATCH 30/38] fix: e2e test

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

diff --git a/test/cypress/integration/agency/agencyWorkCenter.spec.js b/test/cypress/integration/agency/agencyWorkCenter.spec.js
index 7f875179b..ff3c53214 100644
--- a/test/cypress/integration/agency/agencyWorkCenter.spec.js
+++ b/test/cypress/integration/agency/agencyWorkCenter.spec.js
@@ -23,7 +23,7 @@ describe('AgencyWorkCenter', () => {
         cy.get('.q-item__section--side > .q-btn > .q-btn__content > .q-icon').click();
         cy.get('.q-notification__message').should(
             'have.text',
-            'Agency removed successfully'
+            'WorkCenter removed successfully'
         );
     });
 

From d7bebfecb1723501d6125adaa9dd1dec02266269 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 26 Apr 2024 08:28:42 +0200
Subject: [PATCH 31/38] fix: fix translates

---
 src/pages/Agency/locale/{es,yml => es.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/pages/Agency/locale/{es,yml => es.yml} (100%)

diff --git a/src/pages/Agency/locale/es,yml b/src/pages/Agency/locale/es.yml
similarity index 100%
rename from src/pages/Agency/locale/es,yml
rename to src/pages/Agency/locale/es.yml

From fc275d927436b08fa558c40c5e353939443319d7 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 26 Apr 2024 08:29:34 +0200
Subject: [PATCH 32/38] refs #6976 remove logs

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

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index ca6d1557f..be3d4a992 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -33,14 +33,12 @@ const arrayData = useArrayData('SupplierConsumption', {
 
 const store = arrayData.store;
 
-watch(() => route.query);
-
 onUnmounted(() => state.unset('SupplierConsumption'));
 const dateRanges = computed(() => {
     const { from, to } = arrayData.store?.userParams || {};
     return { from, to };
 });
-console.log('dataRanges', dateRanges);
+
 const reportParams = computed(() => ({
     recipientId: Number(route.params.id),
     ...dateRanges.value,
@@ -127,9 +125,6 @@ onMounted(async () => {
     stateStore.rightDrawer = true;
     await getSupplierConsumptionData();
 });
-
-console.log('dateRange From', dateRanges.value.from);
-console.log('dateRange value', dateRanges.value);
 </script>
 
 <template>

From faa6d0e4fa8416cf3dcda5857e5577365c6ff83f Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 26 Apr 2024 08:33:41 +0200
Subject: [PATCH 33/38] feat: setup commit

---
 test/vitest/setup-file.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/vitest/setup-file.js b/test/vitest/setup-file.js
index e69de29bb..288f80beb 100644
--- a/test/vitest/setup-file.js
+++ b/test/vitest/setup-file.js
@@ -0,0 +1 @@
+// This file will be run before each test file, don't delete or vitest will not work.

From 7f4155cde9a535662033e379052ae42d9d7eb914 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 08:54:26 +0200
Subject: [PATCH 34/38] fix: replace VnSelectFilter by VnSelect

---
 src/components/ItemsFilterPanel.vue     | 10 +++++-----
 src/pages/Item/ItemFixedPrice.vue       | 10 +++++-----
 src/pages/Item/ItemFixedPriceFilter.vue |  6 +++---
 src/pages/Item/ItemRequestFilter.vue    | 12 ++++++------
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue
index f7f07a5b0..94adfe0ff 100644
--- a/src/components/ItemsFilterPanel.vue
+++ b/src/components/ItemsFilterPanel.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
 import axios from 'axios';
@@ -207,7 +207,7 @@ const removeTag = (index, params, search) => {
             </QItem>
             <QItem class="q-my-md">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('components.itemsFilterPanel.typeFk')"
                         v-model="params.typeFk"
                         :options="itemTypesOptions"
@@ -235,7 +235,7 @@ const removeTag = (index, params, search) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QSeparator />
@@ -246,7 +246,7 @@ const removeTag = (index, params, search) => {
                 class="q-mt-md filter-value"
             >
                 <QItemSection class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('components.itemsFilterPanel.tag')"
                         v-model="value.selectedTag"
                         :options="tagOptions"
@@ -261,7 +261,7 @@ const removeTag = (index, params, search) => {
                     />
                 </QItemSection>
                 <QItemSection class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         v-if="!value?.selectedTag?.isFree && value.valueOptions"
                         :label="t('components.itemsFilterPanel.value')"
                         v-model="value.value"
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 0dd7ca07d..2a753a3a5 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import EditTableCellValueForm from 'src/components/EditTableCellValueForm.vue';
 import ItemFixedPriceFilter from './ItemFixedPriceFilter.vue';
@@ -178,7 +178,7 @@ const columns = computed(() => [
         name: 'warehouse',
         ...defaultColumnAttrs,
         columnFilter: {
-            component: VnSelectFilter,
+            component: VnSelect,
             type: 'select',
             filterValue: null,
             event: getColumnInputEvents,
@@ -434,7 +434,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 
             <template #body-cell-itemId="props">
                 <QTd>
-                    <VnSelectFilter
+                    <VnSelect
                         :options="itemsWithNameOptions"
                         hide-selected
                         option-label="id"
@@ -450,7 +450,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QTd>
             </template>
             <template #body-cell-description="{ row }">
@@ -531,7 +531,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </template>
             <template #body-cell-warehouse="props">
                 <QTd class="col">
-                    <VnSelectFilter
+                    <VnSelect
                         :options="warehousesOptions"
                         hide-selected
                         option-label="name"
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index cd86b5f71..6c847ece8 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
 
 const { t } = useI18n();
@@ -35,7 +35,7 @@ const itemTypeWorkersOptions = ref([]);
         <template #body="{ params, searchFn }">
             <QItem class="q-my-md">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('components.itemsFilterPanel.buyerFk')"
                         v-model="params.buyerFk"
                         :options="itemTypeWorkersOptions"
@@ -51,7 +51,7 @@ const itemTypeWorkersOptions = ref([]);
             </QItem>
             <QItem class="q-my-md">
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('components.itemsFilterPanel.warehouseFk')"
                         v-model="params.warehouseFk"
                         :options="warehousesOptions"
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index 8b0b34e62..e142c28d3 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -3,7 +3,7 @@ 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 VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
@@ -126,7 +126,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         v-model="params.attenderFk"
                         :label="t('params.attenderFk')"
                         @update:model-value="searchFn()"
@@ -151,7 +151,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.warehouseFk')"
                         v-model="params.warehouseFk"
                         @update:model-value="searchFn()"
@@ -167,7 +167,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.requesterFk')"
                         v-model="params.requesterFk"
                         @update:model-value="searchFn()"
@@ -190,7 +190,7 @@ const decrement = (paramsObj, key) => {
                                 </QItemSection>
                             </QItem>
                         </template>
-                    </VnSelectFilter>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QCard bordered>
@@ -261,7 +261,7 @@ const decrement = (paramsObj, key) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnSelectFilter
+                    <VnSelect
                         :label="t('params.state')"
                         v-model="params.state"
                         @update:model-value="searchFn()"

From 966831b6d3605c75d986b7f8c65d65d407927f57 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 26 Apr 2024 09:00:42 +0200
Subject: [PATCH 35/38] refs #6976 fix pr

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

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index be3d4a992..8dbb87529 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -49,7 +49,6 @@ async function getSupplierConsumptionData() {
 }
 
 const rows = computed(() => {
-    console.log(store.data);
     return totalEntryPrice(store.data) || [];
 });
 
@@ -118,9 +117,6 @@ const totalEntryPrice = (rows) => {
     return rows;
 };
 
-totalEntryPrice(rows.value);
-console.log('row', rows.value);
-
 onMounted(async () => {
     stateStore.rightDrawer = true;
     await getSupplierConsumptionData();

From 3c033458d3c1dd75dbc4baf14b4dc8a512b6f4b3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 09:02:51 +0200
Subject: [PATCH 36/38] fix: minor changes

---
 src/i18n/locale/en.yml                | 2 ++
 src/pages/Item/Card/ItemBotanical.vue | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index a07e35f30..68f1b3db3 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1126,6 +1126,8 @@ item:
         wasteBreakdown: Waste breakdown
         itemCreate: New item
         log: Log
+        tax: Tax
+        barcode: Barcode
         botanical: Botanical
     descriptor:
         item: Item
diff --git a/src/pages/Item/Card/ItemBotanical.vue b/src/pages/Item/Card/ItemBotanical.vue
index 0a28b05b8..0dd1d1a19 100644
--- a/src/pages/Item/Card/ItemBotanical.vue
+++ b/src/pages/Item/Card/ItemBotanical.vue
@@ -107,5 +107,5 @@ onMounted(async () => {
 <i18n>
 es:
     Genus: Genus
-    Species: Especies
+    Species: Especie
 </i18n>

From 36e99e2c6cc267c146dff230184ea9c62d5c8658 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Apr 2024 09:28:32 +0200
Subject: [PATCH 37/38] fix: bug when save

---
 src/pages/Item/Card/ItemBotanical.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/pages/Item/Card/ItemBotanical.vue b/src/pages/Item/Card/ItemBotanical.vue
index 0dd1d1a19..15492de9f 100644
--- a/src/pages/Item/Card/ItemBotanical.vue
+++ b/src/pages/Item/Card/ItemBotanical.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, reactive } from 'vue';
+import { ref, onMounted, reactive, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -17,7 +17,7 @@ const itemBotanicalsRef = ref(null);
 const itemGenusOptions = ref([]);
 const itemSpeciesOptions = ref([]);
 const itemBotanicals = ref([]);
-let itemBotanicalsForm = reactive({});
+let itemBotanicalsForm = reactive({ itemFk: null });
 
 const onGenusCreated = (response, formData) => {
     itemGenusOptions.value = [...itemGenusOptions.value, response];
@@ -28,8 +28,11 @@ const onSpecieCreated = (response, formData) => {
     itemSpeciesOptions.value = [...itemSpeciesOptions.value, response];
     formData.specieFk = response.id;
 };
-
+const entityId = computed(() => {
+    return route.params.id;
+});
 onMounted(async () => {
+    itemBotanicalsForm.itemFk = entityId.value;
     itemBotanicals.value = await itemBotanicalsRef.value.fetch();
     if (itemBotanicals.value.length > 0)
         Object.assign(itemBotanicalsForm, itemBotanicals.value[0]);
@@ -40,7 +43,7 @@ onMounted(async () => {
         ref="itemBotanicalsRef"
         url="ItemBotanicals"
         :filter="{
-            where: { itemFk: route.params.id },
+            where: { itemFk: entityId },
         }"
         @on-fetch="(data) => (itemBotanicals = data)"
     />

From 8f064e333878e6569e3329eb2f5f4ed19766f0c5 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 26 Apr 2024 09:37:02 +0200
Subject: [PATCH 38/38] warmFix: replace VnSelectFilter to VnSelect

---
 src/pages/Agency/Card/AgencyBasicData.vue  | 4 ++--
 src/pages/Agency/Card/AgencySummary.vue    | 2 +-
 src/pages/Agency/Card/AgencyWorkcenter.vue | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/Agency/Card/AgencyBasicData.vue b/src/pages/Agency/Card/AgencyBasicData.vue
index 5999f853b..599058b3e 100644
--- a/src/pages/Agency/Card/AgencyBasicData.vue
+++ b/src/pages/Agency/Card/AgencyBasicData.vue
@@ -7,7 +7,7 @@ import FormModel from 'components/FormModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -27,7 +27,7 @@ const warehouses = ref([]);
                 <VnInput v-model="data.name" :label="t('globals.name')" />
             </VnRow>
             <VnRow>
-                <VnSelectFilter
+                <VnSelect
                     v-model="data.warehouseFk"
                     option-value="id"
                     option-label="name"
diff --git a/src/pages/Agency/Card/AgencySummary.vue b/src/pages/Agency/Card/AgencySummary.vue
index 0e80813aa..a4a6a2a18 100644
--- a/src/pages/Agency/Card/AgencySummary.vue
+++ b/src/pages/Agency/Card/AgencySummary.vue
@@ -7,7 +7,7 @@ import FetchData from 'src/components/FetchData.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const $props = defineProps({
     id: {
diff --git a/src/pages/Agency/Card/AgencyWorkcenter.vue b/src/pages/Agency/Card/AgencyWorkcenter.vue
index 31be90af4..f5beaab53 100644
--- a/src/pages/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Agency/Card/AgencyWorkcenter.vue
@@ -12,7 +12,7 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnRow from 'components/ui/VnRow.vue';
 
-import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -99,7 +99,7 @@ async function deleteWorCenter(id) {
                 >
                     <template #form-inputs="{ data }">
                         <VnRow class="row q-gutter-md q-mb-md">
-                            <VnSelectFilter
+                            <VnSelect
                                 v-model="data.workCenterFk"
                                 option-value="id"
                                 option-label="name"
@@ -128,7 +128,7 @@ async function deleteWorCenter(id) {
 }
 </style>
 <i18n>
-    es: 
+    es:
         workCenter removed successfully: Centro de trabajo eliminado correctamente
         This workCenter is already assigned to this agency: Este workCenter ya está asignado a esta agencia
         Add work center: Añadir centro de trabajo