From 967e3334ae0710ce22eeeace84f159a65c16919c Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 27 Dec 2024 14:06:12 +0100
Subject: [PATCH 01/14] refactor: refs #8316 used VnSection and VnBetaCard

---
 src/pages/Item/ItemType/Card/ItemTypeCard.vue | 16 +---
 src/pages/Item/ItemType/locale/en.yml         |  2 +
 src/pages/Item/ItemType/locale/es.yml         |  2 +
 src/pages/Item/ItemTypeList.vue               | 84 +++++++++--------
 src/router/modules/itemType.js                | 93 ++++++++++---------
 5 files changed, 105 insertions(+), 92 deletions(-)

diff --git a/src/pages/Item/ItemType/Card/ItemTypeCard.vue b/src/pages/Item/ItemType/Card/ItemTypeCard.vue
index 0a2706a07..fa51e428e 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeCard.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeCard.vue
@@ -1,20 +1,12 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ItemTypeDescriptor from 'src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue';
-import ItemTypeFilter from 'src/pages/Item/ItemType/ItemTypeFilter.vue';
-import ItemTypeSearchbar from '../ItemTypeSearchbar.vue';
 </script>
+
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="ItemTypeSummary"
         base-url="ItemTypes"
         :descriptor="ItemTypeDescriptor"
-        :filter-panel="ItemTypeFilter"
-        search-data-key="ItemTypeList"
-        search-url="ItemTypes"
-    >
-        <template #searchbar>
-            <ItemTypeSearchbar />
-        </template>
-    </VnCard>
+    />
 </template>
diff --git a/src/pages/Item/ItemType/locale/en.yml b/src/pages/Item/ItemType/locale/en.yml
index 99c6791f2..83fe7e633 100644
--- a/src/pages/Item/ItemType/locale/en.yml
+++ b/src/pages/Item/ItemType/locale/en.yml
@@ -15,3 +15,5 @@ itemType:
         promo: Promo
         itemPackingType: Item packing type
         isUnconventionalSize: Is unconventional size
+    search: Search item type
+    searchInfo: Search item type by id, name or code
diff --git a/src/pages/Item/ItemType/locale/es.yml b/src/pages/Item/ItemType/locale/es.yml
index c91fb4058..f592f5c8c 100644
--- a/src/pages/Item/ItemType/locale/es.yml
+++ b/src/pages/Item/ItemType/locale/es.yml
@@ -15,3 +15,5 @@ itemType:
         promo: Promoción
         itemPackingType: Tipo de embalaje
         isUnconventionalSize: Es de tamaño poco convencional
+    search: Buscar familia
+    searchInfo: Buscar familia por id, nombre o código
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 4cea931e2..b1abac283 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -1,17 +1,17 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { ref, computed } from 'vue';
-import ItemTypeSearchbar from 'src/pages/Item/ItemType/ItemTypeSearchbar.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import FetchData from 'components/FetchData.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import ItemTypeFilter from './ItemType/ItemTypeFilter.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
 const itemCategoriesOptions = ref([]);
 const temperatureOptions = ref([]);
+const dataKey='ItemTypeList';
 
 const columns = computed(() => [
     {
@@ -103,49 +103,57 @@ const columns = computed(() => [
         @on-fetch="(data) => (temperatureOptions = data)"
         auto-load
     />
-    <RightMenu>
-        <template #right-panel>
+    <VnSection 
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="itemType"
+        :array-data-props="{
+            url: 'ItemTypes',
+            order: 'name ASC',
+            exprBuilder,
+        }"
+    >
+        <template #rightMenu>
             <ItemTypeFilter data-key="ItemTypeList" />
         </template>
-    </RightMenu>
-    <ItemTypeSearchbar />
-    <VnTable
-        ref="tableRef"
-        data-key="ItemTypeList"
-        url="ItemTypes"
-        :create="{
-            urlCreate: 'ItemTypes',
-            title: t('Create ItemTypes'),
-            onDataSaved: () => tableRef.reload(),
-            formInitialData: {},
-        }"
-        :user-filter="{
-            include: {
-                relation: 'worker',
-                scope: {
-                    fields: ['id'],
+        <template #body>
+            <VnTable
+                ref="tableRef"
+                :data-key="dataKey"
+                :create="{
+                    urlCreate: 'ItemTypes',
+                    title: t('Create ItemTypes'),
+                    onDataSaved: () => tableRef.reload(),
+                    formInitialData: {},
+                }"
+                :user-filter="{
                     include: {
-                        relation: 'user',
+                        relation: 'worker',
                         scope: {
-                            fields: ['id', 'name'],
+                            fields: ['id'],
+                            include: {
+                                relation: 'user',
+                                scope: {
+                                    fields: ['id', 'name'],
+                                },
+                            },
                         },
                     },
-                },
-            },
-        }"
-        order="name ASC"
-        :columns="columns"
-        auto-load
-        :right-search="false"
-        redirect="item/item-type"
-    >
-        <template #column-workerFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.worker?.user?.name }}
-                <WorkerDescriptorProxy :id="row.workerFk" />
-            </span>
+                }"
+                :columns="columns"
+                auto-load
+                :right-search="false"
+                redirect="item/item-type"
+            >
+                <template #column-workerFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.worker?.user?.name }}
+                        <WorkerDescriptorProxy :id="row.workerFk" />
+                    </span>
+                </template>
+            </VnTable>
         </template>
-    </VnTable>
+    </VnSection>
 </template>
 
 <i18n>
diff --git a/src/router/modules/itemType.js b/src/router/modules/itemType.js
index 1ceecd4cc..02b4f6ca5 100644
--- a/src/router/modules/itemType.js
+++ b/src/router/modules/itemType.js
@@ -1,56 +1,65 @@
 import { RouterView } from 'vue-router';
 
+const itemTypeCard = {
+    name: 'ItemTypeCard',
+    path: ':id',
+    component: () => import('src/pages/Item/ItemType/Card/ItemTypeCard.vue'),
+    redirect: { name: 'ItemTypeSummary' },
+    meta: {
+        menu: [
+            'ItemTypeBasicData',
+            'ItemTypeLog',
+        ]
+    },
+    children: [
+        {
+            path: 'summary',
+            name: 'ItemTypeSummary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Item/ItemType/Card/ItemTypeSummary.vue'),
+        },
+        {
+            path: 'basic-data',
+            name: 'ItemTypeBasicData',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('src/pages/Item/ItemType/Card/ItemTypeBasicData.vue'),
+        },
+        {
+            path: 'log',
+            name: 'ItemTypeLog',
+            meta: {
+                title: 'log',
+                icon: 'vn:History',
+            },
+            component: () => import('src/pages/Item/ItemType/Card/ItemTypeLog.vue'),
+        },
+    ],
+};
+
 export default {
-    path: '/item/item-type',
     name: 'ItemType',
+    path: '/item/item-type',
     meta: {
         title: 'itemType',
         icon: 'contact_support',
         moduleName: 'ItemType',
+        menu: [],
     },
     component: RouterView,
-    redirect: { name: 'ItemTypeList' },
-    menus: {
-        main: [],
-        card: ['ItemTypeBasicData', 'ItemTypeLog'],
-    },
+    redirect: { name: 'ItemTypeMain' },
     children: [
         {
-            name: 'ItemTypeCard',
-            path: ':id',
-            component: () => import('src/pages/Item/ItemType/Card/ItemTypeCard.vue'),
-            redirect: { name: 'ItemTypeSummary' },
-            children: [
-                {
-                    name: 'ItemTypeSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                    },
-                    component: () =>
-                        import('src/pages/Item/ItemType/Card/ItemTypeSummary.vue'),
-                },
-                {
-                    name: 'ItemTypeBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () =>
-                        import('src/pages/Item/ItemType/Card/ItemTypeBasicData.vue'),
-                },
-                {
-                    path: 'log',
-                    name: 'ItemTypeLog',
-                    meta: {
-                        title: 'log',
-                        icon: 'vn:History',
-                    },
-                    component: () =>
-                        import('src/pages/Item/ItemType/Card/ItemTypeLog.vue'),
-                },
-            ],
+            name: 'ItemTypeMain',
+            path: '',
+            component: () => import('src/components/common/VnModule.vue'),
+            redirect: { name: 'ItemTypeIndexMain' },
+            children: [itemTypeCard],
         },
     ],
-};
+};
\ No newline at end of file

From 37a71f7594dd5d068c9b3dbe30b23a9ae4309c58 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Thu, 9 Jan 2025 10:29:44 +0100
Subject: [PATCH 02/14] refactor: refs #8316 used VnSection and VnCardBeta on
 ItemCard

---
 src/pages/Item/Card/ItemCard.vue |  12 +-
 src/pages/Item/ItemList.vue      | 135 ++++++++--------
 src/pages/Item/locale/en.yml     |   2 +
 src/pages/Item/locale/es.yml     |   2 +
 src/router/modules/item.js       | 262 ++++++++++++++++---------------
 5 files changed, 211 insertions(+), 202 deletions(-)

diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue
index 2412f2bf9..2546982eb 100644
--- a/src/pages/Item/Card/ItemCard.vue
+++ b/src/pages/Item/Card/ItemCard.vue
@@ -1,19 +1,11 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ItemDescriptor from './ItemDescriptor.vue';
-import ItemListFilter from '../ItemListFilter.vue';
 </script>
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="Item"
         base-url="Items"
         :descriptor="ItemDescriptor"
-        :filter-panel="ItemListFilter"
-        search-data-key="ItemList"
-        :searchbar-props="{
-            url: 'Items/filter',
-            label: 'searchbar.label',
-            info: 'searchbar.info',
-        }"
     />
 </template>
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 5119b5177..e4bb9b9a2 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -6,15 +6,14 @@ import VnImg from 'src/components/ui/VnImg.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import { toDate } from 'src/filters';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import ItemSummary from '../Item/Card/ItemSummary.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
 import ItemTypeDescriptorProxy from './ItemType/Card/ItemTypeDescriptorProxy.vue';
 import { cloneItem } from 'src/pages/Item/composables/cloneItem';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import ItemListFilter from './ItemListFilter.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const entityId = computed(() => route.params.id);
 const { openCloneDialog } = cloneItem();
@@ -22,6 +21,7 @@ const { viewSummary } = useSummaryDialog();
 const { t } = useI18n();
 const tableRef = ref();
 const route = useRoute();
+const dataKey = 'ItemList';
 
 const itemFilter = {
     include: [
@@ -298,73 +298,78 @@ const columns = computed(() => [
     },
 ]);
 </script>
+
 <template>
-    <VnSearchbar
-        data-key="ItemList"
-        :label="t('item.searchbar.label')"
-        :info="t('You can search by id')"
-    />
-    <RightMenu>
-        <template #right-panel>
+    <VnSection
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="item"
+        :array-data-props="{
+            url: 'Items',
+            order: ['isActive DESC', 'name', 'id']
+        }"
+    >
+        <template #rightMenu>
             <ItemListFilter data-key="ItemList" />
         </template>
-    </RightMenu>
-    <VnTable
-        ref="tableRef"
-        data-key="ItemList"
-        url="Items/filter"
-        :create="{
-            urlCreate: 'Items',
-            title: t('Create Item'),
-            onDataSaved: () => tableRef.redirect(),
-            formInitialData: {
-                editorFk: entityId,
-            },
-        }"
-        :order="['isActive DESC', 'name', 'id']"
-        :columns="columns"
-        redirect="Item"
-        :is-editable="false"
-        :right-search="false"
-        :filter="itemFilter"
-    >
-        <template #column-image="{ row }">
-            <VnImg
-                :id="row?.id"
-                zoom-resolution="1600x900"
-                :zoom="true"
-                class="rounded"
-            />
+        <template #body>
+            <VnTable
+                ref="tableRef"
+                :data-key="dataKey"
+                :columns="columns"
+                :right-search="false"
+                redirect="Item"
+                url="Items/filter"
+                :create="{
+                    urlCreate: 'Items',
+                    title: t('Create Item'),
+                    onDataSaved: () => tableRef.redirect(),
+                    formInitialData: {
+                        editorFk: entityId,
+                    },
+                }"
+                :is-editable="false"
+                :filter="itemFilter"
+            >
+                <template #column-image="{ row }">
+                    <VnImg
+                        :id="row?.id"
+                        zoom-resolution="1600x900"
+                        :zoom="true"
+                        class="rounded"
+                    />
+                </template>
+                <template #column-id="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.id }}
+                        <ItemDescriptorProxy :id="row.id" />
+                    </span>
+                </template>
+                <template #column-typeName="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.typeName }}
+                        {{ row.typeFk }}
+                        <ItemTypeDescriptorProxy :id="row.typeFk" />
+                    </span>
+                </template>
+                <template #column-userName="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.userName }}
+                        <WorkerDescriptorProxy :id="row.buyerFk" />
+                    </span>
+                </template>
+                <template #column-description="{ row }">
+                    <div class="row column full-width justify-between items-start">
+                        {{ row?.name }}
+                        <div v-if="row?.subName" class="subName">
+                            {{ row?.subName.toUpperCase() }}
+                        </div>
+                    </div>
+                    <FetchedTags :item="row" :columns="3" />
+                </template>
+            </VnTable>
         </template>
-        <template #column-id="{ row }">
-            <span class="link" @click.stop>
-                {{ row.id }}
-                <ItemDescriptorProxy :id="row.id" />
-            </span>
-        </template>
-        <template #column-typeName="{ row }">
-            <span class="link" @click.stop>
-                {{ row.typeName }}
-                {{ row.typeFk }}
-                <ItemTypeDescriptorProxy :id="row.typeFk" />
-            </span>
-        </template>
-        <template #column-userName="{ row }">
-            <span class="link" @click.stop>
-                {{ row.userName }}
-                <WorkerDescriptorProxy :id="row.buyerFk" />
-            </span>
-        </template>
-        <template #column-description="{ row }">
-            <div class="row column full-width justify-between items-start">
-                {{ row?.name }}
-                <div v-if="row?.subName" class="subName">
-                    {{ row?.subName.toUpperCase() }}
-                </div>
-            </div>
-            <FetchedTags :item="row" :columns="3" />
-        </template>
-    </VnTable>
+    </VnSection>
 </template>
 <style lang="scss" scoped>
 .subName {
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
index ac5010a12..7204a0538 100644
--- a/src/pages/Item/locale/en.yml
+++ b/src/pages/Item/locale/en.yml
@@ -217,3 +217,5 @@ item:
         minSalesQuantity: 'Cantidad mínima de venta'
         genus: 'Genus'
         specie: 'Specie'
+    search: 'Search item'
+    searchInfo: 'You can search by id'
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
index 96c8cbc9a..9b2614771 100644
--- a/src/pages/Item/locale/es.yml
+++ b/src/pages/Item/locale/es.yml
@@ -219,3 +219,5 @@ item:
         achieved: 'Conseguido'
         concept: 'Concepto'
         state: 'Estado'
+    search: 'Buscar artículo'
+    searchInfo: 'Puedes buscar por id'
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index e2afd6c7b..f69ebc198 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -1,25 +1,12 @@
 import { RouterView } from 'vue-router';
 
-export default {
-    path: '/item',
-    name: 'Item',
+const itemCard = {
+    name: 'ItemCard',
+    path: ':id',
+    component: () => import('src/pages/Item/Card/ItemCard.vue'),
+    redirect: { name: 'ItemSummary' },
     meta: {
-        title: 'items',
-        icon: 'vn:item',
-        moduleName: 'Item',
-        keyBinding: 'a',
-    },
-    component: RouterView,
-    redirect: { name: 'ItemMain' },
-    menus: {
-        main: [
-            'ItemList',
-            'WasteBreakdown',
-            'ItemFixedPrice',
-            'ItemRequest',
-            'ItemTypeList',
-        ],
-        card: [
+        menu: [
             'ItemBasicData',
             'ItemLog',
             'ItemDiary',
@@ -29,24 +16,143 @@ export default {
             'ItemBarcode',
             'ItemShelving',
             'ItemLastEntries',
-            'ItemTags',
-        ],
+        ]
     },
     children: [
         {
+            name: 'ItemSummary',
+            path: 'summary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Item/Card/ItemSummary.vue'),
+        },
+        {
+            path: 'basic-data',
+            name: 'ItemBasicData',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('src/pages/Item/Card/ItemBasicData.vue'),
+        },
+        {
+            path: 'log',
+            name: 'ItemLog',
+            meta: {
+                title: 'log',
+                icon: 'vn:History',
+            },
+            component: () => import('src/pages/Item/Card/ItemLog.vue'),
+        },
+        {
+            path: 'diary',
+            name: 'ItemDiary',
+            meta: {
+                title: 'diary',
+                icon: 'vn:transaction',
+            },
+            component: () => import('src/pages/Item/Card/ItemDiary.vue'),
+        },
+        {
+            path: 'tags',
+            name: 'ItemTags',
+            meta: {
+                title: 'tags',
+                icon: 'vn:tag',
+            },
+            component: () => import('src/pages/Item/Card/ItemTags.vue'),
+        },
+        {
+            path: 'tax',
+            name: 'ItemTax',
+            meta: {
+                title: 'tax',
+                icon: 'vn:tax',
+            },
+            component: () => import('src/pages/Item/Card/ItemTax.vue'),
+        },
+        {
+            path: 'botanical',
+            name: 'ItemBotanical',
+            meta: {
+                title: 'botanical',
+                icon: 'vn:botanical',
+            },
+            component: () => import('src/pages/Item/Card/ItemBotanical.vue'),
+        },
+        {
+            path: 'barcode',
+            name: 'ItemBarcode',
+            meta: {
+                title: 'barcode',
+                icon: 'vn:barcode',
+            },
+            component: () => import('src/pages/Item/Card/ItemBarcode.vue'),
+        },
+        {
+            path: 'shelving',
+            name: 'ItemShelving',
+            meta: {
+                title: 'shelving',
+                icon: 'vn:inventory',
+            },
+            component: () => import('src/pages/Item/Card/ItemShelving.vue'),
+        },
+        {
+            path: 'last-entries',
+            name: 'ItemLastEntries',
+            meta: {
+                title: 'lastEntries',
+                icon: 'vn:regentry',
+            },
+            component: () => import('src/pages/Item/Card/ItemLastEntries.vue'),
+        },
+    ],
+};
+
+export default {
+    name: 'Item',
+    path: '/item',
+    meta: {
+        title: 'items',
+        icon: 'vn:item',
+        moduleName: 'Item',
+        keyBinding: 'a',
+        menu: [
+            'ItemList',
+            'WasteBreakdown',
+            'ItemFixedPrice',
+            'ItemRequest',
+            'ItemTypeList'
+        ],
+    },
+    component: RouterView,
+    redirect: { name: 'ItemMain' },
+    children: [
+        {
+            name: 'ItemMain',            
             path: '',
-            name: 'ItemMain',
             component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'ItemList' },
+            redirect: { name: 'ItemIndexMain' },
             children: [
                 {
-                    path: 'list',
-                    name: 'ItemList',
-                    meta: {
-                        title: 'list',
-                        icon: 'view_list',
-                    },
+                    path:'',
+                    name: 'ItemIndexMain',
+                    redirect: { name: 'ItemList' },
                     component: () => import('src/pages/Item/ItemList.vue'),
+                    children: [
+                        {                        
+                            name: 'ItemList',
+                            path: 'list',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
+                            },
+                        },
+                       itemCard,
+                    ],
                 },
                 {
                     path: 'request',
@@ -99,103 +205,5 @@ export default {
                 },
             ],
         },
-        {
-            name: 'ItemCard',
-            path: ':id',
-            component: () => import('src/pages/Item/Card/ItemCard.vue'),
-            redirect: { name: 'ItemSummary' },
-            children: [
-                {
-                    name: 'ItemSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'launch',
-                    },
-                    component: () => import('src/pages/Item/Card/ItemSummary.vue'),
-                },
-                {
-                    path: 'basic-data',
-                    name: 'ItemBasicData',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () => import('src/pages/Item/Card/ItemBasicData.vue'),
-                },
-                {
-                    path: 'tags',
-                    name: 'ItemTags',
-                    meta: {
-                        title: 'tags',
-                        icon: 'vn:tags',
-                    },
-                    component: () => import('src/pages/Item/Card/ItemTags.vue'),
-                },
-                {
-                    path: 'last-entries',
-                    name: 'ItemLastEntries',
-                    meta: {
-                        title: 'lastEntries',
-                        icon: 'vn:regentry',
-                    },
-                    component: () => import('src/pages/Item/Card/ItemLastEntries.vue'),
-                },
-                {
-                    path: 'tax',
-                    name: 'ItemTax',
-                    meta: {
-                        title: 'tax',
-                        icon: 'vn:tax',
-                    },
-                    component: () => import('src/pages/Item/Card/ItemTax.vue'),
-                },
-                {
-                    path: 'botanical',
-                    name: 'ItemBotanical',
-                    meta: {
-                        title: 'botanical',
-                        icon: 'local_florist',
-                    },
-                    component: () => import('src/pages/Item/Card/ItemBotanical.vue'),
-                },
-                {
-                    path: 'shelving',
-                    name: 'ItemShelving',
-                    meta: {
-                        title: 'shelving',
-                        icon: 'vn:inventory',
-                    },
-                    component: () => import('src/pages/Item/Card/ItemShelving.vue'),
-                },
-                {
-                    path: 'barcode',
-                    name: 'ItemBarcode',
-                    meta: {
-                        title: 'barcode',
-                        icon: 'vn:barcode',
-                    },
-                    component: () => import('src/pages/Item/Card/ItemBarcode.vue'),
-                },
-                {
-                    path: 'diary',
-                    name: 'ItemDiary',
-                    meta: {
-                        title: 'diary',
-                        icon: 'vn:transaction',
-                    },
-                    component: () => import('src/pages/Item/Card/ItemDiary.vue'),
-                },
-                {
-                    path: 'log',
-                    name: 'ItemLog',
-                    meta: {
-                        title: 'log',
-                        icon: 'vn:History',
-                    },
-                    component: () => import('src/pages/Item/Card/ItemLog.vue'),
-                },
-            ],
-        },
     ],
 };

From 0fdff03715e1ec40ab12e2833ebc06d4e85c9ec7 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Tue, 14 Jan 2025 07:48:18 +0100
Subject: [PATCH 03/14] refactor: refs #8316 remove unused ItemTypeSearchbar
 component

---
 src/pages/Item/ItemType/ItemTypeSearchbar.vue | 19 -------------------
 src/pages/Item/ItemTypeList.vue               |  1 -
 2 files changed, 20 deletions(-)
 delete mode 100644 src/pages/Item/ItemType/ItemTypeSearchbar.vue

diff --git a/src/pages/Item/ItemType/ItemTypeSearchbar.vue b/src/pages/Item/ItemType/ItemTypeSearchbar.vue
deleted file mode 100644
index 749033d43..000000000
--- a/src/pages/Item/ItemType/ItemTypeSearchbar.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<script setup>
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import { useI18n } from 'vue-i18n';
-const { t } = useI18n();
-</script>
-
-<template>
-    <VnSearchbar
-        data-key="ItemTypeList"
-        url="ItemTypes"
-        :label="t('Search item type')"
-        :info="t('Search itemType by id, name or code')"
-    />
-</template>
-<i18n>
-es:
-    Search item type: Buscar familia
-    Search itemType by id, name or code: Buscar familia por id, nombre o código
-</i18n>
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index b1abac283..4be5d295c 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -110,7 +110,6 @@ const columns = computed(() => [
         :array-data-props="{
             url: 'ItemTypes',
             order: 'name ASC',
-            exprBuilder,
         }"
     >
         <template #rightMenu>

From 4c7a35f1422b1cc6ccbcec173b38549460707286 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 15 Jan 2025 10:38:16 +0100
Subject: [PATCH 04/14] refactor: refs #8316 unify router item and itemType

---
 src/pages/Item/ItemList.vue                | 191 +++++++++++----------
 src/pages/Item/ItemType/ItemTypeFilter.vue |  90 ----------
 src/pages/Item/ItemTypeList.vue            |  44 ++++-
 src/router/modules/index.js                |   2 -
 src/router/modules/item.js                 |  80 ++++++---
 src/router/modules/itemType.js             |  65 -------
 src/router/routes.js                       |   2 -
 7 files changed, 193 insertions(+), 281 deletions(-)
 delete mode 100644 src/pages/Item/ItemType/ItemTypeFilter.vue
 delete mode 100644 src/router/modules/itemType.js

diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index abf847c4b..378c5e588 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -332,8 +332,8 @@ onBeforeMount(async () => {
         :columns="columns"
         prefix="item"
         :array-data-props="{
-            url: 'Items',
-            order: ['isActive DESC', 'name', 'id']
+            url: 'Items/filter',
+            order: ['isActive DESC', 'name', 'id'],
         }"
     >
         <template #rightMenu>
@@ -347,15 +347,14 @@ onBeforeMount(async () => {
                 :columns="columns"
                 :right-search="false"
                 redirect="Item"
-                url="Items/filter"
                 :create="{
                     urlCreate: 'Items/new',
                     title: t('item.list.newItem'),
                     onDataSaved: ({ id }) => tableRef.redirect(`${id}/basic-data`),
                     formInitialData: {
                         editorFk: entityId,
-                tag: defaultTag,
-                priority: defaultPriority,
+                        tag: defaultTag,
+                        priority: defaultPriority,
                     },
                 }"
                 :is-editable="false"
@@ -397,96 +396,100 @@ onBeforeMount(async () => {
                     </div>
                     <FetchedTags :item="row" :columns="3" />
                 </template>
-        <template #more-create-dialog="{ data }">
-            <VnInput
-                v-model="data.provisionalName"
-                :label="t('globals.description')"
-                :is-required="true"
-            />
-            <VnSelect
-                url="Tags"
-                v-model="data.tag"
-                :label="t('globals.tag')"
-                :fields="['id', 'name']"
-                option-label="name"
-                option-value="id"
-                :is-required="true"
-                :sort-by="['name ASC']"
-            >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                            <QItemLabel caption> #{{ scope.opt?.id }} </QItemLabel>
-                        </QItemSection>
-                    </QItem>
+                <template #more-create-dialog="{ data }">
+                    <VnInput
+                        v-model="data.provisionalName"
+                        :label="t('globals.description')"
+                        :is-required="true"
+                    />
+                    <VnSelect
+                        url="Tags"
+                        v-model="data.tag"
+                        :label="t('globals.tag')"
+                        :fields="['id', 'name']"
+                        option-label="name"
+                        option-value="id"
+                        :is-required="true"
+                        :sort-by="['name ASC']"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        #{{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        :options="validPriorities"
+                        v-model="data.priority"
+                        :label="t('item.create.priority')"
+                        :is-required="true"
+                    />
+                    <VnSelect
+                        url="ItemTypes"
+                        v-model="data.typeFk"
+                        :label="t('item.list.typeName')"
+                        :fields="['id', 'code', 'name']"
+                        option-label="name"
+                        option-value="id"
+                        :is-required="true"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ scope.opt?.code }} #{{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        url="Intrastats"
+                        v-model="data.intrastatFk"
+                        :label="t('globals.intrastat')"
+                        :fields="['id', 'description']"
+                        option-label="description"
+                        option-value="id"
+                        :is-required="true"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.description }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        #{{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        url="Origins"
+                        v-model="data.originFk"
+                        :label="t('globals.origin')"
+                        :fields="['id', 'code', 'name']"
+                        option-label="code"
+                        option-value="id"
+                        :is-required="true"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ scope.opt?.code }} #{{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </template>
-            </VnSelect>
-            <VnSelect
-                :options="validPriorities"
-                v-model="data.priority"
-                :label="t('item.create.priority')"
-                :is-required="true"
-            />
-            <VnSelect
-                url="ItemTypes"
-                v-model="data.typeFk"
-                :label="t('item.list.typeName')"
-                :fields="['id', 'code', 'name']"
-                option-label="name"
-                option-value="id"
-                :is-required="true"
-            >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                            <QItemLabel caption>
-                                {{ scope.opt?.code }} #{{ scope.opt?.id }}
-                            </QItemLabel>
-                        </QItemSection>
-                    </QItem>
-                </template>
-            </VnSelect>
-            <VnSelect
-                url="Intrastats"
-                v-model="data.intrastatFk"
-                :label="t('globals.intrastat')"
-                :fields="['id', 'description']"
-                option-label="description"
-                option-value="id"
-                :is-required="true"
-            >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>{{ scope.opt?.description }}</QItemLabel>
-                            <QItemLabel caption> #{{ scope.opt?.id }} </QItemLabel>
-                        </QItemSection>
-                    </QItem>
-                </template>
-            </VnSelect>
-            <VnSelect
-                url="Origins"
-                v-model="data.originFk"
-                :label="t('globals.origin')"
-                :fields="['id', 'code', 'name']"
-                option-label="code"
-                option-value="id"
-                :is-required="true"
-            >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                            <QItemLabel caption>
-                                {{ scope.opt?.code }} #{{ scope.opt?.id }}
-                            </QItemLabel>
-                        </QItemSection>
-                    </QItem>
-                </template>
-            </VnSelect>
-        </template>
             </VnTable>
         </template>
     </VnSection>
diff --git a/src/pages/Item/ItemType/ItemTypeFilter.vue b/src/pages/Item/ItemType/ItemTypeFilter.vue
deleted file mode 100644
index f6fb73098..000000000
--- a/src/pages/Item/ItemType/ItemTypeFilter.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-const { t } = useI18n();
-
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
-
-const emit = defineEmits(['search']);
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-            return {
-                name: { like: `%${value}%` },
-            };
-        case 'code':
-            return {
-                code: { like: `%${value}%` },
-            };
-        case 'search':
-            if (value) {
-                if (!isNaN(value)) {
-                    return { id: value };
-                } else {
-                    return {
-                        or: [
-                            {
-                                name: {
-                                    like: `%${value}%`,
-                                },
-                            },
-                            {
-                                code: {
-                                    like: `%${value}%`,
-                                },
-                            },
-                        ],
-                    };
-                }
-            }
-    }
-};
-</script>
-
-<template>
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :search-button="true"
-        @search="emit('search')"
-        search-url="table"
-        :expr-builder="exprBuilder"
-    >
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params }">
-            <QItem>
-                <QItemSection>
-                    <VnInput :label="t('Name')" v-model="params.name" is-outlined />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput v-model="params.code" :label="t('Code')" is-outlined />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-
-<i18n>
-en:
-    params:
-        name: Name
-        code: Code
-es:
-    params:
-        name: Nombre
-        code: Código
-    Name: Nombre
-    Code: Código
-</i18n>
diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 4be5d295c..8986220cf 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -3,7 +3,6 @@ import { useI18n } from 'vue-i18n';
 import { ref, computed } from 'vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import FetchData from 'components/FetchData.vue';
-import ItemTypeFilter from './ItemType/ItemTypeFilter.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import VnSection from 'src/components/common/VnSection.vue';
 
@@ -11,7 +10,41 @@ const { t } = useI18n();
 const tableRef = ref();
 const itemCategoriesOptions = ref([]);
 const temperatureOptions = ref([]);
-const dataKey='ItemTypeList';
+const dataKey = 'ItemTypeList';
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+            return {
+                name: { like: `%${value}%` },
+            };
+        case 'code':
+            return {
+                code: { like: `%${value}%` },
+            };
+        case 'search':
+            if (value) {
+                if (!isNaN(value)) {
+                    return { id: value };
+                } else {
+                    return {
+                        or: [
+                            {
+                                name: {
+                                    like: `%${value}%`,
+                                },
+                            },
+                            {
+                                code: {
+                                    like: `%${value}%`,
+                                },
+                            },
+                        ],
+                    };
+                }
+            }
+    }
+};
 
 const columns = computed(() => [
     {
@@ -103,18 +136,16 @@ const columns = computed(() => [
         @on-fetch="(data) => (temperatureOptions = data)"
         auto-load
     />
-    <VnSection 
+    <VnSection
         :data-key="dataKey"
         :columns="columns"
         prefix="itemType"
         :array-data-props="{
             url: 'ItemTypes',
             order: 'name ASC',
+            exprBuilder,
         }"
     >
-        <template #rightMenu>
-            <ItemTypeFilter data-key="ItemTypeList" />
-        </template>
         <template #body>
             <VnTable
                 ref="tableRef"
@@ -141,7 +172,6 @@ const columns = computed(() => [
                 }"
                 :columns="columns"
                 auto-load
-                :right-search="false"
                 redirect="item/item-type"
             >
                 <template #column-workerFk="{ row }">
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index a22d5399c..f70c633e5 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -15,7 +15,6 @@ import Entry from './entry';
 import roadmap from './roadmap';
 import Parking from './parking';
 import Agency from './agency';
-import ItemType from './itemType';
 import Zone from './zone';
 import Account from './account';
 import Monitor from './monitor';
@@ -38,7 +37,6 @@ export default [
     roadmap,
     Parking,
     Agency,
-    ItemType,
     Zone,
     Account,
     Monitor,
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index f69ebc198..125be4d5d 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -16,7 +16,7 @@ const itemCard = {
             'ItemBarcode',
             'ItemShelving',
             'ItemLastEntries',
-        ]
+        ],
     },
     children: [
         {
@@ -112,6 +112,45 @@ const itemCard = {
     ],
 };
 
+const itemTypeCard = {
+    name: 'ItemTypeCard',
+    path: ':id',
+    component: () => import('src/pages/Item/ItemType/Card/ItemTypeCard.vue'),
+    redirect: { name: 'ItemTypeSummary' },
+    meta: {
+        menu: ['ItemTypeBasicData', 'ItemTypeLog'],
+    },
+    children: [
+        {
+            path: 'summary',
+            name: 'ItemTypeSummary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Item/ItemType/Card/ItemTypeSummary.vue'),
+        },
+        {
+            path: 'basic-data',
+            name: 'ItemTypeBasicData',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('src/pages/Item/ItemType/Card/ItemTypeBasicData.vue'),
+        },
+        {
+            path: 'log',
+            name: 'ItemTypeLog',
+            meta: {
+                title: 'log',
+                icon: 'vn:History',
+            },
+            component: () => import('src/pages/Item/ItemType/Card/ItemTypeLog.vue'),
+        },
+    ],
+};
+
 export default {
     name: 'Item',
     path: '/item',
@@ -125,25 +164,25 @@ export default {
             'WasteBreakdown',
             'ItemFixedPrice',
             'ItemRequest',
-            'ItemTypeList'
+            'ItemTypeList',
         ],
     },
     component: RouterView,
     redirect: { name: 'ItemMain' },
     children: [
         {
-            name: 'ItemMain',            
+            name: 'ItemMain',
             path: '',
             component: () => import('src/components/common/VnModule.vue'),
             redirect: { name: 'ItemIndexMain' },
             children: [
                 {
-                    path:'',
+                    path: '',
                     name: 'ItemIndexMain',
                     redirect: { name: 'ItemList' },
                     component: () => import('src/pages/Item/ItemList.vue'),
                     children: [
-                        {                        
+                        {
                             name: 'ItemList',
                             path: 'list',
                             meta: {
@@ -151,7 +190,7 @@ export default {
                                 icon: 'view_list',
                             },
                         },
-                       itemCard,
+                        itemCard,
                     ],
                 },
                 {
@@ -186,22 +225,21 @@ export default {
                     component: () => import('src/pages/Item/ItemFixedPrice.vue'),
                 },
                 {
-                    path: 'create',
-                    name: 'ItemCreate',
-                    meta: {
-                        title: 'itemCreate',
-                    },
-                    component: () => import('src/pages/Item/ItemCreate.vue'),
-                },
-
-                {
-                    path: 'item-type-list',
-                    name: 'ItemTypeList',
-                    meta: {
-                        title: 'family',
-                        icon: 'contact_support',
-                    },
+                    path: 'item-type',
+                    name: 'ItemTypeMain',
+                    redirect: { name: 'ItemTypeList' },
                     component: () => import('src/pages/Item/ItemTypeList.vue'),
+                    children: [
+                        {
+                            name: 'ItemTypeList',
+                            path: 'list',
+                            meta: {
+                                title: 'family',
+                                icon: 'contact_support',
+                            },
+                        },
+                        itemTypeCard,
+                    ],
                 },
             ],
         },
diff --git a/src/router/modules/itemType.js b/src/router/modules/itemType.js
deleted file mode 100644
index 02b4f6ca5..000000000
--- a/src/router/modules/itemType.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import { RouterView } from 'vue-router';
-
-const itemTypeCard = {
-    name: 'ItemTypeCard',
-    path: ':id',
-    component: () => import('src/pages/Item/ItemType/Card/ItemTypeCard.vue'),
-    redirect: { name: 'ItemTypeSummary' },
-    meta: {
-        menu: [
-            'ItemTypeBasicData',
-            'ItemTypeLog',
-        ]
-    },
-    children: [
-        {
-            path: 'summary',
-            name: 'ItemTypeSummary',
-            meta: {
-                title: 'summary',
-                icon: 'launch',
-            },
-            component: () => import('src/pages/Item/ItemType/Card/ItemTypeSummary.vue'),
-        },
-        {
-            path: 'basic-data',
-            name: 'ItemTypeBasicData',
-            meta: {
-                title: 'basicData',
-                icon: 'vn:settings',
-            },
-            component: () => import('src/pages/Item/ItemType/Card/ItemTypeBasicData.vue'),
-        },
-        {
-            path: 'log',
-            name: 'ItemTypeLog',
-            meta: {
-                title: 'log',
-                icon: 'vn:History',
-            },
-            component: () => import('src/pages/Item/ItemType/Card/ItemTypeLog.vue'),
-        },
-    ],
-};
-
-export default {
-    name: 'ItemType',
-    path: '/item/item-type',
-    meta: {
-        title: 'itemType',
-        icon: 'contact_support',
-        moduleName: 'ItemType',
-        menu: [],
-    },
-    component: RouterView,
-    redirect: { name: 'ItemTypeMain' },
-    children: [
-        {
-            name: 'ItemTypeMain',
-            path: '',
-            component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'ItemTypeIndexMain' },
-            children: [itemTypeCard],
-        },
-    ],
-};
\ No newline at end of file
diff --git a/src/router/routes.js b/src/router/routes.js
index d84ba7e46..4e5c58c6f 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -9,7 +9,6 @@ import invoiceIn from './modules/invoiceIn';
 import wagon from './modules/wagon';
 import supplier from './modules/supplier';
 import travel from './modules/travel';
-import ItemType from './modules/itemType';
 import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
 import entry from 'src/router/modules/entry';
@@ -88,7 +87,6 @@ const routes = [
             entry,
             parking,
             agency,
-            ItemType,
             zone,
             account,
             {

From 9d32f6af3bdc2af79b2c121e5510f585077ef7d7 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 17 Jan 2025 14:08:14 +0100
Subject: [PATCH 05/14] refactor: refs #8316 add new localization keys and
 update existing ones for invoiceOut components

---
 src/components/ui/VnFilterPanel.vue |  5 +-
 src/i18n/locale/en.yml              | 56 ---------------------
 src/i18n/locale/es.yml              | 56 ---------------------
 src/pages/Item/locale/en.yml        | 78 ++++++++++++++---------------
 src/pages/Item/locale/es.yml        | 68 ++++++++++++-------------
 src/router/modules/item.js          | 72 +++++++++++++-------------
 6 files changed, 110 insertions(+), 225 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index aba797678..93f069cc6 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -190,7 +190,10 @@ const getLocale = (label) => {
     const globalLocale = `globals.params.${param}`;
     if (te(globalLocale)) return t(globalLocale);
     else if (te(t(`params.${param}`)));
-    else return t(`${route.meta.moduleName.toLowerCase()}.params.${param}`);
+    else {
+        const camelCaseModuleName = route.meta.moduleName.charAt(0).toLowerCase() + route.meta.moduleName.slice(1);    
+        return t(`${camelCaseModuleName}.params.${param}`);
+    }
 };
 </script>
 
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index dbc3e4077..eec9f242a 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -725,62 +725,6 @@ travel:
         destination: Destination
         thermograph: Thermograph
         travelFileDescription: 'Travel id { travelId }'
-item:
-    descriptor:
-        buyer: Buyer
-        color: Color
-        category: Category
-        available: Available
-        warehouseText: 'Calculated on the warehouse of { warehouseName }'
-        itemDiary: Item diary
-    list:
-        id: Identifier
-        stems: Stems
-        category: Category
-        typeName: Type
-        isActive: Active
-        userName: Buyer
-        weightByPiece: Weight/Piece
-        stemMultiplier: Multiplier
-    fixedPrice:
-        itemFk: Item ID
-        groupingPrice: Grouping price
-        packingPrice: Packing price
-        hasMinPrice: Has min price
-        minPrice: Min price
-        started: Started
-        ended: Ended
-    create:
-        priority: Priority
-    buyRequest:
-        requester: Requester
-        requested: Requested
-        attender: Atender
-        achieved: Achieved
-        concept: Concept
-    summary:
-        otherData: Other data
-        tax: Tax
-        botanical: Botanical
-        barcode: Barcode
-        completeName: Complete name
-        family: Familiy
-        stems: Stems
-        multiplier: Multiplier
-        buyer: Buyer
-        doPhoto: Do photo
-        intrastatCode: Intrastat code
-        ref: Reference
-        relevance: Relevance
-        weight: Weight (gram)/stem
-        units: Units/box
-        expense: Expense
-        generic: Generic
-        recycledPlastic: Recycled plastic
-        nonRecycledPlastic: Non recycled plastic
-        minSalesQuantity: Min sales quantity
-        genus: Genus
-        specie: Specie
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 1b6ed7b71..e58760299 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -721,62 +721,6 @@ travel:
         destination: Destino
         thermograph: Termógrafo
         travelFileDescription: 'Id envío { travelId }'
-item:
-    descriptor:
-        buyer: Comprador
-        color: Color
-        category: Categoría
-        available: Disponible
-        warehouseText: 'Calculado sobre el almacén de { warehouseName }'
-        itemDiary: Registro de compra-venta
-    list:
-        id: Identificador
-        stems: Tallos
-        category: Reino
-        typeName: Tipo
-        isActive: Activo
-        weightByPiece: Peso (gramos)/tallo
-        userName: Comprador
-        stemMultiplier: Multiplicador
-    fixedPrice:
-        itemFk: ID Artículo
-        groupingPrice: Precio grouping
-        packingPrice: Precio packing
-        hasMinPrice: Tiene precio mínimo
-        minPrice: Precio min
-        started: Inicio
-        ended: Fin
-    create:
-        priority: Prioridad
-    summary:
-        otherData: Otros datos
-        tax: IVA
-        botanical: Botánico
-        barcode: Código de barras
-        completeName: Nombre completo
-        family: Familia
-        stems: Tallos
-        multiplier: Multiplicador
-        buyer: Comprador
-        doPhoto: Hacer foto
-        intrastatCode: Código intrastat
-        ref: Referencia
-        relevance: Relevancia
-        weight: Peso (gramos)/tallo
-        units: Unidades/caja
-        expense: Gasto
-        generic: Genérico
-        recycledPlastic: Plástico reciclado
-        nonRecycledPlastic: Plástico no reciclado
-        minSalesQuantity: Cantidad mínima de venta
-        genus: Genus
-        specie: Specie
-    buyRequest:
-        requester: Solicitante
-        requested: Solicitado
-        attender: Comprador
-        achieved: Conseguido
-        concept: Concepto
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
index eeaafc0f0..96bdd9b6d 100644
--- a/src/pages/Item/locale/en.yml
+++ b/src/pages/Item/locale/en.yml
@@ -180,46 +180,46 @@ item:
         intrastat: Intrastat
         origin: Origin
     buyRequest:
-        ticketId: 'Ticket ID'
-        shipped: 'Shipped'
-        requester: 'Requester'
-        requested: 'Requested'
-        price: 'Price'
-        attender: 'Attender'
-        item: 'Item'
-        achieved: 'Achieved'
-        concept: 'Concept'
-        state: 'State'
+        ticketId: Ticket ID
+        shipped: Shipped
+        requester: Requester
+        requested: Requested
+        price: Price
+        attender: Attender
+        item: Item
+        achieved: Achieved
+        concept: Concept
+        state: State
     summary:
-        basicData: 'Basic data'
-        otherData: 'Other data'
-        description: 'Description'
-        tax: 'Tax'
-        tags: 'Tags'
-        botanical: 'Botanical'
-        barcode: 'Barcode'
-        name: 'Nombre'
-        completeName: 'Nombre completo'
-        family: 'Familia'
-        size: 'Medida'
-        origin: 'Origen'
-        stems: 'Tallos'
-        multiplier: 'Multiplicador'
-        buyer: 'Comprador'
-        doPhoto: 'Do photo'
-        intrastatCode: 'Código intrastat'
+        basicData: Basic data
+        otherData: Other data
+        description: Description
+        tax: Tax
+        tags: Tags
+        botanical: Botanical
+        barcode: Barcode
+        name: Name
+        completeName: Complete name
+        family: Family
+        size: Size
+        origin: Origin
+        stems: Stems
+        multiplier: Multiplier
+        buyer: Buyer
+        doPhoto: Do photo
+        intrastatCode: Intrastat code
         intrastat: 'Intrastat'
-        ref: 'Referencia'
-        relevance: 'Relevancia'
-        weight: 'Peso (gramos)/tallo'
-        units: 'Unidades/caja'
-        expense: 'Gasto'
-        generic: 'Genérico'
-        recycledPlastic: 'Plástico reciclado'
-        nonRecycledPlastic: 'Plástico no reciclado'
-        minSalesQuantity: 'Cantidad mínima de venta'
-        genus: 'Genus'
-        specie: 'Specie'
+        ref: Reference
+        relevance: Relevance
+        weight: Weight (gram)/stem
+        units: Units/box
+        expense: Expense
+        generic: Generic
+        recycledPlastic: Recycled plastic
+        nonRecycledPlastic: Non recycled plastic
+        minSalesQuantity: Min sales quantity
+        genus: Genus
+        specie: Specie
     search: 'Search item'
     searchInfo: 'You can search by id'
-    regularizeStock: Regularize stock
+    regularizeStock: Regularize stock
\ No newline at end of file
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
index 736be22de..c65062a2b 100644
--- a/src/pages/Item/locale/es.yml
+++ b/src/pages/Item/locale/es.yml
@@ -73,9 +73,6 @@ itemTags:
     addTag: Añadir etiqueta
     tag: Etiqueta
     value: Valor
-searchbar:
-    label: Buscar artículo
-    info: Buscar por id de artículo
 itemType:
     shared:
         code: Código
@@ -108,9 +105,6 @@ item:
         concept: Concepto
         denyOptions: Denegado
         scopeDays: Días en adelante
-    searchbar:
-        label: Buscar artículo
-        info: Puedes buscar por id
     descriptor:
         item: Artículo
         buyer: Comprador
@@ -182,35 +176,35 @@ item:
         intrastat: Intrastat
         origin: Origen
     summary:
-        basicData: 'Datos básicos'
-        otherData: 'Otros datos'
-        description: 'Descripción'
-        tax: 'IVA'
-        tags: 'Etiquetas'
-        botanical: 'Botánico'
-        barcode: 'Código de barras'
-        name: 'Nombre'
-        completeName: 'Nombre completo'
-        family: 'Familia'
-        size: 'Medida'
-        origin: 'Origen'
-        stems: 'Tallos'
-        multiplier: 'Multiplicador'
-        buyer: 'Comprador'
-        doPhoto: 'Hacer foto'
-        intrastatCode: 'Código intrastat'
-        intrastat: 'Intrastat'
-        ref: 'Referencia'
-        relevance: 'Relevancia'
-        weight: 'Peso (gramos)/tallo'
-        units: 'Unidades/caja'
-        expense: 'Gasto'
-        generic: 'Genérico'
-        recycledPlastic: 'Plástico reciclado'
-        nonRecycledPlastic: 'Plástico no reciclado'
-        minSalesQuantity: 'Cantidad mínima de venta'
-        genus: 'Genus'
-        specie: 'Specie'
+        basicData: Datos básicos
+        otherData: Otros datos
+        description: Descripción
+        tax: IVA
+        tags: Etiquetas
+        botanical: Botánico
+        barcode: Código de barras
+        name: Nombre
+        completeName: Nombre completo
+        family: Familia
+        size: Medida
+        origin: Origen
+        stems: Tallos
+        multiplier: Multiplicador
+        buyer: Comprador
+        doPhoto: Hacer foto
+        intrastatCode: Código intrastat
+        intrastat: Intrastat
+        ref: Referencia
+        relevance: Relevancia
+        weight: Peso (gramos)/tallo
+        units: Unidades/caja
+        expense: Gasto
+        generic: Genérico
+        recycledPlastic: Plástico reciclado
+        nonRecycledPlastic: Plástico no reciclado
+        minSalesQuantity: Cantidad mínima de venta
+        genus: Genus
+        specie: Specie
     regularizeStock: Regularizar stock
     buyRequest:
         ticketId: 'ID Ticket'
@@ -222,6 +216,6 @@ item:
         item: 'Artículo'
         achieved: 'Conseguido'
         concept: 'Concepto'
-        state: 'Estado'
+        state: 'Estado'       
     search: 'Buscar artículo'
-    searchInfo: 'Puedes buscar por id'
+    searchInfo: 'Puedes buscar por id'
\ No newline at end of file
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 125be4d5d..b47841ef4 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -8,14 +8,14 @@ const itemCard = {
     meta: {
         menu: [
             'ItemBasicData',
-            'ItemLog',
-            'ItemDiary',
             'ItemTags',
+            'ItemLastEntries',
             'ItemTax',
             'ItemBotanical',
-            'ItemBarcode',
             'ItemShelving',
-            'ItemLastEntries',
+            'ItemBarcode',
+            'ItemDiary',
+            'ItemLog',
         ],
     },
     children: [
@@ -37,24 +37,6 @@ const itemCard = {
             },
             component: () => import('src/pages/Item/Card/ItemBasicData.vue'),
         },
-        {
-            path: 'log',
-            name: 'ItemLog',
-            meta: {
-                title: 'log',
-                icon: 'vn:History',
-            },
-            component: () => import('src/pages/Item/Card/ItemLog.vue'),
-        },
-        {
-            path: 'diary',
-            name: 'ItemDiary',
-            meta: {
-                title: 'diary',
-                icon: 'vn:transaction',
-            },
-            component: () => import('src/pages/Item/Card/ItemDiary.vue'),
-        },
         {
             path: 'tags',
             name: 'ItemTags',
@@ -64,6 +46,15 @@ const itemCard = {
             },
             component: () => import('src/pages/Item/Card/ItemTags.vue'),
         },
+        {
+            path: 'last-entries',
+            name: 'ItemLastEntries',
+            meta: {
+                title: 'lastEntries',
+                icon: 'vn:regentry',
+            },
+            component: () => import('src/pages/Item/Card/ItemLastEntries.vue'),
+        },
         {
             path: 'tax',
             name: 'ItemTax',
@@ -82,15 +73,6 @@ const itemCard = {
             },
             component: () => import('src/pages/Item/Card/ItemBotanical.vue'),
         },
-        {
-            path: 'barcode',
-            name: 'ItemBarcode',
-            meta: {
-                title: 'barcode',
-                icon: 'vn:barcode',
-            },
-            component: () => import('src/pages/Item/Card/ItemBarcode.vue'),
-        },
         {
             path: 'shelving',
             name: 'ItemShelving',
@@ -101,13 +83,31 @@ const itemCard = {
             component: () => import('src/pages/Item/Card/ItemShelving.vue'),
         },
         {
-            path: 'last-entries',
-            name: 'ItemLastEntries',
+            path: 'barcode',
+            name: 'ItemBarcode',
             meta: {
-                title: 'lastEntries',
-                icon: 'vn:regentry',
+                title: 'barcode',
+                icon: 'vn:barcode',
             },
-            component: () => import('src/pages/Item/Card/ItemLastEntries.vue'),
+            component: () => import('src/pages/Item/Card/ItemBarcode.vue'),
+        },
+        {
+            path: 'diary',
+            name: 'ItemDiary',
+            meta: {
+                title: 'diary',
+                icon: 'vn:transaction',
+            },
+            component: () => import('src/pages/Item/Card/ItemDiary.vue'),
+        },
+        {
+            path: 'log',
+            name: 'ItemLog',
+            meta: {
+                title: 'log',
+                icon: 'vn:History',
+            },
+            component: () => import('src/pages/Item/Card/ItemLog.vue'),
         },
     ],
 };

From bb2c3fef51e9d9514c80aa4e8eca063a9c20bac6 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 22 Jan 2025 09:36:56 +0100
Subject: [PATCH 06/14] fix: department descriptor link

---
 src/pages/Worker/Card/WorkerDescriptor.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index c09e8868f..d87fd4a54 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -10,6 +10,7 @@ import axios from 'axios';
 import VnImg from 'src/components/ui/VnImg.vue';
 import EditPictureForm from 'components/EditPictureForm.vue';
 import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
+import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
 
 const $props = defineProps({
     id: {
@@ -115,10 +116,13 @@ const handlePhotoUpdated = (evt = false) => {
                 :value="entity.user?.emailUser?.email"
                 copy
             />
-            <VnLv
-                :label="t('worker.list.department')"
-                :value="entity.department ? entity.department.department.name : null"
-            />
+            <VnLv :label="t('worker.list.department')">
+                <template #value>
+                    <span class="link" v-text="entity.department?.department?.name" />
+                    <DepartmentDescriptorProxy :id="entity.department?.department?.id" />
+                </template>
+            </VnLv>
+
             <VnLv :value="entity.phone">
                 <template #label>
                     {{ t('globals.phone') }}

From 23e1a58f288a611672db1282911b1e379fbd11cf Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 24 Jan 2025 07:32:02 +0100
Subject: [PATCH 07/14] fix: refs #8316 advanced-menu

---
 src/pages/Customer/CustomerList.vue |  2 +-
 src/pages/Entry/EntryList.vue       |  4 ++--
 src/pages/Item/ItemList.vue         |  2 +-
 src/pages/Item/ItemListFilter.vue   | 11 +++++------
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index f6458fd64..f345fcda3 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -408,7 +408,7 @@ function handleLocation(data, location) {
             order: ['id DESC'],
         }"
     >
-        <template #rightMenu>
+        <template #advanced-menu>
             <CustomerFilter data-key="CustomerList" />
         </template>
         <template #body>
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 641042156..3172c6d0e 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -205,7 +205,7 @@ const columns = computed(() => [
             userFilter: entryFilter,
         }"
     >
-        <template #rightMenu>
+        <template #advanced-menu>
             <EntryFilter data-key="EntryList" />
         </template>
         <template #body>
@@ -231,7 +231,7 @@ const columns = computed(() => [
                         >
                             <QTooltip>{{
                                 t(
-                                    'entry.list.tableVisibleColumns.isExcludedFromAvailable'
+                                    'entry.list.tableVisibleColumns.isExcludedFromAvailable',
                                 )
                             }}</QTooltip>
                         </QIcon>
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 378c5e588..010bd89d0 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -336,7 +336,7 @@ onBeforeMount(async () => {
             order: ['isActive DESC', 'name', 'id'],
         }"
     >
-        <template #rightMenu>
+        <template #advanced-menu>
             <ItemListFilter data-key="ItemList" />
         </template>
         <template #body>
diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index a8349c935..c805a95ea 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -1,7 +1,6 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { onMounted } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
 
 import FetchData from 'components/FetchData.vue';
@@ -233,7 +232,7 @@ onMounted(async () => {
                 <QItemSection>
                     <VnSelect
                         :label="t('params.buyerFk')"
-                        v-model="params.buyerFk"
+                        v-model="params.workerFk"
                         @update:model-value="searchFn()"
                         :options="buyersOptions"
                         option-value="id"
@@ -266,10 +265,10 @@ onMounted(async () => {
                             <QItem v-bind="scope.itemProps">
                                 <QItemSection>
                                     <QItemLabel>
-                                        {{ scope.opt?.name}}
+                                        {{ scope.opt?.name }}
                                     </QItemLabel>
                                     <QItemLabel caption>
-                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                        {{ `#${scope.opt?.id} , ${scope.opt?.nickname}` }}
                                     </QItemLabel>
                                 </QItemSection>
                             </QItem>
@@ -369,7 +368,7 @@ onMounted(async () => {
                         :model-value="fieldFilter.selectedField"
                         :options="moreFields"
                         option-label="label"
-                        option-value="label"                        
+                        option-value="label"
                         dense
                         outlined
                         rounded

From 58fd5a8326d50b2b98aa31df0c0ed0717fd6d9f6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 24 Jan 2025 08:09:14 +0100
Subject: [PATCH 08/14] perf: refs #8339 removew preview tag

---
 src/pages/Customer/components/CustomerSamplesCreate.vue | 3 +--
 src/pages/Item/ItemList.vue                             | 1 -
 src/pages/Monitor/Ticket/MonitorTickets.vue             | 2 +-
 src/pages/Monitor/locale/en.yml                         | 1 -
 src/pages/Route/RouteAutonomous.vue                     | 3 +--
 src/pages/Route/RouteRoadmap.vue                        | 3 +--
 src/pages/Route/locale/en.yml                           | 1 -
 src/pages/Route/locale/es.yml                           | 2 +-
 src/pages/Zone/ZoneClosingTable.vue                     | 2 +-
 src/pages/Zone/locale/en.yml                            | 3 +--
 10 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 665e136e4..754693672 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -214,7 +214,7 @@ const toCustomerSamples = () => {
             <template #custom-buttons>
                 <QBtn
                     :disabled="isLoading || !sampleType?.hasPreview"
-                    :label="t('Preview')"
+                    :label="t('globals.preview')"
                     :loading="isLoading"
                     @click.stop="getPreview()"
                     color="primary"
@@ -353,7 +353,6 @@ es:
     Its only used when sample is sent: Se utiliza únicamente cuando se envía la plantilla
     To who should the recipient replay?: ¿A quien debería responder el destinatario?
     Edit address: Editar dirección
-    Preview: Vista previa
     Email cannot be blank: Debes introducir un email
     Choose a sample: Selecciona una plantilla
     Choose a company: Selecciona una empresa
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 00d0f5c4e..91a94bfda 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -497,5 +497,4 @@ es:
     New item: Nuevo artículo
     Create Item: Crear artículo
     You can search by id: Puedes buscar por id
-    Preview: Vista previa
 </i18n>
diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index f363f5bf8..e6b4631a0 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -290,7 +290,7 @@ const columns = computed(() => [
                 },
             },
             {
-                title: t('salesTicketsTable.preview'),
+                title: t('globals.preview'),
                 icon: 'preview',
                 color: 'primary',
                 action: (row) => viewSummary(row.id, TicketSummary),
diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml
index e61a24979..21324087c 100644
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@@ -33,7 +33,6 @@ salesTicketsTable:
     isFragile: Is fragile
     zone: Zone
     goToLines: Go to lines
-    preview: Preview
     total: Total
     preparation: H.Prep
     payMethod: Pay method
diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index ca51b0fdb..23c920a57 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -142,7 +142,7 @@ const total = computed(() => {
 const openDmsUploadDialog = async () => {
     dmsDialog.value.rowsToCreateInvoiceIn = selectedRows.value
         .filter(
-            (agencyTerm) => agencyTerm.supplierFk === selectedRows.value?.[0].supplierFk
+            (agencyTerm) => agencyTerm.supplierFk === selectedRows.value?.[0].supplierFk,
         )
         .map((agencyTerm) => ({
             routeFk: agencyTerm.routeFk,
@@ -277,5 +277,4 @@ es:
     Price: Precio
     Received: Recibida
     Autonomous: Autónomos
-    Preview: Vista previa
 </i18n>
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index 168e52b23..a4ae6245b 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -112,7 +112,7 @@ const removeSelection = async () => {
     await Promise.all(
         selectedRows.value.map((roadmap) => {
             axios.delete(`Roadmaps/${roadmap.id}`);
-        })
+        }),
     );
 };
 
@@ -236,6 +236,5 @@ es:
     Plate: Matrícula
     Price: Precio
     Observations: Observaciones
-    Preview: Vista previa
     Select the estimated date of departure (ETD): Selecciona la fecha estimada de salida
 </i18n>
diff --git a/src/pages/Route/locale/en.yml b/src/pages/Route/locale/en.yml
index 7a1f9e1c0..dd86103b6 100644
--- a/src/pages/Route/locale/en.yml
+++ b/src/pages/Route/locale/en.yml
@@ -33,7 +33,6 @@ route:
     Mark as served: Mark as served
     Download selected routes as PDF: Download selected routes as PDF
     Add ticket: Add ticket
-    Preview: Preview
     Summary: Summary
     Route is closed: Route is closed
     Route is not served: Route is not served
diff --git a/src/pages/Route/locale/es.yml b/src/pages/Route/locale/es.yml
index b6f42bd5a..4a7c9b1df 100644
--- a/src/pages/Route/locale/es.yml
+++ b/src/pages/Route/locale/es.yml
@@ -33,7 +33,7 @@ route:
     Mark as served: Marcar como servidas
     Download selected routes as PDF: Descargar rutas seleccionadas como PDF
     Add ticket: Añadir tickets
-    Preview: Vista previa
+    preview: Vista previa
     Summary: Resumen
     Route is closed: La ruta está cerrada
     Route is not served: La ruta no está servida
diff --git a/src/pages/Zone/ZoneClosingTable.vue b/src/pages/Zone/ZoneClosingTable.vue
index 049f82271..4590b7ce1 100644
--- a/src/pages/Zone/ZoneClosingTable.vue
+++ b/src/pages/Zone/ZoneClosingTable.vue
@@ -90,7 +90,7 @@ const redirectToZoneSummary = (id) => {
                             color="primary"
                             @click.stop="viewSummary(props.row.id, ZoneSummary)"
                         >
-                            <QTooltip>{{ t('zoneClosingTable.preview') }}</QTooltip>
+                            <QTooltip>{{ t('globals.preview') }}</QTooltip>
                         </QIcon>
                     </div>
                 </QTd>
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index bc285ef23..5fd1a3ea7 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -50,8 +50,7 @@ deliveryPanel:
     postcode: Postcode
     query: Query
     noEventsWarning: No service for the specified zone
-zoneClosingTable:
-    preview: Preview
+
 warehouses:
     deleteTitle: This item will be deleted
     deleteSubtitle: Are you sure you want to continue?

From d9cc35280b3232c332a58d2b58a74c57159c1afc Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 24 Jan 2025 08:09:31 +0100
Subject: [PATCH 09/14] feat: refs #8339 define global.spreview

---
 src/i18n/locale/en.yml | 1 +
 src/i18n/locale/es.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 1e22a07d4..bae355a77 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -5,6 +5,7 @@ globals:
     quantity: Quantity
     language: Language
     entity: Entity
+    preview: Preview
     user: User
     details: Details
     collapseMenu: Collapse lateral menu
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 0d308bd84..5fe75c5d7 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -5,6 +5,7 @@ globals:
     language: Idioma
     quantity: Cantidad
     entity: Entidad
+    preview: Vista previa
     user: Usuario
     details: Detalles
     collapseMenu: Contraer menú lateral

From bddfd91de153f0c30d4626a136e29968e2fc4481 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 24 Jan 2025 08:09:48 +0100
Subject: [PATCH 10/14] perf: refs #8339 minor changes

---
 .gitignore                        | 4 ++--
 src/components/ui/CatalogItem.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 213384ef5..617169f6f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,5 +29,5 @@ yarn-error.log*
 *.sln
 
 # Cypress directories and files
-/tests/cypress/videos
-/tests/cypress/screenshots
\ No newline at end of file
+/test/cypress/videos
+/test/cypress/screenshots
diff --git a/src/components/ui/CatalogItem.vue b/src/components/ui/CatalogItem.vue
index 9670d9b68..7806562b2 100644
--- a/src/components/ui/CatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@@ -41,7 +41,7 @@ const card = toRef(props, 'item');
                 </div>
             </div>
             <div class="content">
-                <span class="link">
+                <span class="link" @click.stop>
                     {{ card.name }}
                     <ItemDescriptorProxy :id="card.id" />
                 </span>

From e6279ff26174c57a18599207d64f3a2f51d760e3 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 24 Jan 2025 08:38:24 +0100
Subject: [PATCH 11/14] build: merge master in test

---
 src/composables/useArrayData.js               | 25 +++++++++++--------
 src/css/app.scss                              |  4 +--
 .../Customer/Card/CustomerConsumption.vue     |  3 ++-
 .../Customer/Card/CustomerDescriptor.vue      | 17 ++++++-------
 .../Customer/Card/CustomerDescriptorMenu.vue  |  6 -----
 src/pages/Entry/Card/EntryDescriptor.vue      |  2 +-
 .../Item/ItemType/Card/ItemTypeDescriptor.vue |  4 ---
 src/pages/Order/Card/OrderCatalogFilter.vue   |  1 +
 .../Supplier/Card/SupplierDescriptor.vue      |  1 -
 src/pages/Ticket/Card/TicketDescriptor.vue    |  1 -
 src/pages/Travel/Card/TravelCard.vue          |  3 +++
 src/pages/Travel/Card/TravelDescriptor.vue    |  1 -
 src/pages/Wagon/WagonCounter.vue              |  2 +-
 src/pages/Zone/Card/ZoneDescriptor.vue        |  4 ---
 14 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 6fb22a340..dd7f5956b 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -9,7 +9,7 @@ const arrayDataStore = useArrayDataStore();
 
 export function useArrayData(key, userOptions) {
     key ??= useRoute().meta.moduleName;
-    
+
     if (!key) throw new Error('ArrayData: A key is required to use this composable');
 
     if (!arrayDataStore.get(key)) arrayDataStore.set(key);
@@ -173,10 +173,9 @@ export function useArrayData(key, userOptions) {
 
     async function addOrder(field, direction = 'ASC') {
         const newOrder = field + ' ' + direction;
-        let order = store.order || [];
-        if (typeof order == 'string') order = [order];
+        const order = toArray(store.order);
 
-        let index = order.findIndex((o) => o.split(' ')[0] === field);
+        let index = getOrderIndex(order, field);
         if (index > -1) {
             order[index] = newOrder;
         } else {
@@ -193,16 +192,23 @@ export function useArrayData(key, userOptions) {
     }
 
     async function deleteOrder(field) {
-        let order = store.order ?? [];
-        if (typeof order == 'string') order = [order];
-
-        const index = order.findIndex((o) => o.split(' ')[0] === field);
+        const order = toArray(store.order);
+        const index = getOrderIndex(order, field);
         if (index > -1) order.splice(index, 1);
 
         store.order = order;
         fetch({});
     }
 
+    function getOrderIndex(order, field) {
+        return order.findIndex((o) => o.split(' ')[0] === field);
+    }
+
+    function toArray(str = []) {
+        if (Array.isArray(str)) return str;
+        if (typeof str === 'string') return str.split(',').map((item) => item.trim());
+    }
+
     function sanitizerParams(params, exprBuilder) {
         for (const param in params) {
             if (params[param] === '' || params[param] === null) {
@@ -293,8 +299,7 @@ export function useArrayData(key, userOptions) {
 
         Object.assign(params, userParams);
         if (params.filter) params.filter.skip = store.skip;
-        if (store?.order && typeof store?.order == 'string') store.order = [store.order];
-        if (store.order?.length) params.filter.order = [...store.order];
+        if (store.order) params.filter.order = toArray(store.order);
         else delete params.filter.order;
 
         return { filter, params, limit: filter.limit };
diff --git a/src/css/app.scss b/src/css/app.scss
index a28a04a16..8f35d1e8f 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -312,11 +312,11 @@ input::-webkit-inner-spin-button {
 }
 
 .q-item > .q-item__section:has(.q-checkbox) {
-    max-width: min-content;
+    max-width: fit-content;
 }
 
 .row > .column:has(.q-checkbox) {
-    max-width: min-content;
+    max-width: fit-content;
 }
 .q-field__inner {
     .q-field__control {
diff --git a/src/pages/Customer/Card/CustomerConsumption.vue b/src/pages/Customer/Card/CustomerConsumption.vue
index 640e37ed3..f0d8dea47 100644
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@@ -152,7 +152,8 @@ const updateDateParams = (value, params) => {
         v-if="campaignList"
         data-key="CustomerConsumption"
         url="Clients/consumption"
-        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
+        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"        
+        :filter="{ where: { clientFk: route.params.id } }"
         :columns="columns"
         search-url="consumption"
         :user-params="userParams"
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index cb49109d0..4a064843a 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -187,14 +187,18 @@ const debtWarning = computed(() => {
                 </QBtn>
                 <QBtn
                     :to="{
-                        name: 'AccountSummary',
-                        params: { id: entity.id },
+                        name: 'OrderList',
+                        query: {
+                            createForm: JSON.stringify({
+                                clientFk: entity.id,
+                            }),
+                        },
                     }"
                     size="md"
-                    icon="face"
+                    icon="vn:basketadd"
                     color="primary"
                 >
-                    <QTooltip>{{ t('Go to user') }}</QTooltip>
+                    <QTooltip>{{ t('globals.pageTitles.createOrder') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     v-if="entity.supplier"
@@ -218,14 +222,9 @@ en:
     unpaidDated: 'Date {dated}'
     unpaidAmount: 'Amount {amount}'
 es:
-    Go to module index: Ir al índice del módulo
     Customer ticket list: Listado de tickets del cliente
     Customer invoice out list: Listado de facturas del cliente
-    New order: Nuevo pedido
-    New ticket: Nuevo ticket
-    Go to user: Ir al usuario
     Go to supplier: Ir al proveedor
-    Customer unpaid: Cliente impago
     Unpaid: Impagado
     unpaidDated: 'Fecha {dated}'
     unpaidAmount: 'Importe {amount}'
diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
index aeaeaef57..fb78eab69 100644
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@@ -51,7 +51,6 @@ const openCreateForm = (type) => {
     };
     const clientFk = {
         ticket: 'clientId',
-        order: 'clientFk',
     };
     const key = clientFk[type];
     if (!key) return;
@@ -70,11 +69,6 @@ const openCreateForm = (type) => {
             {{ t('globals.pageTitles.createTicket') }}
         </QItemSection>
     </QItem>
-    <QItem v-ripple clickable @click="openCreateForm('order')">
-        <QItemSection>
-            {{ t('globals.pageTitles.createOrder') }}
-        </QItemSection>
-    </QItem>
     <QItem v-ripple clickable>
         <QItemSection @click="showSmsDialog()">{{ t('Send SMS') }}</QItemSection>
     </QItem>
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index c54ecc3f0..9a154c357 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -147,7 +147,7 @@ es:
     Supplier card: Ficha del proveedor
     All travels with current agency: Todos los envíos con la agencia actual
     All entries with current supplier: Todas las entradas con el proveedor actual
-    Go to module index: Ir al índice del modulo
+    Show entry report: Ver informe del pedido
     Inventory entry: Es inventario
     Virtual entry: Es una redada
 </i18n>
diff --git a/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue b/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue
index 936e95d2f..6d093d91d 100644
--- a/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue
@@ -63,7 +63,3 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
     </CardDescriptor>
 </template>
 
-<i18n>
-es:
-    Go to module index: Ir al índice del módulo
-</i18n>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 39627595d..262f503fd 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -115,6 +115,7 @@ const removeTagGroupParam = (params, search, valIndex) => {
     } else {
         params.tagGroups.splice(valIndex, 1);
     }
+    search();
 };
 
 const setCategoryList = (data) => {
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index a1a2a0991..37c9c1cff 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -188,7 +188,6 @@ const getEntryQueryParams = (supplier) => {
 es:
     All entries with current supplier: Todas las entradas con proveedor actual
     Go to client: Ir a cliente
-    Go to module index: Ir al índice del módulo
     Inactive supplier: Proveedor inactivo
     Unverified supplier: Proveedor no verificado
 </i18n>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 4e77b633f..9f7684b93 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -239,7 +239,6 @@ function ticketFilter(ticket) {
 <i18n>
 es:
     This ticket is deleted: Este ticket está eliminado
-    Go to module index: Ir al índice del modulo
     Client inactive: Cliente inactivo
     Client not checked: Cliente no verificado
     Client has debt: Cliente con deuda
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index 4e48e6b53..9c67428f5 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -14,6 +14,9 @@ const filter = {
         'warehouseOutFk',
         'cargoSupplierFk',
         'agencyModeFk',
+        'isRaid',
+        'isDelivered',
+        'isReceived',
     ],
     include: [
         {
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index 00852e5ee..72acf91b8 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -85,7 +85,6 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
 
 <i18n>
 es:
-    Go to module index: Ir al índice del módulo
     The travel will be deleted: El envío será eliminado
     Do you want to delete this travel?: ¿Quieres eliminar este envío?
     All travels with current agency: Todos los envíos con la agencia actual
diff --git a/src/pages/Wagon/WagonCounter.vue b/src/pages/Wagon/WagonCounter.vue
index 505cbba28..fd411b86b 100644
--- a/src/pages/Wagon/WagonCounter.vue
+++ b/src/pages/Wagon/WagonCounter.vue
@@ -11,7 +11,7 @@ const { t } = useI18n();
 const counters = ref({
     alquilerBandeja: { count: 0, id: 96001, title: 'CC Bandeja', isTray: true },
     bandejaRota: { count: 0, id: 88381, title: 'CC Bandeja Rota', isTray: true },
-    carryOficial: { count: 0, id: 96000, title: 'CC Carry OFICIAL TAG5' },
+    carryOficial: { count: 0, id: 96000, title: 'CC Carry OFICIAL TAG6' },
     candadoRojo: { count: 0, id: 96002, title: 'CC Carry NO OFICIAL' },
     sacadores: { count: 0, id: 142260, title: 'CC Sacadores' },
     sinChapa: { count: 0, id: 2214, title: 'DC Carry Sin Placa CC' },
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index f991818fb..8355c219e 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -66,7 +66,3 @@ const setData = (entity) => {
     </CardDescriptor>
 </template>
 
-<i18n>
-es:
-    Go to module index: Ir al índice del módulo
-</i18n>

From 8e3fad60c0405e78bbda163f236b1f2f098993d3 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 24 Jan 2025 08:59:47 +0100
Subject: [PATCH 12/14] fix: refs #8316 icon

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

diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index b47841ef4..f67e69e87 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -42,7 +42,7 @@ const itemCard = {
             name: 'ItemTags',
             meta: {
                 title: 'tags',
-                icon: 'vn:tag',
+                icon: 'vn:tags',
             },
             component: () => import('src/pages/Item/Card/ItemTags.vue'),
         },

From e38e9b1dd78ae0a2640ef59471771041fecaed73 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 24 Jan 2025 09:01:54 +0100
Subject: [PATCH 13/14] fix: refs #8316 filter

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

diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 010bd89d0..f740e5d16 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -334,6 +334,7 @@ onBeforeMount(async () => {
         :array-data-props="{
             url: 'Items/filter',
             order: ['isActive DESC', 'name', 'id'],
+            userFilter: itemFilter,
         }"
     >
         <template #advanced-menu>
@@ -358,7 +359,6 @@ onBeforeMount(async () => {
                     },
                 }"
                 :is-editable="false"
-                :filter="itemFilter"
             >
                 <template #column-image="{ row }">
                     <VnImg

From 1455d8ce02e1aad513aa0ee686d8dae0e3c0c50f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 24 Jan 2025 09:04:01 +0100
Subject: [PATCH 14/14] fix: refs #8316 filter

---
 src/pages/Item/ItemTypeList.vue | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/pages/Item/ItemTypeList.vue b/src/pages/Item/ItemTypeList.vue
index 8986220cf..93e98a8ae 100644
--- a/src/pages/Item/ItemTypeList.vue
+++ b/src/pages/Item/ItemTypeList.vue
@@ -144,6 +144,20 @@ const columns = computed(() => [
             url: 'ItemTypes',
             order: 'name ASC',
             exprBuilder,
+            userFilter: {
+                include: {
+                    relation: 'worker',
+                    scope: {
+                        fields: ['id'],
+                        include: {
+                            relation: 'user',
+                            scope: {
+                                fields: ['id', 'name'],
+                            },
+                        },
+                    },
+                },
+            },
         }"
     >
         <template #body>
@@ -156,20 +170,6 @@ const columns = computed(() => [
                     onDataSaved: () => tableRef.reload(),
                     formInitialData: {},
                 }"
-                :user-filter="{
-                    include: {
-                        relation: 'worker',
-                        scope: {
-                            fields: ['id'],
-                            include: {
-                                relation: 'user',
-                                scope: {
-                                    fields: ['id', 'name'],
-                                },
-                            },
-                        },
-                    },
-                }"
                 :columns="columns"
                 auto-load
                 redirect="item/item-type"