From a9a09ad0a3aa9f81639a98c88680308fc1ec542c Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 27 Dec 2024 13:58:35 +0100
Subject: [PATCH 01/13] refactor: refs #8316 used VnSection and VnCardBeta

---
 src/pages/Entry/Card/EntryCard.vue |  14 +-
 src/pages/Entry/EntryList.vue      | 122 ++++++++---------
 src/pages/Entry/locale/en.yml      |   3 +
 src/pages/Entry/locale/es.yml      |   6 +-
 src/router/modules/entry.js        | 201 ++++++++++++++++-------------
 5 files changed, 179 insertions(+), 167 deletions(-)

diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index 3f2596338..6d743926e 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -1,21 +1,11 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import EntryDescriptor from './EntryDescriptor.vue';
-import EntryFilter from '../EntryFilter.vue';
-import filter from './EntryFilter.js';
 </script>
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="Entry"
         base-url="Entries"
-        :filter="filter"
         :descriptor="EntryDescriptor"
-        :filter-panel="EntryFilter"
-        search-data-key="EntryList"
-        :searchbar-props="{
-            url: 'Entries/filter',
-            label: 'Search entries',
-            info: 'You can search by entry reference',
-        }"
     />
 </template>
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 84ead85ad..6e7e9fc82 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -2,19 +2,19 @@
 import { onMounted, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import EntryFilter from './EntryFilter.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
 import VnTable from 'components/VnTable/VnTable.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import { toDate } from 'src/filters';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import EntrySummary from './Card/EntrySummary.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
 const tableRef = ref();
+const dataKey = 'EntryList';
 
 const { viewSummary } = useSummaryDialog();
 const entryFilter = {
@@ -180,67 +180,71 @@ const columns = computed(() => [
     },
 ]);
 </script>
+
 <template>
-    <VnSearchbar
-        data-key="EntryList"
+    <VnSection
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="entry"
         url="Entries/filter"
-        :label="t('Search entries')"
-        :info="t('You can search by entry reference')"
-    />
-    <RightMenu>
-        <template #right-panel>
+        :array-data-props="{
+            url: 'Entries/filter',
+            order: 'id DESC',
+            exprBuilder,
+        }"
+    >
+        <template #rightMenu>
             <EntryFilter data-key="EntryList" />
         </template>
-    </RightMenu>
-    <VnTable
-        ref="tableRef"
-        data-key="EntryList"
-        url="Entries/filter"
-        :filter="entryFilter"
-        :create="{
-            urlCreate: 'Entries',
-            title: t('Create entry'),
-            onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {},
-        }"
-        order="id DESC"
-        :columns="columns"
-        redirect="entry"
-        :right-search="false"
-    >
-        <template #column-status="{ row }">
-            <div class="row q-gutter-xs">
-                <QIcon
-                    v-if="!!row.isExcludedFromAvailable"
-                    name="vn:inventory"
-                    color="primary"
-                >
-                    <QTooltip>{{
-                        t('entry.list.tableVisibleColumns.isExcludedFromAvailable')
-                    }}</QTooltip>
-                </QIcon>
-                <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
-                    <QTooltip>
-                        {{
-                            t('globals.raid', { daysInForward: row.daysInForward })
-                        }}</QTooltip
-                    >
-                </QIcon>
-            </div>
-        </template>
-        <template #column-supplierFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.supplierName }}
-                <SupplierDescriptorProxy :id="row.supplierFk" />
-            </span>
-        </template>
-        <template #column-travelFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.travelRef }}
-                <TravelDescriptorProxy :id="row.travelFk" />
-            </span>
-        </template>
-    </VnTable>
+        <template #body>
+            <VnTable
+                ref="tableRef"
+                :data-key="dataKey"
+                :create="{
+                    urlCreate: 'Entries',
+                    title: t('Create entry'),
+                    onDataSaved: ({ id }) => tableRef.redirect(id),
+                    formInitialData: {},
+                }"
+                :columns="columns"
+                redirect="entry"
+                :right-search="false"
+            >
+                <template #column-status="{ row }">
+                    <div class="row q-gutter-xs">
+                        <QIcon
+                            v-if="!!row.isExcludedFromAvailable"
+                            name="vn:inventory"
+                            color="primary"
+                        >
+                            <QTooltip>{{
+                                t('entry.list.tableVisibleColumns.isExcludedFromAvailable')
+                            }}</QTooltip>
+                        </QIcon>
+                        <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
+                            <QTooltip>
+                                {{
+                                    t('globals.raid', { daysInForward: row.daysInForward })
+                                }}</QTooltip
+                            >
+                        </QIcon>
+                    </div>
+                </template>
+                <template #column-supplierFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.supplierName }}
+                        <SupplierDescriptorProxy :id="row.supplierFk" />
+                    </span>
+                </template>
+                <template #column-travelFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.travelRef }}
+                        <TravelDescriptorProxy :id="row.travelFk" />
+                    </span>
+                </template>
+            </VnTable>
+        </template> 
+    </VnSection>
 </template>
 
 <i18n>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index cd5113d84..b0e3cc1d5 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -1,3 +1,6 @@
+entry:
+    search: Search entries
+    searchInfo: You can search by entry reference
 entryList:
     list:
         inventoryEntry: Inventory entry
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 3007c5d44..313a7f5c7 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -1,6 +1,6 @@
-Search entries: Buscar entradas
-You can search by entry reference: Puedes buscar por referencia de la entrada
-
+entry:
+    search: Buscar entradas
+    searchInfo: Puedes buscar por referencia de entrada
 entryList:
     list:
         inventoryEntry: Es inventario
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 26ce773c5..f362c7653 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -1,50 +1,123 @@
 import { RouterView } from 'vue-router';
 
+const entryCard = {
+    name: 'EntryCard',
+    path: ':id',
+    component: () => import('src/pages/Entry/Card/EntryCard.vue'),
+    redirect: { name: 'EntrySummary' },
+    meta: {
+        menu: [
+            'EntryBasicData',
+            'EntryBuys',
+            'EntryNotes',
+            'EntryDms',
+            'EntryLog',
+        ],
+    },
+    children: [
+        {
+            path: 'summary',
+            name: 'EntrySummary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Entry/Card/EntrySummary.vue'),
+        },
+        {
+            path: 'basic-data',
+            name: 'EntryBasicData',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+            },
+            component: () => import('src/pages/Entry/Card/EntryBasicData.vue'),
+        },
+        {
+            path: 'buys',
+            name: 'EntryBuys',
+            meta: {
+                title: 'buys',
+                icon: 'vn:lines',
+            },
+            component: () => import('src/pages/Entry/Card/EntryBuys.vue'),
+        },
+        {
+            path: 'buys/import',
+            name: 'EntryBuysImport',
+            component: () => import('src/pages/Entry/Card/EntryBuysImport.vue'),
+        },
+        {
+            path: 'notes',
+            name: 'EntryNotes',
+            meta: {
+                title: 'notes',
+                icon: 'vn:notes',
+            },
+            component: () => import('src/pages/Entry/Card/EntryNotes.vue'),
+        },
+        {
+            path: 'dms',
+            name: 'EntryDms',
+            meta: {
+                title: 'dms',
+                icon: 'smb_share',
+            },
+            component: () => import('src/pages/Entry/Card/EntryDms.vue'),
+        },
+        {
+            path: 'log',
+            name: 'EntryLog',
+            meta: {
+                title: 'log',
+                icon: 'vn:History',
+            },
+            component: () => import('src/pages/Entry/Card/EntryLog.vue'),
+        },
+    ],
+};
+
 export default {
-    path: '/entry',
     name: 'Entry',
+    path: '/entry',
     meta: {
         title: 'entries',
         icon: 'vn:entry',
         moduleName: 'Entry',
         keyBinding: 'e',
-    },
-    component: RouterView,
-    redirect: { name: 'EntryMain' },
-    menus: {
-        main: [
+        menu: [
             'EntryList',
             'MyEntries',
             'EntryLatestBuys',
             'EntryStockBought',
             'EntryWasteRecalc',
-        ],
-        card: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryDms', 'EntryLog'],
+        ]
     },
+    component: RouterView,
+    redirect: { name: 'EntryMain' },
     children: [
         {
-            path: '',
             name: 'EntryMain',
+            path: '',
             component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'EntryList' },
+            redirect: { name: 'EntryIndexMain' },
             children: [
                 {
-                    path: 'list',
-                    name: 'EntryList',
-                    meta: {
-                        title: 'list',
-                        icon: 'view_list',
-                    },
+                    path:'',
+                    name: 'EntryIndexMain',
+                    redirect: { name: 'EntryList' },
                     component: () => import('src/pages/Entry/EntryList.vue'),
-                },
-                {
-                    path: 'my',
-                    name: 'MyEntries',
-                    meta: {
-                        title: 'labeler',
-                        icon: 'sell',
-                    },
-                    component: () => import('src/pages/Entry/MyEntries.vue'),
+                    children: [
+                        {
+                            name: 'EntryList',
+                            path: 'list',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
+                            },
+                        },
+                        entryCard,
+                    ],
                 },
                 {
                     path: 'create',
@@ -54,6 +127,15 @@ export default {
                         icon: 'add',
                     },
                     component: () => import('src/pages/Entry/EntryCreate.vue'),
+                },                
+                {
+                    path: 'my',
+                    name: 'MyEntries',
+                    meta: {
+                        title: 'labeler',
+                        icon: 'sell',
+                    },
+                    component: () => import('src/pages/Entry/MyEntries.vue'),
                 },
                 {
                     path: 'latest-buys',
@@ -84,72 +166,5 @@ export default {
                 },
             ],
         },
-        {
-            name: 'EntryCard',
-            path: ':id',
-            component: () => import('src/pages/Entry/Card/EntryCard.vue'),
-            redirect: { name: 'EntrySummary' },
-            children: [
-                {
-                    name: 'EntrySummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'launch',
-                    },
-                    component: () => import('src/pages/Entry/Card/EntrySummary.vue'),
-                },
-                {
-                    path: 'basic-data',
-                    name: 'EntryBasicData',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                    },
-                    component: () => import('src/pages/Entry/Card/EntryBasicData.vue'),
-                },
-                {
-                    path: 'buys',
-                    name: 'EntryBuys',
-                    meta: {
-                        title: 'buys',
-                        icon: 'vn:lines',
-                    },
-                    component: () => import('src/pages/Entry/Card/EntryBuys.vue'),
-                },
-                {
-                    path: 'buys/import',
-                    name: 'EntryBuysImport',
-                    component: () => import('src/pages/Entry/Card/EntryBuysImport.vue'),
-                },
-                {
-                    path: 'notes',
-                    name: 'EntryNotes',
-                    meta: {
-                        title: 'notes',
-                        icon: 'vn:notes',
-                    },
-                    component: () => import('src/pages/Entry/Card/EntryNotes.vue'),
-                },
-                {
-                    path: 'dms',
-                    name: 'EntryDms',
-                    meta: {
-                        title: 'dms',
-                        icon: 'smb_share',
-                    },
-                    component: () => import('src/pages/Entry/Card/EntryDms.vue'),
-                },
-                {
-                    path: 'log',
-                    name: 'EntryLog',
-                    meta: {
-                        title: 'log',
-                        icon: 'vn:History',
-                    },
-                    component: () => import('src/pages/Entry/Card/EntryLog.vue'),
-                },
-            ],
-        },
     ],
-};
+};
\ No newline at end of file

From df1b1205cf4c369c8c38153f8e442f02b71df190 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Thu, 2 Jan 2025 12:16:05 +0100
Subject: [PATCH 02/13] feat: refs #7077 created test for VnInputTime

---
 .../common/__tests__/VnInputTime.spec.js      | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 src/components/common/__tests__/VnInputTime.spec.js

diff --git a/src/components/common/__tests__/VnInputTime.spec.js b/src/components/common/__tests__/VnInputTime.spec.js
new file mode 100644
index 000000000..1ecc01cc3
--- /dev/null
+++ b/src/components/common/__tests__/VnInputTime.spec.js
@@ -0,0 +1,63 @@
+import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import VnInputTime from 'components/common/VnInputTime.vue';
+
+describe('VnInputTime', () => {
+    let wrapper;
+    let vm;
+
+    beforeAll(() => {
+        wrapper = createWrapper(VnInputTime, {
+            props: {
+                isOutlined: true,
+                timeOnly: false, // Initial props values
+            },
+        });
+        vm = wrapper.vm;
+        wrapper = wrapper.wrapper;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should return the correct data if isOutlined is true', () => {
+        expect(vm.isOutlined).toBe(true);
+        expect(vm.styleAttrs).toEqual({ dense: true, outlined: true, rounded: true });
+    });
+
+    it('should return the formatted data', () => {
+        expect(vm.dateToTime('2022-01-01T03:23:43')).toBe('03:23');
+    });
+
+    describe('formattedTime', () => {
+        it('should return the formatted time for a valid ISO date', () => {
+            vm.model = '2025-01-02T15:45:00';
+            expect(vm.formattedTime).toBe('15:45');
+        });
+
+        it('should handle null model value gracefully', () => {
+            vm.model = null;
+            expect(vm.formattedTime).toBe(null);
+        });
+
+        it('should handle time-only input correctly', async () => {
+            await wrapper.setProps({ timeOnly: true });
+            vm.formattedTime = '14:30';
+            expect(vm.model).toBe('14:30');
+        });
+
+        it('should pad short time values correctly', async () => {
+            await wrapper.setProps({ timeOnly: true });
+            vm.formattedTime = '9';
+            expect(vm.model).toBe('09:00');
+        });
+
+        it('should not update the model if the value is unchanged', () => {
+            vm.model = '14:30';
+            const previousModel = vm.model;
+            vm.formattedTime = '14:30';
+            expect(vm.model).toBe(previousModel);
+        });
+    });
+});
\ No newline at end of file

From 7f1684ddfcd970f4ac1f36cf6e9502144771f59b Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 8 Jan 2025 08:14:05 +0100
Subject: [PATCH 03/13] refactor: refs #8316 added entryFilter

---
 src/pages/Entry/Card/EntryCard.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index 6d743926e..8e271ffab 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -1,11 +1,13 @@
 <script setup>
 import VnCardBeta from 'components/common/VnCardBeta.vue';
 import EntryDescriptor from './EntryDescriptor.vue';
+import filter from './EntryFilter.js'
 </script>
 <template>
     <VnCardBeta
         data-key="Entry"
         base-url="Entries"
         :descriptor="EntryDescriptor"
+        :filter="filter"
     />
 </template>

From 7be5f9633b1ecd26d1c02c4725f897f111c0f3c4 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 10 Jan 2025 15:24:40 +0100
Subject: [PATCH 04/13] feat: refs #8316 add entryFilter prop to VnTable
 component in EntryList

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

diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 1f8ade121..572a5908b 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -2,7 +2,6 @@
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import EntryFilter from './EntryFilter.vue';
-import { useStateStore } from 'stores/useStateStore';
 import VnTable from 'components/VnTable/VnTable.vue';
 import { toDate } from 'src/filters';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
@@ -199,6 +198,7 @@ const columns = computed(() => [
             <VnTable
                 ref="tableRef"
                 :data-key="dataKey"
+                :filter="entryFilter"
                 :create="{
                     urlCreate: 'Entries',
                     title: t('Create entry'),

From 702ae17d9450e88b3e51785bed0384fca1ca6cb7 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Tue, 14 Jan 2025 08:25:10 +0100
Subject: [PATCH 05/13] refactor: refs #8316 update EntryCard to use
 user-filter prop and remove exprBuilder from EntryList

---
 src/pages/Entry/Card/EntryCard.vue | 2 +-
 src/pages/Entry/EntryList.vue      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index 8e271ffab..e00623a21 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -8,6 +8,6 @@ import filter from './EntryFilter.js'
         data-key="Entry"
         base-url="Entries"
         :descriptor="EntryDescriptor"
-        :filter="filter"
+        :user-filter="filter"
     />
 </template>
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 572a5908b..edd3ae942 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -188,7 +188,6 @@ const columns = computed(() => [
         :array-data-props="{
             url: 'Entries/filter',
             order: 'id DESC',
-            exprBuilder,
         }"
     >
         <template #rightMenu>

From 6a88cad90338bf4d370f77d08a68578f126df104 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Wed, 15 Jan 2025 09:55:59 +0100
Subject: [PATCH 06/13] fix: refs #7077 removed unused imports

---
 src/components/common/VnInputTime.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index b4b246618..4147f8976 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -1,13 +1,11 @@
 <script setup>
 import { computed, ref, useAttrs } from 'vue';
-import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
 import VnTime from './VnTime.vue';
 import { useRequired } from 'src/composables/useRequired';
 
 const $attrs = useAttrs();
 const { isRequired, requiredFieldRule } = useRequired($attrs);
-const { t } = useI18n();
 const model = defineModel({ type: String });
 const props = defineProps({
     timeOnly: {

From a95f6f56bd348b9acc4b20b81dcab8c3efe93fcd Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 15 Jan 2025 12:17:06 +0100
Subject: [PATCH 07/13] fix: refs #8316 userFilter

---
 src/pages/Entry/EntryList.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index e6b06eb6b..6afce1edf 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -188,6 +188,7 @@ const columns = computed(() => [
         :array-data-props="{
             url: 'Entries/filter',
             order: 'id DESC',
+            userFilter: 'entryFilter',
         }"
     >
         <template #rightMenu>
@@ -197,7 +198,6 @@ const columns = computed(() => [
             <VnTable
                 ref="tableRef"
                 :data-key="dataKey"
-                :filter="entryFilter"
                 :create="{
                     urlCreate: 'Entries',
                     title: t('Create entry'),
@@ -216,13 +216,17 @@ const columns = computed(() => [
                             color="primary"
                         >
                             <QTooltip>{{
-                                t('entry.list.tableVisibleColumns.isExcludedFromAvailable')
+                                t(
+                                    'entry.list.tableVisibleColumns.isExcludedFromAvailable'
+                                )
                             }}</QTooltip>
                         </QIcon>
                         <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
                             <QTooltip>
                                 {{
-                                    t('globals.raid', { daysInForward: row.daysInForward })
+                                    t('globals.raid', {
+                                        daysInForward: row.daysInForward,
+                                    })
                                 }}</QTooltip
                             >
                         </QIcon>
@@ -241,7 +245,7 @@ const columns = computed(() => [
                     </span>
                 </template>
             </VnTable>
-        </template> 
+        </template>
     </VnSection>
 </template>
 

From 80413eef3ef616e77efeb842bd4159078b558e88 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 15 Jan 2025 15:19:47 +0100
Subject: [PATCH 08/13] refactor: refs #8316 moved localizations to local
 locale

---
 src/i18n/locale/en.yml        | 74 ---------------------------------
 src/i18n/locale/es.yml        | 74 ---------------------------------
 src/pages/Entry/EntryList.vue | 10 +----
 src/pages/Entry/locale/en.yml | 77 ++++++++++++++++++++++++++++++++--
 src/pages/Entry/locale/es.yml | 78 +++++++++++++++++++++++++++++++++--
 5 files changed, 148 insertions(+), 165 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 91d07a9d3..80f18238d 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -389,80 +389,6 @@ cau:
     subtitle: By sending this ticket, all the data related to the error, the section, the user, etc., are already sent.
     inputLabel: Explain why this error should not appear
     askPrivileges: Ask for privileges
-entry:
-    list:
-        newEntry: New entry
-        tableVisibleColumns:
-            created: Creation
-            supplierFk: Supplier
-            isBooked: Booked
-            isConfirmed: Confirmed
-            isOrdered: Ordered
-            companyFk: Company
-            travelFk: Travel
-            isExcludedFromAvailable: Inventory
-            invoiceAmount: Import
-    summary:
-        commission: Commission
-        currency: Currency
-        invoiceNumber: Invoice number
-        ordered: Ordered
-        booked: Booked
-        excludedFromAvailable: Inventory
-        travelReference: Reference
-        travelAgency: Agency
-        travelShipped: Shipped
-        travelDelivered: Delivered
-        travelLanded: Landed
-        travelReceived: Received
-        buys: Buys
-        stickers: Stickers
-        package: Package
-        packing: Pack.
-        grouping: Group.
-        buyingValue: Buying value
-        import: Import
-        pvp: PVP
-    basicData:
-        travel: Travel
-        currency: Currency
-        commission: Commission
-        observation: Observation
-        booked: Booked
-        excludedFromAvailable: Inventory
-    buys:
-        observations: Observations
-        packagingFk: Box
-        color: Color
-        printedStickers: Printed stickers
-    notes:
-        observationType: Observation type
-    latestBuys:
-        tableVisibleColumns:
-            image: Picture
-            itemFk: Item ID
-            weightByPiece: Weight/Piece
-            isActive: Active
-            family: Family
-            entryFk: Entry
-            freightValue: Freight value
-            comissionValue: Commission value
-            packageValue: Package value
-            isIgnored: Is ignored
-            price2: Grouping
-            price3: Packing
-            minPrice: Min
-            ektFk: Ekt
-            packingOut: Package out
-            landing: Landing
-            isExcludedFromAvailable: Es inventory
-    params:
-        toShipped: To
-        fromShipped: From
-        warehouseiNFk: Warehouse
-        daysOnward: Days onward
-        daysAgo: Days ago
-        warehouseInFk: Warehouse in
 ticket:
     params:
         ticketFk: Ticket ID
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 2d3077b78..786236617 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -389,80 +389,6 @@ cau:
     subtitle: Al enviar este cau ya se envían todos los datos relacionados con el error, la sección, el usuario, etc
     inputLabel: Explique el motivo por el que no deberia aparecer este fallo
     askPrivileges: Solicitar permisos
-entry:
-    list:
-        newEntry: Nueva entrada
-        tableVisibleColumns:
-            created: Creación
-            supplierFk: Proveedor
-            isBooked: Asentado
-            isConfirmed: Confirmado
-            isOrdered: Pedida
-            companyFk: Empresa
-            travelFk: Envio
-            isExcludedFromAvailable: Inventario
-            invoiceAmount: Importe
-    summary:
-        commission: Comisión
-        currency: Moneda
-        invoiceNumber: Núm. factura
-        ordered: Pedida
-        booked: Contabilizada
-        excludedFromAvailable: Inventario
-        travelReference: Referencia
-        travelAgency: Agencia
-        travelShipped: F. envio
-        travelWarehouseOut: Alm. salida
-        travelDelivered: Enviada
-        travelLanded: F. entrega
-        travelReceived: Recibida
-        buys: Compras
-        stickers: Etiquetas
-        package: Embalaje
-        packing: Pack.
-        grouping: Group.
-        buyingValue: Coste
-        import: Importe
-        pvp: PVP
-    basicData:
-        travel: Envío
-        currency: Moneda
-        observation: Observación
-        commission: Comisión
-        booked: Asentado
-        excludedFromAvailable: Inventario
-    buys:
-        observations: Observaciónes
-        packagingFk: Embalaje
-        color: Color
-        printedStickers: Etiquetas impresas
-    notes:
-        observationType: Tipo de observación
-    latestBuys:
-        tableVisibleColumns:
-            image: Foto
-            itemFk: Id Artículo
-            weightByPiece: Peso (gramos)/tallo
-            isActive: Activo
-            family: Familia
-            entryFk: Entrada
-            freightValue: Porte
-            comissionValue: Comisión
-            packageValue: Embalaje
-            isIgnored: Ignorado
-            price2: Grouping
-            price3: Packing
-            minPrice: Min
-            ektFk: Ekt
-            packingOut: Embalaje envíos
-            landing: Llegada
-            isExcludedFromAvailable: Es inventario
-    params:
-        toShipped: Hasta
-        fromShipped: Desde
-        warehouseInFk: Alm. entrada
-        daysOnward: Días adelante
-        daysAgo: Días atras
 ticket:
     params:
         ticketFk: ID de ticket
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 6afce1edf..ea6f1a621 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -200,7 +200,7 @@ const columns = computed(() => [
                 :data-key="dataKey"
                 :create="{
                     urlCreate: 'Entries',
-                    title: t('Create entry'),
+                    title: t('entry.list.newEntry'),
                     onDataSaved: ({ id }) => tableRef.redirect(id),
                     formInitialData: {},
                 }"
@@ -248,11 +248,3 @@ const columns = computed(() => [
         </template>
     </VnSection>
 </template>
-
-<i18n>
-es:
-    Virtual entry: Es una redada
-    Search entries: Buscar entradas
-    You can search by entry reference: Puedes buscar por referencia de la entrada
-    Create entry: Crear entrada
-</i18n>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 565989e13..5d0162fe2 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -1,10 +1,79 @@
 entry:
+    list:
+        newEntry: New entry
+        tableVisibleColumns:
+            created: Creation
+            supplierFk: Supplier
+            isBooked: Booked
+            isConfirmed: Confirmed
+            isOrdered: Ordered
+            companyFk: Company
+            travelFk: Travel
+            isExcludedFromAvailable: Inventory
+            invoiceAmount: Import
+        inventoryEntry: Inventory entry
+    summary:
+        commission: Commission
+        currency: Currency
+        invoiceNumber: Invoice number
+        ordered: Ordered
+        booked: Booked
+        excludedFromAvailable: Inventory
+        travelReference: Reference
+        travelAgency: Agency
+        travelShipped: Shipped
+        travelDelivered: Delivered
+        travelLanded: Landed
+        travelReceived: Received
+        buys: Buys
+        stickers: Stickers
+        package: Package
+        packing: Pack.
+        grouping: Group.
+        buyingValue: Buying value
+        import: Import
+        pvp: PVP
+    basicData:
+        travel: Travel
+        currency: Currency
+        commission: Commission
+        observation: Observation
+        booked: Booked
+        excludedFromAvailable: Inventory
+    buys:
+        observations: Observations
+        packagingFk: Box
+        color: Color
+        printedStickers: Printed stickers
+    notes:
+        observationType: Observation type
+    latestBuys:
+        tableVisibleColumns:
+            image: Picture
+            itemFk: Item ID
+            weightByPiece: Weight/Piece
+            isActive: Active
+            family: Family
+            entryFk: Entry
+            freightValue: Freight value
+            comissionValue: Commission value
+            packageValue: Package value
+            isIgnored: Is ignored
+            price2: Grouping
+            price3: Packing
+            minPrice: Min
+            ektFk: Ekt
+            packingOut: Package out
+            landing: Landing
+            isExcludedFromAvailable: Es inventory
+    params:
+        toShipped: To
+        fromShipped: From
+        daysOnward: Days onward
+        daysAgo: Days ago
+        warehouseInFk: Warehouse in
     search: Search entries
     searchInfo: You can search by entry reference
-entryList:
-    list:
-        inventoryEntry: Inventory entry
-        showEntryReport: Show entry report
 entryFilter:
     filter:
         search: General search
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index f6e8a8b7c..064dcbfd9 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -1,10 +1,80 @@
 entry:
+    list:
+        newEntry: Nueva entrada
+        tableVisibleColumns:
+            created: Creación
+            supplierFk: Proveedor
+            isBooked: Asentado
+            isConfirmed: Confirmado
+            isOrdered: Pedida
+            companyFk: Empresa
+            travelFk: Envio
+            isExcludedFromAvailable: Inventario
+            invoiceAmount: Importe
+        inventoryEntry: Es inventario
+    summary:
+        commission: Comisión
+        currency: Moneda
+        invoiceNumber: Núm. factura
+        ordered: Pedida
+        booked: Contabilizada
+        excludedFromAvailable: Inventario
+        travelReference: Referencia
+        travelAgency: Agencia
+        travelShipped: F. envio
+        travelWarehouseOut: Alm. salida
+        travelDelivered: Enviada
+        travelLanded: F. entrega
+        travelReceived: Recibida
+        buys: Compras
+        stickers: Etiquetas
+        package: Embalaje
+        packing: Pack.
+        grouping: Group.
+        buyingValue: Coste
+        import: Importe
+        pvp: PVP
+    basicData:
+        travel: Envío
+        currency: Moneda
+        observation: Observación
+        commission: Comisión
+        booked: Asentado
+        excludedFromAvailable: Inventario
+    buys:
+        observations: Observaciónes
+        packagingFk: Embalaje
+        color: Color
+        printedStickers: Etiquetas impresas
+    notes:
+        observationType: Tipo de observación
+    latestBuys:
+        tableVisibleColumns:
+            image: Foto
+            itemFk: Id Artículo
+            weightByPiece: Peso (gramos)/tallo
+            isActive: Activo
+            family: Familia
+            entryFk: Entrada
+            freightValue: Porte
+            comissionValue: Comisión
+            packageValue: Embalaje
+            isIgnored: Ignorado
+            price2: Grouping
+            price3: Packing
+            minPrice: Min
+            ektFk: Ekt
+            packingOut: Embalaje envíos
+            landing: Llegada
+            isExcludedFromAvailable: Es inventario
+    params:
+        toShipped: Hasta
+        fromShipped: Desde
+        warehouseInFk: Alm. entrada
+        daysOnward: Días adelante
+        daysAgo: Días atras
     search: Buscar entradas
     searchInfo: Puedes buscar por referencia de entrada
-entryList:
-    list:
-        inventoryEntry: Es inventario
-        showEntryReport: Ver informe del pedido
 entryFilter:
     filter:
         search: Búsqueda general

From 82e6cc07907d074e82cb51cdec19fe5919ed06c5 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Thu, 16 Jan 2025 07:18:05 +0100
Subject: [PATCH 09/13] refactor: refs #7077 removed some comments

---
 src/components/common/__tests__/VnInputTime.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/__tests__/VnInputTime.spec.js b/src/components/common/__tests__/VnInputTime.spec.js
index 1ecc01cc3..2692ac71b 100644
--- a/src/components/common/__tests__/VnInputTime.spec.js
+++ b/src/components/common/__tests__/VnInputTime.spec.js
@@ -10,7 +10,7 @@ describe('VnInputTime', () => {
         wrapper = createWrapper(VnInputTime, {
             props: {
                 isOutlined: true,
-                timeOnly: false, // Initial props values
+                timeOnly: false,
             },
         });
         vm = wrapper.vm;

From 86169d980c6e390fc0591dfe1dd3c992fedaf795 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 16 Jan 2025 09:34:12 +0100
Subject: [PATCH 10/13] feat: refs #7882 Added coords to create a address

---
 .../components/CustomerAddressCreate.vue      | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index bc4d6a128..32b4078db 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -11,6 +11,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -150,6 +151,22 @@ function onAgentCreated({ id, fiscalName }, data) {
                     </template>
                 </VnSelectDialog>
             </VnRow>
+            <VnRow>
+                <VnInputNumber
+                    :label="t('Longitude')"
+                    clearable
+                    v-model="data.longitude"
+                    :decimal-places="7"
+                    :positive="false"
+                />
+                <VnInputNumber
+                    :label="t('Latitude')"
+                    clearable
+                    v-model="data.latitude"
+                    :decimal-places="7"
+                    :positive="false"
+                />
+            </VnRow>
         </template>
     </FormModel>
 </template>
@@ -175,4 +192,6 @@ es:
     Mobile: Movíl
     Incoterms: Incoterms
     Customs agent: Agente de aduanas
+    Longitude: Longitud
+    Latitude: Latitud
 </i18n>

From 4b3c78dd658018c73375b8480243281af74c5d73 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Thu, 16 Jan 2025 12:40:28 +0100
Subject: [PATCH 11/13] fix: refs #8243 fixed SkeletonSummary

---
 src/components/ui/SkeletonSummary.vue | 71 ++++++++++++++++-----------
 1 file changed, 41 insertions(+), 30 deletions(-)

diff --git a/src/components/ui/SkeletonSummary.vue b/src/components/ui/SkeletonSummary.vue
index e8407ee7b..659d4c53d 100644
--- a/src/components/ui/SkeletonSummary.vue
+++ b/src/components/ui/SkeletonSummary.vue
@@ -1,38 +1,49 @@
 <template>
     <div class="header bg-primary q-pa-sm q-mb-md">
         <QSkeleton type="rect" square />
+        <QSkeleton type="rect" square />
     </div>
     <div class="row q-pa-md q-col-gutter-md q-mb-md">
-        <QSkeleton type="rect" class="q-mb-md" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="rect" class="q-mb-md" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="rect" class="q-mb-md" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="rect" class="q-mb-md" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="rect" class="q-mb-md" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
-        <QSkeleton type="text" square />
+        <div class="col">
+            <QSkeleton type="rect" class="q-mb-md" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+        </div>
+        <div class="col">
+            <QSkeleton type="rect" class="q-mb-md" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+        </div>
+        <div class="col">
+            <QSkeleton type="rect" class="q-mb-md" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+        </div>
+        <div class="col">
+            <QSkeleton type="rect" class="q-mb-md" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+        </div>
+        <div class="col">
+            <QSkeleton type="rect" class="q-mb-md" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+            <QSkeleton type="text" square />
+        </div>
     </div>
 </template>
 

From eed895b21c35944438f44a446bf98ec2647013cd Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 16 Jan 2025 13:25:00 +0100
Subject: [PATCH 12/13] fix: redirect to TicketSale from OrderLines

---
 src/pages/Order/Card/OrderLines.vue | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue
index 6093addb5..9d802c557 100644
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@@ -208,6 +208,20 @@ async function remove(item) {
 async function handleConfirm() {
     const result = await confirm(route.params.id);
     if (result) {
+        const sale = await axios.get(`OrderRows`, {
+            params: {
+                filter: JSON.stringify({
+                    where: { orderFk: route.params.id },
+                }),
+            },
+        });
+        const ticket = await axios.get(`Sales`, {
+            params: {
+                filter: JSON.stringify({
+                    where: { id: sale.data[0].saleFk },
+                }),
+            },
+        });
         quasar.notify({
             message: t('globals.dataSaved'),
             type: 'positive',
@@ -215,7 +229,7 @@ async function handleConfirm() {
         router.push({
             name: 'TicketSale',
             query: {
-                table: JSON.stringify({ id: route.params.id }),
+                table: JSON.stringify({ id: ticket.data[0].ticketFk }),
             },
         });
     }

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

---
 src/i18n/locale/en.yml               |  3 ++
 src/i18n/locale/es.yml               |  4 ++
 src/pages/Entry/EntryFilter.vue      | 61 +++++++---------------------
 src/pages/Entry/EntryLatestBuys.vue  |  9 +---
 src/pages/Entry/EntryStockBought.vue | 35 +++++-----------
 src/pages/Entry/MyEntries.vue        |  8 +---
 src/pages/Entry/locale/en.yml        | 26 +++++++++++-
 src/pages/Entry/locale/es.yml        | 26 +++++++++++-
 8 files changed, 87 insertions(+), 85 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 80f18238d..7c733eae8 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -816,7 +816,10 @@ components:
         hasMinPrice: Minimum price
         # LatestBuysFilter
         salesPersonFk: Buyer
+        supplierFk: Supplier
         from: From
+        to: To
+        visible: Is visible
         active: Is active
         floramondo: Is floramondo
         showBadDates: Show future items
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 786236617..d13ccf3f9 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -816,7 +816,11 @@ components:
         wareHouseFk: Almacén
         # LatestBuysFilter
         salesPersonFk: Comprador
+        supplierFk: Proveedor
+        visible: Visible
         active: Activo
+        from: Desde
+        to: Hasta
         floramondo: Floramondo
         showBadDates: Ver items a futuro
     userPanel:
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index f91f7f128..bc8b40aaa 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -40,7 +40,7 @@ const companiesOptions = ref([]);
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <strong>{{ t(`entryFilter.params.${tag.label}`) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
@@ -49,7 +49,7 @@ const companiesOptions = ref([]);
                 <QItemSection>
                     <VnInput
                         v-model="params.search"
-                        :label="t('entryFilter.filter.search')"
+                        :label="t('entryFilter.params.search')"
                         is-outlined
                     />
                 </QItemSection>
@@ -58,7 +58,7 @@ const companiesOptions = ref([]);
                 <QItemSection>
                     <VnInput
                         v-model="params.reference"
-                        :label="t('entryFilter.filter.reference')"
+                        :label="t('entryFilter.params.reference')"
                         is-outlined
                     />
                 </QItemSection>
@@ -67,7 +67,7 @@ const companiesOptions = ref([]);
                 <QItemSection>
                     <VnInput
                         v-model="params.invoiceNumber"
-                        :label="t('params.invoiceNumber')"
+                        :label="t('entryFilter.params.invoiceNumber')"
                         is-outlined
                     />
                 </QItemSection>
@@ -76,7 +76,7 @@ const companiesOptions = ref([]);
                 <QItemSection>
                     <VnInput
                         v-model="params.travelFk"
-                        :label="t('params.travelFk')"
+                        :label="t('entryFilter.params.travelFk')"
                         is-outlined
                     />
                 </QItemSection>
@@ -84,7 +84,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        :label="t('params.companyFk')"
+                        :label="t('entryFilter.params.companyFk')"
                         v-model="params.companyFk"
                         @update:model-value="searchFn()"
                         :options="companiesOptions"
@@ -100,7 +100,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        :label="t('params.currencyFk')"
+                        :label="t('entryFilter.params.currencyFk')"
                         v-model="params.currencyFk"
                         @update:model-value="searchFn()"
                         :options="currenciesOptions"
@@ -116,7 +116,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        :label="t('params.supplierFk')"
+                        :label="t('entryFilter.params.supplierFk')"
                         v-model="params.supplierFk"
                         @update:model-value="searchFn()"
                         url="Suppliers"
@@ -148,7 +148,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInputDate
-                        :label="t('params.created')"
+                        :label="t('entryFilter.params.created')"
                         v-model="params.created"
                         @update:model-value="searchFn()"
                         is-outlined
@@ -158,7 +158,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInputDate
-                        :label="t('params.from')"
+                        :label="t('entryFilter.params.from')"
                         v-model="params.from"
                         @update:model-value="searchFn()"
                         is-outlined
@@ -168,7 +168,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInputDate
-                        :label="t('params.to')"
+                        :label="t('entryFilter.params.to')"
                         v-model="params.to"
                         @update:model-value="searchFn()"
                         is-outlined
@@ -178,14 +178,14 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.isBooked')"
+                        :label="t('entryFilter.params.isBooked')"
                         v-model="params.isBooked"
                         toggle-indeterminate
                     />
                 </QItemSection>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.isConfirmed')"
+                        :label="t('entryFilter.params.isConfirmed')"
                         v-model="params.isConfirmed"
                         toggle-indeterminate
                     />
@@ -194,7 +194,7 @@ const companiesOptions = ref([]);
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.isOrdered')"
+                        :label="t('entryFilter.params.isOrdered')"
                         v-model="params.isOrdered"
                         toggle-indeterminate
                     />
@@ -202,35 +202,4 @@ const companiesOptions = ref([]);
             </QItem>
         </template>
     </VnFilterPanel>
-</template>
-
-<i18n>
-en:
-    params:
-        
-        invoiceNumber: Invoice number
-        travelFk: Travel
-        companyFk: Company
-        currencyFk: Currency
-        supplierFk: Supplier
-        from: From
-        to: To
-        created: Created
-        isBooked: Booked
-        isConfirmed: Confirmed
-        isOrdered: Ordered
-es:
-    params:
-       
-        invoiceNumber: Núm. factura
-        travelFk: Envío
-        companyFk: Empresa
-        currencyFk: Moneda
-        supplierFk: Proveedor
-        from: Desde
-        to: Hasta
-        created: Fecha creación
-        isBooked: Asentado
-        isConfirmed: Confirmado
-        isOrdered: Pedida
-</i18n>
+</template>
\ No newline at end of file
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 450efe624..73fdcbbbf 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -102,7 +102,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('globals.weightByPiece'),
+        label: t('entry.latestBuys.tableVisibleColumns.weightByPiece'),
         name: 'weightByPiece',
         columnFilter: {
             component: 'number',
@@ -157,7 +157,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.buys.packageValue'),
+        label: t('entry.latestBuys.tableVisibleColumns.packageValue'),
         name: 'packageValue',
         columnFilter: {
             component: 'number',
@@ -262,8 +262,3 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         :right-search="false"
     />
 </template>
-
-<i18n>
-es:
-    Edit buy(s): Editar compra(s)
-</i18n>
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 3f0cd2d99..fa0bdc12e 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useQuasar } from 'quasar';
@@ -19,7 +19,7 @@ const { t } = useI18n();
 const quasar = useQuasar();
 const state = useState();
 const user = state.getUser();
-const columns = [
+const columns = computed(() => [
     {
         align: 'left',
         label: 'Id',
@@ -31,7 +31,7 @@ const columns = [
     {
         align: 'left',
         name: 'workerFk',
-        label: t('Buyer'),
+        label: t('entryStockBought.buyer'),
         isTitle: true,
         component: 'select',
         cardVisible: true,
@@ -49,7 +49,7 @@ const columns = [
     },
     {
         align: 'center',
-        label: t('Reserve'),
+        label: t('entryStockBought.reserve'),
         name: 'reserve',
         columnFilter: false,
         create: true,
@@ -58,7 +58,7 @@ const columns = [
     },
     {
         align: 'center',
-        label: t('Bought'),
+        label: t('entryStockBought.bought'),
         name: 'bought',
         summation: true,
         cardVisible: true,
@@ -66,7 +66,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('Date'),
+        label: t('entryStockBought.date'),
         name: 'dated',
         component: 'date',
         visible: false,
@@ -77,7 +77,7 @@ const columns = [
         name: 'tableActions',
         actions: [
             {
-                title: t('View more details'),
+                title: t('entryStockBought.viewMoreDetails'),
                 icon: 'search',
                 isPrimary: true,
                 action: (row) => {
@@ -92,7 +92,7 @@ const columns = [
             },
         ],
     },
-];
+]);
 
 const fetchDataRef = ref();
 const travelDialogRef = ref(false);
@@ -166,7 +166,7 @@ function round(value) {
             <VnRow class="travel">
                 <div v-if="travel">
                     <span style="color: var(--vn-label-color)">
-                        {{ t('Purchase Spaces') }}:
+                        {{ t('entryStockBought.purchaseSpaces') }}:
                     </span>
                     <span>
                         {{ travel?.m3 }}
@@ -177,7 +177,7 @@ function round(value) {
                         flat
                         icon="edit"
                         @click="openDialog()"
-                        :title="t('Edit travel')"
+                        :title="t('entryStockBought.editTravel')"
                         color="primary"
                     />
                 </div>
@@ -226,7 +226,7 @@ function round(value) {
                 @on-fetch="(data) => setFooter(data)"
                 :create="{
                     urlCreate: 'StockBoughts',
-                    title: t('Reserve some space'),
+                    title: t('entryStockBought.reserveSomeSpace'),
                     onDataSaved: () => tableRef.reload(),
                     formInitialData: {
                         workerFk: user.id,
@@ -288,16 +288,3 @@ function round(value) {
     color: $negative !important;
 }
 </style>
-<i18n>
-    es:
-        Edit travel: Editar envío
-        Travel: Envíos
-        Purchase Spaces: Espacios de compra
-        Buyer: Comprador
-        Reserve: Reservado
-        Bought: Comprado
-        Date: Fecha
-        View more details: Ver más detalles
-        Reserve some space: Reservar espacio
-        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha
-</i18n>
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index dbe05eb88..3f7566ae0 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -123,8 +123,8 @@ const printBuys = (rowId) => {
     <VnSearchbar
         data-key="myEntriesList"
         url="Entries/filter"
-        :label="t('Search entries')"
-        :info="t('You can search by entry reference')"
+        :label="t('myEntries.search')"
+        :info="t('myEntries.searchInfo')"
     />
     <VnTable
         data-key="myEntriesList"
@@ -137,7 +137,3 @@ const printBuys = (rowId) => {
         chip-locale="myEntries"
     />
 </template>
-
-<i18n>
-    You can search by entry reference: Puedes buscar por referencia de la entrada
-</i18n>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 5d0162fe2..ff83de0ab 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -75,7 +75,18 @@ entry:
     search: Search entries
     searchInfo: You can search by entry reference
 entryFilter:
-    filter:
+    params:
+        invoiceNumber: Invoice number
+        travelFk: Travel
+        companyFk: Company
+        currencyFk: Currency
+        supplierFk: Supplier
+        from: From
+        to: To
+        created: Created
+        isBooked: Booked
+        isConfirmed: Confirmed
+        isOrdered: Ordered
         search: General search
         reference: Reference
 myEntries:
@@ -91,5 +102,18 @@ myEntries:
     daysOnward: Days onward
     daysAgo: Days ago
     downloadCsv: Download CSV
+    search: Search entries
+    searchInfo: You can search by entry reference
+entryStockBought:
+    travel: Travel
+    editTravel: Edit travel
+    purchaseSpaces: Purchase spaces
+    buyer: Buyer
+    reserve: Reserve
+    bought: Bought
+    date: Date
+    viewMoreDetails: View more details
+    reserveSomeSpace: Reserve some space
+    thisBuyerHasReservationThisDate: This buyer has already made a reservation for this date
 wasteRecalc:
     recalcOk: The wastes were successfully recalculated
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 064dcbfd9..72072f6ab 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -76,7 +76,18 @@ entry:
     search: Buscar entradas
     searchInfo: Puedes buscar por referencia de entrada
 entryFilter:
-    filter:
+    params:
+        invoiceNumber: Núm. factura
+        travelFk: Envío
+        companyFk: Empresa
+        currencyFk: Moneda
+        supplierFk: Proveedor
+        from: Desde
+        to: Hasta
+        created: Fecha creación
+        isBooked: Asentado
+        isConfirmed: Confirmado
+        isOrdered: Pedida
         search: Búsqueda general
         reference: Referencia
 myEntries:
@@ -92,5 +103,18 @@ myEntries:
     daysOnward: Días adelante
     daysAgo: Días atras
     downloadCsv: Descargar CSV
+    search: Buscar entradas
+    searchInfo: Puedes buscar por referencia de la entrada
+entryStockBought:
+    travel: Envío
+    editTravel: Editar envío
+    purchaseSpaces: Espacios de compra
+    buyer: Comprador
+    reserve: Reservado
+    bought: Comprado
+    date: Fecha
+    viewMoreDetails: Ver más detalles
+    reserveSomeSpace: Reservar espacio
+    thisBuyerHasReservationThisDate: Este comprador ya ha hecho una reserva para esta fecha
 wasteRecalc:
     recalcOk: Se han recalculado las mermas correctamente