From 84c92b8a9892386fabb4c7f644d95efc836e0622 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 27 Jan 2025 08:58:58 +0100
Subject: [PATCH] refactor: refs #6897 clean up imports, update labels, and
 enhance localization entries in Entry components

---
 src/pages/Entry/Card/EntrySummary.vue |  4 ----
 src/pages/Entry/EntryFilter.vue       |  2 +-
 src/pages/Entry/EntryList.vue         | 14 +++++++-------
 src/pages/Entry/locale/en.yml         | 21 +++++++++++++++------
 src/pages/Entry/locale/es.yml         | 19 ++++++++++++++-----
 5 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 290f621e7..0704e9d67 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -12,9 +12,6 @@ import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.v
 import EntryBuys from './EntryBuys.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import VnToSummary from 'src/components/ui/VnToSummary.vue';
-import EntryDescriptorMenu from './EntryDescriptorMenu.vue';
-import VnRow from 'src/components/ui/VnRow.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -197,7 +194,6 @@ onMounted(async () => {
     }
 }
 </style>
-
 <i18n>
 es:
     Travel data: Datos envío
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index c258365ca..1b3a18762 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -171,7 +171,7 @@ const entryFilterPanel = ref();
                 <QItemSection>
                     <VnInput
                         v-model="params.reference"
-                        :label="t('entryFilter.filter.reference')"
+                        :label="t('entry.list.tableVisibleColumns.reference')"
                         is-outlined
                     />
                 </QItemSection>
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index e893e461f..aa35dd2d9 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -1,22 +1,22 @@
 <script setup>
 import axios from 'axios';
+import VnSection from 'src/components/common/VnSection.vue';
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { onBeforeMount } from 'vue';
 
 import EntryFilter from './EntryFilter.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import { toDate } from 'src/filters';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
+import { toDate } from 'src/filters';
 
 const { t } = useI18n();
 const tableRef = ref();
 const defaultEntry = ref({});
 const state = useState();
 const user = state.getUser();
+const dataKey = 'EntryList';
 
 const entryQueryFilter = {
     include: [
@@ -268,17 +268,17 @@ onBeforeMount(async () => {
         :array-data-props="{
             url: 'Entries/filter',
             order: 'id DESC',
-            userFilter: entryFilter,
+            userFilter: entryQueryFilter,
         }"
     >
         <template #advanced-menu>
-            <EntryFilter data-key="EntryList" />
+            <EntryFilter :data-key="dataKey" />
         </template>
-    </RightMenu>
+    </VnSection>
     <VnTable
         v-if="defaultEntry.defaultSupplierFk"
         ref="tableRef"
-        data-key="EntryList"
+        :data-key="dataKey"
         url="Entries/filter"
         :filter="entryQueryFilter"
         :create="{
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 97a3be32b..6a0023b17 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -2,15 +2,24 @@ entry:
     list:
         newEntry: New entry
         tableVisibleColumns:
-            created: Creation
-            supplierFk: Supplier
-            isBooked: Booked
-            isConfirmed: Confirmed
+            isExcludedFromAvailable: Exclude from inventory
             isOrdered: Ordered
+            isConfirmed: Ready to label
+            isReceived: Received
+            isRaid: Raid
+            landed: Date
+            supplierFk: Supplier
+            reference: Ref/Alb/Guide
+            invoiceNumber: Invoice
+            agencyModeId: Agency
+            isBooked: Booked
             companyFk: Company
-            travelFk: Travel
-            isExcludedFromAvailable: Inventory
+            evaNotes: Notes
+            warehouseOutFk: Origin
+            warehouseInFk: Destiny
+            entryTypeDescription: Entry type
             invoiceAmount: Import
+            travelFk: Travel
         inventoryEntry: Inventory entry
     summary:
         commission: Commission
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 993913417..a31327124 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -2,14 +2,23 @@ entry:
     list:
         newEntry: Nueva entrada
         tableVisibleColumns:
-            created: Creación
-            supplierFk: Proveedor
-            isBooked: Asentado
-            isConfirmed: Confirmado
+            isExcludedFromAvailable: Excluir del inventario
             isOrdered: Pedida
+            isConfirmed: Lista para etiquetar
+            isReceived: Recibida
+            isRaid: Redada
+            landed: Fecha
+            supplierFk: Proveedor
+            invoiceNumber: Nº Factura
+            reference: Ref/Alb/Guía
+            agencyModeId: Agencia
+            isBooked: Asentado
             companyFk: Empresa
             travelFk: Envio
-            isExcludedFromAvailable: Inventario
+            evaNotes: Notas
+            warehouseOutFk: Origen
+            warehouseInFk: Destino
+            entryTypeDescription: Tipo entrada
             invoiceAmount: Importe
         inventoryEntry: Es inventario
     summary: