From ed4517183ee418d35ed2eccc452ece7f1275e81c Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 27 Jun 2024 14:02:45 +0200
Subject: [PATCH] refs #6897 fix trad, latestBuys

---
 src/i18n/locale/en.yml              |  8 ++++++++
 src/i18n/locale/es.yml              |  8 ++++++++
 src/pages/Entry/EntryLatestBuys.vue | 19 ++-----------------
 src/pages/Entry/EntryList.vue       | 16 ++++++++++++----
 4 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index fbab069663..6100e95285 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -322,6 +322,14 @@ entry:
         log: Log
         entryCreate: New entry
         latestBuys: Latest buys
+        tableVisibleColumns:
+            id: Id
+            reference: Reference
+            created: Creation
+            supplierFk: Supplier
+            isBooked: Booked
+            isConfirmed: Confirmed
+            isOrdered: Ordered
     list:
         newEntry: New entry
         landed: Landed
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index fec78d5e65..f845b17063 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -329,6 +329,14 @@ entry:
         booked: Asentado
         confirmed: Confirmado
         ordered: Pedida
+        tableVisibleColumns:
+            id: Id
+            reference: Referencia
+            created: Creación
+            supplierFk: Proveedor
+            isBooked: Asentado
+            isConfirmed: Confirmado
+            isOrdered: Pedida
     summary:
         commission: Comisión
         currency: Moneda
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 5da3309d8e..f70cd99a99 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -639,21 +639,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         auto-load
         @on-fetch="(data) => (intrastatOptions = data)"
     />
-    <VnSubToolbar>
-        <template #st-data>
-            <TableVisibleColumns
-                :all-columns="allColumnNames"
-                table-code="latestBuys"
-                labels-traductions-path="entry.latestBuys"
-                @on-config-saved="visibleColumns = ['picture', ...$event]"
-            />
-        </template>
-    </VnSubToolbar>
-    <RightMenu>
-        <template #right-panel>
-            <EntryLatestBuysFilter data-key="EntryLatestBuys" />
-        </template>
-    </RightMenu>
     <Teleport to="#actions-append">
         <div class="row q-gutter-x-sm">
             <QBtn flat @click="stateStore.toggleRightDrawer()" round dense icon="menu">
@@ -739,12 +724,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </QTd>
             </template>
         </QTable>
-        <QPageSticky v-if="rowsSelected.length > 0" :offset="[20, 20]">
+        <!-- <QPageSticky v-if="rowsSelected.length > 0" :offset="[20, 20]">
             <QBtn @click="openEditTableCellDialog()" color="primary" fab icon="edit" />
             <QTooltip>
                 {{ t('Edit buy(s)') }}
             </QTooltip>
-        </QPageSticky>
+        </QPageSticky> -->
         <QDialog ref="editTableCellDialogRef">
             <EditTableCellValueForm
                 edit-url="Buys/editLatestBuys"
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 715b4dcd24..1f59e7d782 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -9,6 +9,7 @@ import { useStateStore } from 'stores/useStateStore';
 import VnTable from 'components/VnTable/VnTable.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import { toDate } from 'src/filters';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -45,6 +46,10 @@ const columns = computed(() => [
         name: 'created',
         create: true,
         component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.created)),
     },
     {
         align: 'left',
@@ -56,6 +61,10 @@ const columns = computed(() => [
             url: 'suppliers',
             fields: ['id', 'name'],
         },
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.supplierName),
     },
     {
         align: 'left',
@@ -98,8 +107,8 @@ onMounted(async () => {
     <VnTable
         ref="tableRef"
         data-key="EntryList"
-        :url="`Entries`"
-        :url-create="`Entries`"
+        url="Entries/filter"
+        url-create="Entries"
         save-url="Entries/crud"
         :create="{
             urlCreate: 'Entries',
@@ -111,11 +120,10 @@ onMounted(async () => {
         }"
         order="id DESC"
         :columns="columns"
+        redirect="entry"
         default-mode="table"
         auto-load
         :right-search="false"
-        :is-editable="true"
-        :use-model="true"
     />
 </template>