From 5383df6946081a63bdd9dc34f251f99cf3d0bf6b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 30 Apr 2025 16:16:27 +0200
Subject: [PATCH] fix: refs #8388 changes

---
 src/components/VnTable/VnColumn.vue          |  4 ++--
 src/pages/Entry/EntryPreAccount.vue          | 12 +++++++++++-
 src/pages/InvoiceIn/Card/InvoiceInDueDay.vue |  8 +++-----
 src/pages/InvoiceIn/Card/InvoiceInVat.vue    | 18 +++++++++++-------
 src/pages/InvoiceIn/locale/en.yml            |  1 +
 src/pages/InvoiceIn/locale/es.yml            |  1 +
 6 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index ce7e3b1c6..565973e02 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -182,8 +182,8 @@ const col = computed(() => {
     if ($props.default && !newColumn.component) newColumn.component = $props.default;
 
     if (typeof newColumn.component !== 'string') {
-        newColumn.attrs = { ...newColumn.component.attrs, autofocus: $props.autofocus };
-        newColumn.event = { ...newColumn.component.event, ...$props?.eventHandlers };
+        newColumn.attrs = { ...newColumn.attrs, autofocus: $props.autofocus };
+        newColumn.event = { ...newColumn.event, ...$props?.eventHandlers };
     }
 
     return newColumn;
diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 45e871c7a..7b16a7886 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -1,5 +1,13 @@
 <script setup>
-import { ref, computed, markRaw, useTemplateRef, onBeforeMount, watch } from 'vue';
+import {
+    ref,
+    computed,
+    markRaw,
+    useTemplateRef,
+    onBeforeMount,
+    watch,
+    onUnmounted,
+} from 'vue';
 import { useI18n } from 'vue-i18n';
 import { toDate, toCurrency } from 'src/filters';
 import { useArrayData } from 'src/composables/useArrayData';
@@ -229,6 +237,8 @@ onBeforeMount(async () => {
     stateStore.leftDrawer = false;
 });
 
+onUnmounted(() => (stateStore.leftDrawer = true));
+
 watch(selectedRows, async (nVal, oVal) => {
     if (nVal.length > oVal.length && nVal.at(-1).invoiceInFk)
         quasar.dialog({
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index 5192ce471..9f2613623 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -7,10 +7,10 @@ import { useArrayData } from 'src/composables/useArrayData';
 import { getTotal } from 'src/composables/getTotal';
 import useNotify from 'src/composables/useNotify.js';
 import { toCurrency } from 'filters/index';
-import VnTable from 'src/components/VnTable/VnTable.vue'; 
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const route = useRoute();
-const { notify } = useNotify(); 
+const { notify } = useNotify();
 const { t } = useI18n();
 const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
@@ -84,9 +84,8 @@ const columns = computed(() => [
         tabIndex: 4,
         align: 'left',
         component: 'number',
-        isEditable: true,
+        isEditable: isNotEuro(currency.value),
         create: true,
-        disable: true,
     },
 ]);
 
@@ -132,7 +131,6 @@ onBeforeMount(async () => await setTaxableBase());
             :column-search="false"
             :disable-option="{ card: true }"
             class="q-pa-none"
-            
         >
             <template #column-footer-amount>
                 <QChip
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 6b55970d3..a0efba86a 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -103,9 +103,9 @@ const columns = computed(() => [
             filterOptions: ['id', 'vat'],
             'data-cy': 'vat-sageiva',
         },
-        format: (row) => {
-            const taxType = sageTaxTypes.value.find((t) => t.id === row.taxTypeSageFk);
-            return taxType ? `${taxType.id}: ${taxType.vat}` : row.taxTypeSageFk;
+        format: ({ taxTypeSageFk }, dashIfEmpty) => {
+            const taxType = sageTaxTypes.value.find((t) => t.id === taxTypeSageFk);
+            return taxType ? `${taxType.id}: ${taxType.vat}` : dashIfEmpty(taxTypeSageFk);
         },
         sortable: true,
         align: 'left',
@@ -122,13 +122,13 @@ const columns = computed(() => [
             optionLabel: (row) => `${row.id}: ${row.transaction}`,
             filterOptions: ['id', 'transaction'],
         },
-        format: (row, dashIfEmpty) => {
+        format: ({ transactionTypeSageFk }, dashIfEmpty) => {
             const transType = sageTransactionTypes.value.find(
-                (t) => t.id === row.transactionTypeSageFk,
+                (t) => t.id === transactionTypeSageFk,
             );
             return transType
                 ? `${transType.id}: ${transType.transaction}`
-                : dashIfEmpty(row.transactionTypeSageFk);
+                : dashIfEmpty(transactionTypeSageFk);
         },
         sortable: true,
         align: 'left',
@@ -149,7 +149,11 @@ const columns = computed(() => [
         sortable: true,
         align: 'left',
         create: true,
-        disable: !isNotEuro(currency.value),
+        isEditable: isNotEuro(currency.value),
+        cellEvent: {
+            'update:modelValue': async (value, oldValue, row) =>
+                await handleForeignValueUpdate(value, row),
+        },
     },
     {
         name: 'total',
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index a7a8d2469..018550715 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -69,4 +69,5 @@ invoiceIn:
         isBooked: Is booked
         account: Ledger account
         correctingFk: Rectificative
+        issued: Issued
     noMatch: No match with the vat({totalTaxableBase})
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index c593f5a08..7de984774 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -67,4 +67,5 @@ invoiceIn:
         isBooked: Contabilizada
         account: Cuenta contable
         correctingFk: Rectificativa
+        issued: Fecha de emisión
     noMatch: No cuadra con el iva({totalTaxableBase})