From 1c594173fe0699ec4b97865c77aefe3181ab7e5f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 22 Apr 2025 18:18:42 +0200
Subject: [PATCH 01/43] feat(invoice): refs #8388 update tax calculations and
 improve date filtering logic

---
 src/pages/InvoiceIn/Card/InvoiceInDueDay.vue  | 8 +++++++-
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 1 +
 src/pages/InvoiceIn/Card/InvoiceInVat.vue     | 2 +-
 src/pages/InvoiceIn/InvoiceInToBook.vue       | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index 59bebcae2..62fa4be09 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -26,7 +26,12 @@ const invoiceId = +route.params.id;
 const filter = { where: { invoiceInFk: invoiceId } };
 const areRows = ref(false);
 const totalTaxableBase = ref();
-const noMatch = computed(() => totalAmount.value != totalTaxableBase.value);
+const totalVat = ref();
+const noMatch = computed(
+    () =>
+        totalAmount.value != totalTaxableBase.value &&
+        totalAmount.value != totalVat.value,
+);
 const columns = computed(() => [
     {
         name: 'duedate',
@@ -78,6 +83,7 @@ async function insert() {
 async function setTaxableBase() {
     const { data } = await axios.get(`InvoiceIns/${invoiceId}/getTotals`);
     totalTaxableBase.value = data.totalTaxableBase;
+    totalVat.value = data.totalVat;
 }
 
 onBeforeMount(async () => await setTaxableBase());
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 74936f00a..79c3c65ae 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -363,6 +363,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                             <QTd>{{ toCurrency(entity.totals.totalTaxableBase) }}</QTd>
                             <QTd></QTd>
                             <QTd></QTd>
+                            <QTd></QTd>
                             <QTd>{{ toCurrency(getTotalTax(entity.invoiceInTax)) }}</QTd>
                             <QTd>{{
                                 entity.totals.totalTaxableBaseForeignValue &&
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 61c3040ae..2c8392397 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -470,7 +470,7 @@ function setCursor(ref) {
             size="lg"
             v-shortcut="'+'"
             round
-            @click="invoiceInFormRef.insert()"
+            @click="invoiceInFormRef.insert({ isDeductible: true })"
         >
             <QTooltip>{{ t('Add tax') }}</QTooltip>
         </QBtn>
diff --git a/src/pages/InvoiceIn/InvoiceInToBook.vue b/src/pages/InvoiceIn/InvoiceInToBook.vue
index 28f54f040..a77777597 100644
--- a/src/pages/InvoiceIn/InvoiceInToBook.vue
+++ b/src/pages/InvoiceIn/InvoiceInToBook.vue
@@ -41,7 +41,7 @@ async function checkToBook(id) {
             params: {
                 where: JSON.stringify({
                     invoiceInFk: id,
-                    dueDated: { gte: Date.vnNew() },
+                    dueDated: { lte: Date.vnNew() },
                 }),
             },
         })

From 6c49c9ea82473818ca70d2770f2794b5b54abf79 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 23 Apr 2025 16:38:34 +0200
Subject: [PATCH 02/43] fix: refs #8388 update VnSelect component to handle
 option rendering based on optionLabel type

---
 src/components/common/VnSelect.vue            |   7 +-
 .../InvoiceIn/Card/InvoiceInIntrastat.vue     | 277 ++++++------------
 2 files changed, 96 insertions(+), 188 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 2cb72261f..9010c2e8d 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -407,7 +407,12 @@ function getCaption(opt) {
         </template>
         <template #option="{ opt, itemProps }">
             <QItem v-bind="itemProps">
-                <QItemSection v-if="typeof opt !== 'object'"> {{ opt }}</QItemSection>
+                <QItemSection v-if="typeof optionLabel === 'function'">{{
+                    optionLabel(opt)
+                }}</QItemSection>
+                <QItemSection v-else-if="typeof opt !== 'object'">
+                    {{ opt }}</QItemSection
+                >
                 <QItemSection v-else-if="opt[optionValue] == opt[optionLabel]">
                     <QItemLabel>{{ opt[optionLabel] }}</QItemLabel>
                 </QItemSection>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 6f8642313..3bc4031ed 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -3,71 +3,85 @@ import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { getTotal } from 'src/composables/getTotal';
-import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
-
 const route = useRoute();
-const invoceInIntrastat = ref([]);
 const rowsSelected = ref([]);
 const countries = ref([]);
 const intrastats = ref([]);
-const invoiceInFormRef = ref();
+const invoiceInIntrastatRef = ref();
 const invoiceInId = computed(() => +route.params.id);
-const filter = { where: { invoiceInFk: invoiceInId.value } };
+const filter = computed(() => ({ where: { invoiceInFk: invoiceInId.value } }));
 const columns = computed(() => [
     {
-        name: 'code',
+        name: 'intrastatFk',
         label: t('Code'),
-        field: (row) => row.intrastatFk,
-        options: intrastats.value,
-        model: 'intrastatFk',
-        optionValue: 'id',
-        optionLabel: (row) => `${row.id}: ${row.description}`,
-        sortable: true,
-        tabIndex: 1,
-        align: 'left',
+        component: 'select',
+        columnFilter: false,
+        attrs: {
+            options: intrastats.value,
+            optionValue: 'id',
+            optionLabel: (row) => `${row.id}: ${row.description}`,
+            'data-cy': 'intrastat-code',
+            sortBy: 'id',
+            fields: ['id', 'description'],
+        },
+        format: getCode,
+        create: true,
+        isEditable: true,
     },
     {
         name: 'amount',
         label: t('amount'),
-        field: (row) => row.amount,
-        sortable: true,
-        tabIndex: 2,
-        align: 'left',
+        component: 'number',
+        create: true,
+        isEditable: true,
+        columnFilter: false,
+        width: '30px',
     },
     {
         name: 'net',
         label: t('net'),
-        field: (row) => row.net,
-        sortable: true,
-        tabIndex: 3,
-        align: 'left',
+        component: 'number',
+        create: true,
+        isEditable: true,
+        columnFilter: false,
+        width: '30px',
     },
     {
         name: 'stems',
         label: t('stems'),
-        field: (row) => row.stems,
-        sortable: true,
-        tabIndex: 4,
-        align: 'left',
+        component: 'number',
+        create: true,
+        isEditable: true,
+        columnFilter: false,
+        width: '30px',
     },
     {
-        name: 'country',
+        name: 'countryFk',
         label: t('country'),
-        field: (row) => row.countryFk,
-        options: countries.value,
-        model: 'countryFk',
-        optionValue: 'id',
-        optionLabel: 'code',
-        sortable: true,
-        tabIndex: 5,
-        align: 'left',
+        component: 'select',
+        attrs: {
+            options: countries.value,
+            optionLabel: 'code',
+        },
+        create: true,
+        isEditable: true,
+        columnFilter: false,
+        width: '30px',
     },
 ]);
+
+const tableRows = computed(
+    () => invoiceInIntrastatRef.value?.CrudModelRef?.formData || [],
+);
+
+function getCode(row) {
+    const { id, description } = intrastats.value.find(({ id }) => id === row.intrastatFk);
+    return `${id}: ${description}`;
+}
 </script>
 <template>
     <FetchData
@@ -82,164 +96,51 @@ const columns = computed(() => [
         auto-load
         @on-fetch="(data) => (intrastats = data)"
     />
-    <div class="invoiceIn-intrastat">
-        <CrudModel
-            ref="invoiceInFormRef"
+    <div class="invoice-in-intrastat">
+        <VnTable
+            ref="invoiceInIntrastatRef"
             data-key="InvoiceInIntrastats"
             url="InvoiceInIntrastats"
+            save-url="InvoiceInIntrastats/crud"
+            search-url="InvoiceInIntrastats"
             auto-load
-            :data-required="{ invoiceInFk: invoiceInId }"
-            :filter="filter"
+            :filter
+            :user-filter
             v-model:selected="rowsSelected"
-            @on-fetch="(data) => (invoceInIntrastat = data)"
+            :columns
+            :is-editable="true"
+            :table="{ selection: 'multiple', 'row-key': '$index' }"
+            :create="{
+                urlCreate: 'InvoiceInIntrastats',
+                title: t('Create Intrastat Line'),
+                formInitialData: { invoiceInFk: invoiceInId },
+                onDataSaved: () => invoiceInIntrastatRef.reload(),
+            }"
+            footer
+            data-cy="invoice-in-intrastat-table"
+            :right-search="false"
+            :disable-option="{ card: true }"
         >
-            <template #body="{ rows }">
-                <QTable
-                    v-model:selected="rowsSelected"
-                    selection="multiple"
-                    :columns="columns"
-                    :rows="rows"
-                    row-key="$index"
-                    :grid="$q.screen.lt.sm"
-                >
-                    <template #body-cell="{ row, col }">
-                        <QTd>
-                            <VnInputNumber v-model="row[col.name]" />
-                        </QTd>
-                    </template>
-                    <template #body-cell-code="{ row, col }">
-                        <QTd>
-                            <VnSelect
-                                v-model="row[col.model]"
-                                :options="col.options"
-                                :option-value="col.optionValue"
-                                :option-label="col.optionLabel"
-                                :filter-options="['id', 'description']"
-                                data-cy="intrastat-code"
-                            >
-                                <template #option="scope">
-                                    <QItem v-bind="scope.itemProps">
-                                        {{ `${scope.opt.id}: ${scope.opt.description}` }}
-                                    </QItem>
-                                </template>
-                            </VnSelect>
-                        </QTd>
-                    </template>
-                    <template #body-cell-country="{ row, col }">
-                        <QTd>
-                            <VnSelect
-                                v-model="row[col.model]"
-                                :options="col.options"
-                                :option-value="col.optionValue"
-                                :option-label="col.optionLabel"
-                            />
-                        </QTd>
-                    </template>
-                    <template #bottom-row>
-                        <QTr class="bg">
-                            <QTd />
-                            <QTd />
-                            <QTd>
-                                {{ getTotal(rows, 'amount', { currency: 'default' }) }}
-                            </QTd>
-                            <QTd>
-                                {{ getTotal(rows, 'net') }}
-                            </QTd>
-                            <QTd>
-                                {{ getTotal(rows, 'stems', { decimalPlaces: 0 }) }}
-                            </QTd>
-                            <QTd />
-                        </QTr>
-                    </template>
-                    <template #item="props">
-                        <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
-                            <QCard>
-                                <QCardSection>
-                                    <QCheckbox v-model="props.selected" dense />
-                                </QCardSection>
-                                <QSeparator />
-                                <QList>
-                                    <QItem>
-                                        <VnSelect
-                                            :label="t('Code')"
-                                            class="full-width"
-                                            v-model="props.row['intrastatFk']"
-                                            :options="intrastats"
-                                            option-value="id"
-                                            :option-label="
-                                                (row) => `${row.id}:${row.description}`
-                                            "
-                                            :filter-options="['id', 'description']"
-                                        >
-                                            <template #option="scope">
-                                                <QItem v-bind="scope.itemProps">
-                                                    {{
-                                                        `${scope.opt.id}: ${scope.opt.description}`
-                                                    }}
-                                                </QItem>
-                                            </template>
-                                        </VnSelect>
-                                    </QItem>
-                                    <QItem
-                                        v-for="(value, index) of [
-                                            'amount',
-                                            'net',
-                                            'stems',
-                                        ]"
-                                        :key="index"
-                                    >
-                                        <VnInputNumber
-                                            :label="t(value)"
-                                            class="full-width"
-                                            v-model="props.row[value]"
-                                            clearable
-                                            clear-icon="close"
-                                        />
-                                    </QItem>
-                                    <QItem>
-                                        <VnSelect
-                                            :label="t('country')"
-                                            class="full-width"
-                                            v-model="props.row['countryFk']"
-                                            :options="countries"
-                                            option-value="id"
-                                            option-label="code"
-                                        />
-                                    </QItem>
-                                </QList>
-                            </QCard>
-                        </div>
-                    </template>
-                </QTable>
+            <template #column-footer-amount>
+                {{ getTotal(tableRows, 'amount', { currency: 'default' }) }}
             </template>
-        </CrudModel>
+            <template #column-footer-net>
+                {{ getTotal(tableRows, 'net') }}
+            </template>
+            <template #column-footer-stems>
+                {{ getTotal(tableRows, 'stems', { decimalPlaces: 0 }) }}
+            </template>
+        </VnTable>
     </div>
-    <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn
-            color="primary"
-            icon="add"
-            v-shortcut="'+'"
-            size="lg"
-            round
-            @click="invoiceInFormRef.insert()"
-        />
-    </QPageSticky>
 </template>
-<style lang="scss">
-.invoiceIn-intrastat {
-    > .q-card {
-        .vn-label-value {
-            display: flex;
-            gap: 1em;
-
-            .label {
-                flex: 1;
-            }
-            .value {
-                flex: 0.5;
-            }
-        }
-    }
+<style lang="scss" scoped>
+.invoice-in-intrastat {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+:deep(.full-width) {
+    max-width: 900px;
 }
 </style>
 <i18n>
@@ -248,6 +149,7 @@ const columns = computed(() => [
         net: Net
         stems: Stems
         country: Country
+        Create Intrastat Line: Create Intrastat Line
     es:
         Code: Código
         amount: Valor mercancía
@@ -257,4 +159,5 @@ const columns = computed(() => [
         Total amount: Total importe
         Total net: Total neto
         Total stems: Total tallos
+        Create Intrastat Line: Crear Línea Intrastat
 </i18n>

From 50cf47436cd0d277d04203a85ffe49ffc3eab81f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 23 Apr 2025 17:26:03 +0200
Subject: [PATCH 03/43] fix: refs #8388 update title for creating Intrastat
 line in InvoiceInIntrastat component

---
 src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 3bc4031ed..db728b526 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -112,7 +112,7 @@ function getCode(row) {
             :table="{ selection: 'multiple', 'row-key': '$index' }"
             :create="{
                 urlCreate: 'InvoiceInIntrastats',
-                title: t('Create Intrastat Line'),
+                title: t('Create Intrastat'),
                 formInitialData: { invoiceInFk: invoiceInId },
                 onDataSaved: () => invoiceInIntrastatRef.reload(),
             }"
@@ -149,7 +149,6 @@ function getCode(row) {
         net: Net
         stems: Stems
         country: Country
-        Create Intrastat Line: Create Intrastat Line
     es:
         Code: Código
         amount: Valor mercancía
@@ -159,5 +158,5 @@ function getCode(row) {
         Total amount: Total importe
         Total net: Total neto
         Total stems: Total tallos
-        Create Intrastat Line: Crear Línea Intrastat
+        Create Intrastat: Crear Intrastat
 </i18n>

From eb373f10b39671fc1dcb6a28e6355e6ffa786921 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 23 Apr 2025 18:29:53 +0200
Subject: [PATCH 04/43] fix: refs #8388 update VnTable integration in
 InvoiceInDueDay component and enhance input handling

---
 src/components/VnTable/VnTable.vue           |   1 +
 src/pages/InvoiceIn/Card/InvoiceInDueDay.vue | 288 +++++++------------
 2 files changed, 111 insertions(+), 178 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 7e9ab85cb..f1f26d706 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -432,6 +432,7 @@ async function renderInput(rowId, field, clickedElement) {
     const row = CrudModelRef.value.formData[rowId];
     const oldValue = CrudModelRef.value.formData[rowId][column?.name];
 
+    if (column.disable) return;
     if (!clickedElement)
         clickedElement = document.querySelector(
             `[data-row-index="${rowId}"][data-col-field="${field}"]`,
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index 62fa4be09..2346ee301 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -6,81 +6,107 @@ import axios from 'axios';
 import { toDate } from 'src/filters';
 import { useArrayData } from 'src/composables/useArrayData';
 import { getTotal } from 'src/composables/getTotal';
-import CrudModel from 'src/components/CrudModel.vue';
+// import CrudModel from 'src/components/CrudModel.vue'; // Removed CrudModel import
 import VnSelect from 'src/components/common/VnSelect.vue';
 import useNotify from 'src/composables/useNotify.js';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { toCurrency } from 'filters/index';
+import VnTable from 'src/components/VnTable/VnTable.vue'; // Added VnTable import
 
 const route = useRoute();
-const { notify } = useNotify();
+const { notify } = useNotify(); // Keep notify if used elsewhere, otherwise remove
 const { t } = useI18n();
 const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
 const currency = computed(() => invoiceIn.value?.currency?.code);
 
 const rowsSelected = ref([]);
-const invoiceInFormRef = ref();
+const invoiceInDueDayTableRef = ref(); // Renamed ref for VnTable
 const invoiceId = +route.params.id;
 const filter = { where: { invoiceInFk: invoiceId } };
 const areRows = ref(false);
 const totalTaxableBase = ref();
 const totalVat = ref();
+
+// Access formData from VnTable's internal CrudModelRef
+const tableRows = computed(
+    () => invoiceInDueDayTableRef.value?.CrudModelRef?.formData || [],
+);
+const totalAmount = computed(() => getTotal(tableRows.value, 'amount'));
+
 const noMatch = computed(
     () =>
         totalAmount.value != totalTaxableBase.value &&
         totalAmount.value != totalVat.value,
 );
+
 const columns = computed(() => [
     {
-        name: 'duedate',
+        name: 'dueDated',
         label: t('Date'),
-        field: (row) => toDate(row.dueDated),
         sortable: true,
         tabIndex: 1,
         align: 'left',
+        component: 'date',
+        isEditable: true,
+        create: true,
     },
     {
-        name: 'bank',
+        name: 'bankFk',
         label: t('Bank'),
-        field: (row) => row.bankFk,
-        model: 'bankFk',
-        optionLabel: 'bank',
-        url: 'Accountings',
         sortable: true,
         tabIndex: 2,
         align: 'left',
+        component: 'select',
+        attrs: {
+            url: 'Accountings',
+            optionLabel: 'bank',
+            optionValue: 'id',
+            fields: ['id', 'bank'],
+            'emit-value': true,
+        },
+        format: ({ bank }) => bank?.bank,
+        isEditable: true,
+        create: true,
     },
     {
         name: 'amount',
         label: t('Amount'),
-        field: (row) => row.amount,
         sortable: true,
         tabIndex: 3,
         align: 'left',
+        component: 'number',
+        attrs: {
+            clearable: true,
+            'clear-icon': 'close',
+        },
+        isEditable: true,
+        create: true,
     },
     {
-        name: 'foreignvalue',
+        name: 'foreignValue',
         label: t('Foreign value'),
-        field: (row) => row.foreignValue,
         sortable: true,
         tabIndex: 4,
         align: 'left',
+        component: 'number',
+        isEditable: true,
+        create: true,
+        disable: true,
     },
 ]);
 
-const totalAmount = computed(() => getTotal(invoiceInFormRef.value.formData, 'amount'));
-
 const isNotEuro = (code) => code != 'EUR';
 
 async function insert() {
     await axios.post('/InvoiceInDueDays/new', { id: +invoiceId });
-    await invoiceInFormRef.value.reload();
+    await invoiceInDueDayTableRef.value.reload();
     notify(t('globals.dataSaved'), 'positive');
 }
-
 async function setTaxableBase() {
+    const ref = invoiceInDueDayTableRef.value;
+    if (ref) ref.create = null;
     const { data } = await axios.get(`InvoiceIns/${invoiceId}/getTotals`);
     totalTaxableBase.value = data.totalTaxableBase;
     totalVat.value = data.totalVat;
@@ -89,189 +115,93 @@ async function setTaxableBase() {
 onBeforeMount(async () => await setTaxableBase());
 </script>
 <template>
-    <CrudModel
+    <VnTable
         v-if="invoiceIn"
-        ref="invoiceInFormRef"
+        ref="invoiceInDueDayTableRef"
         data-key="InvoiceInDueDays"
         url="InvoiceInDueDays"
+        save-url="InvoiceInDueDays/crud"
         :filter="filter"
+        :user-filter="{
+            include: { relation: 'bank', scope: { fields: ['id', 'bank'] } },
+        }"
         auto-load
         :data-required="{ invoiceInFk: invoiceId }"
         v-model:selected="rowsSelected"
         @on-fetch="(data) => (areRows = !!data.length)"
         @save-changes="setTaxableBase"
+        :columns="columns"
+        :is-editable="true"
+        :table="{ selection: 'multiple', 'row-key': '$index' }"
+        footer
+        :right-search="false"
+        :column-search="false"
+        :disable-option="{ card: true }"
+        class="q-pa-none"
     >
-        <template #body="{ rows }">
-            <QTable
-                v-model:selected="rowsSelected"
-                selection="multiple"
-                :columns
-                :rows
-                row-key="$index"
-                :grid="$q.screen.lt.sm"
+        <!-- <template #column-foreignValue="{ row }">
+            <VnInputNumber
+                :class="{
+                    'no-pointer-events': !isNotEuro(currency),
+                }"
+                :disable="!isNotEuro(currency)"
+                v-model="row.foreignValue"
+                dense
+                borderless
+                hide-bottom-space
+            />
+        </template> -->
+        <template #column-footer-amount>
+            <QChip
+                dense
+                :color="noMatch ? 'negative' : 'transparent'"
+                class="q-pa-xs"
+                :title="noMatch ? t('invoiceIn.noMatch', { totalTaxableBase }) : ''"
             >
-                <template #body-cell-duedate="{ row }">
-                    <QTd>
-                        <VnInputDate v-model="row.dueDated" />
-                    </QTd>
-                </template>
-                <template #body-cell-bank="{ row, col }">
-                    <QTd>
-                        <VnSelect
-                            v-model="row[col.model]"
-                            :url="col.url"
-                            :option-label="col.optionLabel"
-                            :option-value="col.optionValue"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{
-                                            `${scope.opt.id}: ${scope.opt.bank}`
-                                        }}</QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </QTd>
-                </template>
-                <template #body-cell-amount="{ row }">
-                    <QTd>
-                        <VnInputNumber
-                            v-model="row.amount"
-                            :is-outlined="false"
-                            clearable
-                            clear-icon="close"
-                        />
-                    </QTd>
-                </template>
-                <template #body-cell-foreignvalue="{ row }">
-                    <QTd>
-                        <VnInputNumber
-                            :class="{
-                                'no-pointer-events': !isNotEuro(currency),
-                            }"
-                            :disable="!isNotEuro(currency)"
-                            v-model="row.foreignValue"
-                        />
-                    </QTd>
-                </template>
-                <template #bottom-row>
-                    <QTr class="bg">
-                        <QTd />
-                        <QTd />
-                        <QTd />
-                        <QTd>
-                            <QChip
-                                dense
-                                :color="noMatch ? 'negative' : 'transparent'"
-                                class="q-pa-xs"
-                                :title="
-                                    noMatch
-                                        ? t('invoiceIn.noMatch', { totalTaxableBase })
-                                        : ''
-                                "
-                            >
-                                {{ toCurrency(totalAmount) }}
-                            </QChip>
-                        </QTd>
-                        <QTd>
-                            <template v-if="isNotEuro(invoiceIn.currency.code)">
-                                {{
-                                    getTotal(rows, 'foreignValue', {
-                                        currency: invoiceIn.currency.code,
-                                    })
-                                }}
-                            </template>
-                        </QTd>
-                    </QTr>
-                </template>
-                <template #item="props">
-                    <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
-                        <QCard>
-                            <QCardSection>
-                                <QCheckbox v-model="props.selected" dense />
-                            </QCardSection>
-                            <QSeparator />
-                            <QList>
-                                <QItem>
-                                    <VnInputDate
-                                        class="full-width"
-                                        :label="t('Date')"
-                                        v-model="props.row.dueDated"
-                                    />
-                                </QItem>
-                                <QItem>
-                                    <VnSelect
-                                        :label="t('Bank')"
-                                        class="full-width"
-                                        v-model="props.row['bankFk']"
-                                        url="Accountings"
-                                        option-label="bank"
-                                    >
-                                        <template #option="scope">
-                                            <QItem v-bind="scope.itemProps">
-                                                <QItemSection>
-                                                    <QItemLabel>{{
-                                                        `${scope.opt.id}: ${scope.opt.bank}`
-                                                    }}</QItemLabel>
-                                                </QItemSection>
-                                            </QItem>
-                                        </template>
-                                    </VnSelect>
-                                </QItem>
-                                <QItem>
-                                    <VnInputNumber
-                                        :label="t('Amount')"
-                                        class="full-width"
-                                        v-model="props.row.amount"
-                                    />
-                                </QItem>
-                                <QItem>
-                                    <VnInputNumber
-                                        :label="t('Foreign value')"
-                                        class="full-width"
-                                        :class="{
-                                            'no-pointer-events': !isNotEuro(currency),
-                                        }"
-                                        :disable="!isNotEuro(currency)"
-                                        v-model="props.row.foreignValue"
-                                        clearable
-                                        clear-icon="close"
-                                    />
-                                </QItem>
-                            </QList>
-                        </QCard>
-                    </div>
-                </template>
-            </QTable>
+                {{ toCurrency(totalAmount) }}
+            </QChip>
         </template>
-    </CrudModel>
-    <QPageSticky position="bottom-right" :offset="[25, 25]">
+        <template #column-footer-foreignValue>
+            <template v-if="isNotEuro(currency)">
+                {{
+                    getTotal(tableRows, 'foreignValue', {
+                        currency: currency,
+                    })
+                }}
+            </template>
+        </template>
+    </VnTable>
+    <QPageSticky :offset="[20, 20]" style="z-index: 2">
         <QBtn
-            color="primary"
-            icon="add"
-            v-shortcut="'+'"
-            size="lg"
-            round
             @click="
                 () => {
-                    if (!areRows) insert();
-                    else
-                        invoiceInFormRef.insert({
-                            amount: (totalTaxableBase - totalAmount).toFixed(2),
+                    if (!areRows) return insert();
+
+                    invoiceInDueDayTableRef.create = {
+                        urlCreate: 'InvoiceInDueDays',
+                        onDataSaved: () => invoiceInDueDayTableRef.reload(),
+                        title: t('Create due day'),
+                        formInitialData: {
                             invoiceInFk: invoiceId,
-                        });
+                            dueDated: Date.vnNew(),
+                            amount: (totalTaxableBase - totalAmount).toFixed(2),
+                        },
+                    };
+                    invoiceInDueDayTableRef.showForm = true;
                 }
             "
+            color="primary"
+            fab
+            icon="add"
+            v-shortcut="'+'"
+            data-cy="invoiceInDueDayAdd"
         />
+        <QTooltip class="text-no-wrap">
+            {{ t('Create due day') }}
+        </QTooltip>
     </QPageSticky>
 </template>
 <style lang="scss" scoped>
-.bg {
-    background-color: var(--vn-light-gray);
-}
-
 .q-chip {
     color: var(--vn-text-color);
 }
@@ -282,4 +212,6 @@ onBeforeMount(async () => await setTaxableBase());
         Bank: Caja
         Amount: Importe
         Foreign value: Divisa
+        invoiceIn.noMatch: El total {totalTaxableBase} no coincide con el importe
+        Create due day: Crear Vencimiento
 </i18n>

From 10548a00d2fbe544801903b35a5c757e7c3b6f57 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 23 Apr 2025 18:32:36 +0200
Subject: [PATCH 05/43] fix: refs #8388 update layout

---
 src/pages/InvoiceIn/Card/InvoiceInDueDay.vue | 165 +++++++++----------
 1 file changed, 82 insertions(+), 83 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index 2346ee301..f4278e19a 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -115,96 +115,95 @@ async function setTaxableBase() {
 onBeforeMount(async () => await setTaxableBase());
 </script>
 <template>
-    <VnTable
-        v-if="invoiceIn"
-        ref="invoiceInDueDayTableRef"
-        data-key="InvoiceInDueDays"
-        url="InvoiceInDueDays"
-        save-url="InvoiceInDueDays/crud"
-        :filter="filter"
-        :user-filter="{
-            include: { relation: 'bank', scope: { fields: ['id', 'bank'] } },
-        }"
-        auto-load
-        :data-required="{ invoiceInFk: invoiceId }"
-        v-model:selected="rowsSelected"
-        @on-fetch="(data) => (areRows = !!data.length)"
-        @save-changes="setTaxableBase"
-        :columns="columns"
-        :is-editable="true"
-        :table="{ selection: 'multiple', 'row-key': '$index' }"
-        footer
-        :right-search="false"
-        :column-search="false"
-        :disable-option="{ card: true }"
-        class="q-pa-none"
-    >
-        <!-- <template #column-foreignValue="{ row }">
-            <VnInputNumber
-                :class="{
-                    'no-pointer-events': !isNotEuro(currency),
-                }"
-                :disable="!isNotEuro(currency)"
-                v-model="row.foreignValue"
-                dense
-                borderless
-                hide-bottom-space
-            />
-        </template> -->
-        <template #column-footer-amount>
-            <QChip
-                dense
-                :color="noMatch ? 'negative' : 'transparent'"
-                class="q-pa-xs"
-                :title="noMatch ? t('invoiceIn.noMatch', { totalTaxableBase }) : ''"
-            >
-                {{ toCurrency(totalAmount) }}
-            </QChip>
-        </template>
-        <template #column-footer-foreignValue>
-            <template v-if="isNotEuro(currency)">
-                {{
-                    getTotal(tableRows, 'foreignValue', {
-                        currency: currency,
-                    })
-                }}
+    <div class="invoice-in-due-day">
+        <VnTable
+            v-if="invoiceIn"
+            ref="invoiceInDueDayTableRef"
+            data-key="InvoiceInDueDays"
+            url="InvoiceInDueDays"
+            save-url="InvoiceInDueDays/crud"
+            :filter="filter"
+            :user-filter="{
+                include: { relation: 'bank', scope: { fields: ['id', 'bank'] } },
+            }"
+            auto-load
+            :data-required="{ invoiceInFk: invoiceId }"
+            v-model:selected="rowsSelected"
+            @on-fetch="(data) => (areRows = !!data.length)"
+            @save-changes="setTaxableBase"
+            :columns="columns"
+            :is-editable="true"
+            :table="{ selection: 'multiple', 'row-key': '$index' }"
+            footer
+            :right-search="false"
+            :column-search="false"
+            :disable-option="{ card: true }"
+            class="q-pa-none"
+        >
+            <template #column-footer-amount>
+                <QChip
+                    dense
+                    :color="noMatch ? 'negative' : 'transparent'"
+                    class="q-pa-xs"
+                    :title="noMatch ? t('invoiceIn.noMatch', { totalTaxableBase }) : ''"
+                >
+                    {{ toCurrency(totalAmount) }}
+                </QChip>
             </template>
-        </template>
-    </VnTable>
-    <QPageSticky :offset="[20, 20]" style="z-index: 2">
-        <QBtn
-            @click="
-                () => {
-                    if (!areRows) return insert();
+            <template #column-footer-foreignValue>
+                <template v-if="isNotEuro(currency)">
+                    {{
+                        getTotal(tableRows, 'foreignValue', {
+                            currency: currency,
+                        })
+                    }}
+                </template>
+            </template>
+        </VnTable>
+        <QPageSticky :offset="[20, 20]" style="z-index: 2">
+            <QBtn
+                @click="
+                    () => {
+                        if (!areRows) return insert();
 
-                    invoiceInDueDayTableRef.create = {
-                        urlCreate: 'InvoiceInDueDays',
-                        onDataSaved: () => invoiceInDueDayTableRef.reload(),
-                        title: t('Create due day'),
-                        formInitialData: {
-                            invoiceInFk: invoiceId,
-                            dueDated: Date.vnNew(),
-                            amount: (totalTaxableBase - totalAmount).toFixed(2),
-                        },
-                    };
-                    invoiceInDueDayTableRef.showForm = true;
-                }
-            "
-            color="primary"
-            fab
-            icon="add"
-            v-shortcut="'+'"
-            data-cy="invoiceInDueDayAdd"
-        />
-        <QTooltip class="text-no-wrap">
-            {{ t('Create due day') }}
-        </QTooltip>
-    </QPageSticky>
+                        invoiceInDueDayTableRef.create = {
+                            urlCreate: 'InvoiceInDueDays',
+                            onDataSaved: () => invoiceInDueDayTableRef.reload(),
+                            title: t('Create due day'),
+                            formInitialData: {
+                                invoiceInFk: invoiceId,
+                                dueDated: Date.vnNew(),
+                                amount: (totalTaxableBase - totalAmount).toFixed(2),
+                            },
+                        };
+                        invoiceInDueDayTableRef.showForm = true;
+                    }
+                "
+                color="primary"
+                fab
+                icon="add"
+                v-shortcut="'+'"
+                data-cy="invoiceInDueDayAdd"
+            />
+            <QTooltip class="text-no-wrap">
+                {{ t('Create due day') }}
+            </QTooltip>
+        </QPageSticky>
+    </div>
 </template>
 <style lang="scss" scoped>
 .q-chip {
     color: var(--vn-text-color);
 }
+
+.invoice-in-due-day {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+}
+:deep(.full-width) {
+    max-width: 900px;
+}
 </style>
 <i18n>
     es:

From 92a282d71ccc3bac29389183c58d18f7fd8228f3 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 24 Apr 2025 17:05:00 +0200
Subject: [PATCH 06/43] refactor: refs #8388 clean up imports and improve
 variable naming in InvoiceInDueDay.vue

---
 src/pages/InvoiceIn/Card/InvoiceInDueDay.vue | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index f4278e19a..5192ce471 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -3,33 +3,26 @@ import { ref, computed, onBeforeMount } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
-import { toDate } from 'src/filters';
 import { useArrayData } from 'src/composables/useArrayData';
 import { getTotal } from 'src/composables/getTotal';
-// import CrudModel from 'src/components/CrudModel.vue'; // Removed CrudModel import
-import VnSelect from 'src/components/common/VnSelect.vue';
 import useNotify from 'src/composables/useNotify.js';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { toCurrency } from 'filters/index';
-import VnTable from 'src/components/VnTable/VnTable.vue'; // Added VnTable import
+import VnTable from 'src/components/VnTable/VnTable.vue'; 
 
 const route = useRoute();
-const { notify } = useNotify(); // Keep notify if used elsewhere, otherwise remove
+const { notify } = useNotify(); 
 const { t } = useI18n();
 const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
 const currency = computed(() => invoiceIn.value?.currency?.code);
-
 const rowsSelected = ref([]);
-const invoiceInDueDayTableRef = ref(); // Renamed ref for VnTable
+const invoiceInDueDayTableRef = ref();
 const invoiceId = +route.params.id;
 const filter = { where: { invoiceInFk: invoiceId } };
 const areRows = ref(false);
 const totalTaxableBase = ref();
 const totalVat = ref();
 
-// Access formData from VnTable's internal CrudModelRef
 const tableRows = computed(
     () => invoiceInDueDayTableRef.value?.CrudModelRef?.formData || [],
 );
@@ -139,6 +132,7 @@ onBeforeMount(async () => await setTaxableBase());
             :column-search="false"
             :disable-option="{ card: true }"
             class="q-pa-none"
+            
         >
             <template #column-footer-amount>
                 <QChip

From ce8127b7232aa38003453284e584a0b5f34d21fc Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 24 Apr 2025 17:25:21 +0200
Subject: [PATCH 07/43] feat: refs #8388 save & continue onEnter

---
 src/components/FormModel.vue | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 43a792845..93f28d06e 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -247,6 +247,7 @@ async function save() {
             res: response?.data,
             old: originalData.value,
         });
+        if ($props.goTo) return push({ path: $props.goTo });
         if ($props.reload) await arrayData.fetch({});
         hasChanges.value = false;
     } finally {
@@ -254,11 +255,6 @@ async function save() {
     }
 }
 
-async function saveAndGo() {
-    await save();
-    push({ path: $props.goTo });
-}
-
 function reset() {
     formData.value = JSON.parse(JSON.stringify(originalData.value));
     updateAndEmit('onFetch', { val: originalData.value });
@@ -379,7 +375,7 @@ defineExpose({
             <QBtnDropdown
                 data-cy="saveAndContinueDefaultBtn"
                 v-if="$props.goTo"
-                @click="saveAndGo"
+                @click="submitForm"
                 :label="tMobile('globals.saveAndContinue')"
                 :title="t('globals.saveAndContinue')"
                 :disable="!hasChanges"
@@ -391,7 +387,7 @@ defineExpose({
                     <QItem
                         clickable
                         v-close-popup
-                        @click="save"
+                        @click="submitForm"
                         :title="t('globals.save')"
                     >
                         <QItemSection>

From dd3a7c775573de222b36749a687288308d5378d1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 25 Apr 2025 12:44:50 +0200
Subject: [PATCH 08/43] refactor: refs #8388 reorganize variable declarations
 and improve DMS handling in EntryPreAccount.vue

---
 src/pages/Entry/EntryPreAccount.vue | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 26683b6f4..8aee40236 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -27,8 +27,6 @@ const user = useState().getUser();
 const stateStore = useStateStore();
 const updateDialog = ref();
 const uploadDialog = ref();
-let maxDays;
-let defaultDays;
 const dataKey = 'entryPreaccountingFilter';
 const url = 'Entries/preAccountingFilter';
 const arrayData = useArrayData(dataKey);
@@ -45,12 +43,16 @@ const defaultDmsDescription = ref();
 const dmsTypeId = ref();
 const selectedRows = ref([]);
 const totalAmount = ref();
+const hasDiferentDms = ref(false);
+let maxDays;
+let defaultDays;
+let supplierRef;
+let dmsFk;
 const totalSelectedAmount = computed(() => {
     if (!selectedRows.value.length) return 0;
     return selectedRows.value.reduce((acc, entry) => acc + entry.amount, 0);
 });
-let supplierRef;
-let dmsFk;
+
 const columns = computed(() => [
     {
         name: 'id',
@@ -238,8 +240,14 @@ function filterByDaysAgo(val) {
 async function preAccount() {
     const entries = selectedRows.value;
     const { companyFk, isAgricultural, landed } = entries.at(0);
+    supplierRef = null;
+    dmsFk = undefined;
+    hasDiferentDms.value = false;
     try {
-        dmsFk = entries.find(({ gestDocFk }) => gestDocFk)?.gestDocFk;
+        entries.forEach(({ gestDocFk }) => {
+            if (!dmsFk) dmsFk = gestDocFk;
+            if (gestDocFk && dmsFk && dmsFk !== gestDocFk) hasDiferentDms.value = true;
+        });
         if (isAgricultural) {
             const year = new Date(landed).getFullYear();
             supplierRef = (
@@ -296,8 +304,6 @@ async function createInvoice() {
     } catch (e) {
         throw e;
     } finally {
-        supplierRef = null;
-        dmsFk = undefined;
         selectedRows.value.length = 0;
         table.value.reload();
     }
@@ -358,6 +364,7 @@ async function createInvoice() {
         :search-remove-params="false"
     />
     <VnTable
+        v-if="isBooked !== undefined && daysAgo !== undefined"
         v-model:selected="selectedRows"
         :data-key
         :columns
@@ -376,7 +383,6 @@ async function createInvoice() {
         @on-fetch="
             (data) => (totalAmount = data?.reduce((acc, entry) => acc + entry.amount, 0))
         "
-        auto-load
     >
         <template #top-left>
             <QBtn
@@ -436,6 +442,11 @@ async function createInvoice() {
         :title="t('entry.preAccount.dialog.title')"
         :message="t('entry.preAccount.dialog.message')"
     >
+        <template #customHTML v-if="hasDiferentDms">
+            <p class="text-negative">
+                {{ t('differentGestdoc') }}
+            </p>
+        </template>
         <template #actions>
             <QBtn
                 data-cy="updateFileYes"
@@ -470,9 +481,11 @@ en:
     IntraCommunity: Intra-community
     NonCommunity: Non-community
     CanaryIslands: Canary Islands
+    differentGestdoc: The entries have different gestdoc
 es:
     IntraCommunity: Intracomunitaria
     NonCommunity: Extracomunitaria
     CanaryIslands: Islas Canarias
     National: Nacional
+    differentGestdoc: Las entradas tienen diferentes gestdoc
 </i18n>

From b63ae451218291b0cc808a25a4453ce4da8bcdef Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 28 Apr 2025 13:30:17 +0200
Subject: [PATCH 09/43] feat: refs #8388 update selection handling

---
 src/components/VnTable/VnTable.vue  | 18 ++++++++++++++++--
 src/pages/Entry/EntryPreAccount.vue | 13 +++++++++----
 src/pages/Entry/locale/en.yml       |  2 +-
 src/pages/Entry/locale/es.yml       |  2 +-
 4 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index d27bb561f..6cf04f2d9 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -149,6 +149,10 @@ const $props = defineProps({
         type: String,
         default: 'vnTable',
     },
+    selectionFn: {
+        type: Function,
+        default: null,
+    },
 });
 
 const { t } = useI18n();
@@ -647,7 +651,9 @@ const rowCtrlClickFunction = computed(() => {
 });
 const handleMultiCheck = (value) => {
     if (value) {
-        selected.value = tableRef.value.rows;
+        const fn = $props.selectionFn;
+        const rows = tableRef.value.rows;
+        selected.value = fn ? fn(rows) : rows;
     } else {
         selected.value = [];
     }
@@ -719,7 +725,15 @@ const handleSelectedAll = (data) => {
                 :virtual-scroll="isTableMode"
                 @virtual-scroll="onVirtualScroll"
                 @row-click="(event, row) => handleRowClick(event, row)"
-                @update:selected="emit('update:selected', $event)"
+                @update:selected="
+                    (evt) => {
+                        if ($props.selectionFn) selected = $props.selectionFn(evt);
+                        emit(
+                            'update:selected',
+                            selectionFn ? selectionFn(selected) : selected,
+                        );
+                    }
+                "
                 @selection="(details) => handleSelection(details, rows)"
                 :hide-selected-banner="true"
                 :data-cy
diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 8aee40236..5e1cda395 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -65,6 +65,7 @@ const columns = computed(() => [
     {
         name: 'invoiceNumber',
         label: t('entry.preAccount.invoiceNumber'),
+        width: 'max-content',
     },
     {
         name: 'company',
@@ -75,6 +76,7 @@ const columns = computed(() => [
             optionLabel: 'code',
             options: companies.value,
         },
+        class: 'shrink',
     },
     {
         name: 'warehouse',
@@ -103,6 +105,7 @@ const columns = computed(() => [
     {
         name: 'reference',
         label: t('entry.preAccount.reference'),
+        width: 'max-content',
     },
     {
         name: 'shipped',
@@ -137,6 +140,7 @@ const columns = computed(() => [
             class: 'fit',
             event: 'update',
         },
+        width: 'max-content',
     },
     {
         name: 'country',
@@ -146,6 +150,7 @@ const columns = computed(() => [
             name: 'countryFk',
             options: countries.value,
         },
+        class: 'shrink',
     },
     {
         name: 'description',
@@ -166,6 +171,7 @@ const columns = computed(() => [
             component: 'number',
             name: 'payDem',
         },
+        class: 'shrink',
     },
     {
         name: 'fiscalCode',
@@ -219,10 +225,8 @@ onBeforeMount(async () => {
     stateStore.leftDrawer = false;
 });
 
-watch(selectedRows, (nVal, oVal) => {
-    const lastRow = nVal.at(-1);
-    if (lastRow?.isBooked) selectedRows.value.pop();
-    if (nVal.length > oVal.length && lastRow.invoiceInFk)
+watch(selectedRows, async (nVal, oVal) => {
+    if (nVal.length > oVal.length && nVal.at(-1).invoiceInFk)
         quasar.dialog({
             component: VnConfirm,
             componentProps: { title: t('entry.preAccount.hasInvoice') },
@@ -383,6 +387,7 @@ async function createInvoice() {
         @on-fetch="
             (data) => (totalAmount = data?.reduce((acc, entry) => acc + entry.amount, 0))
         "
+        :selection-fn="(rows) => rows.filter((row) => !row.isBooked)"
     >
         <template #top-left>
             <QBtn
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 3c0f078fe..51e2a62e5 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -130,7 +130,7 @@ entry:
         supplierFk: Supplier
         country: Country
         description: Entry type
-        payDem: Payment term
+        payDem: P. term
         isBooked: B
         isReceived: R
         entryType: Entry type
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 0addbca94..5b1c19dfa 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -81,7 +81,7 @@ entry:
         supplierFk: Proveedor
         country: País
         description: Tipo de Entrada
-        payDem: Plazo de pago
+        payDem: P. pago
         isBooked: C
         isReceived: R
         entryType: Tipo de entrada

From da02cc3622a307eda7f3bff2b607e0bd0e747c4d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 28 Apr 2025 15:04:20 +0200
Subject: [PATCH 10/43] feat: refs #8388 add VnSelectExpense component and
 integrate it into InvoiceInVat.vue

---
 src/components/VnTable/VnColumn.vue       |   5 +
 src/components/common/VnSelectExpense.vue |  49 ++
 src/pages/InvoiceIn/Card/InvoiceInVat.vue | 531 ++++++----------------
 3 files changed, 181 insertions(+), 404 deletions(-)
 create mode 100644 src/components/common/VnSelectExpense.vue

diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index 3ce62c5de..ce7e3b1c6 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -181,6 +181,11 @@ const col = computed(() => {
         newColumn.component = 'checkbox';
     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 };
+    }
+
     return newColumn;
 });
 
diff --git a/src/components/common/VnSelectExpense.vue b/src/components/common/VnSelectExpense.vue
new file mode 100644
index 000000000..406715b84
--- /dev/null
+++ b/src/components/common/VnSelectExpense.vue
@@ -0,0 +1,49 @@
+<script setup>
+import { ref, useTemplateRef } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
+import VnSelectDialog from './VnSelectDialog.vue';
+import CreateNewExpenseForm from '../CreateNewExpenseForm.vue';
+import FetchData from '../FetchData.vue';
+
+const model = defineModel({ type: [String, Number, Object] });
+const { t } = useI18n();
+const expenses = ref([]);
+const selectDialogRef = useTemplateRef('selectDialogRef');
+
+async function autocompleteExpense(evt) {
+    const val = evt.target.value;
+    if (!val || isNaN(val)) return;
+    const lookup = expenses.value.find(({ id }) => id == useAccountShortToStandard(val));
+    if (selectDialogRef.value)
+        selectDialogRef.value.vnSelectDialogRef.vnSelectRef.toggleOption(lookup);
+}
+</script>
+<template>
+    <VnSelectDialog
+        v-bind="$attrs"
+        ref="selectDialogRef"
+        v-model="model"
+        :options="expenses"
+        option-value="id"
+        :option-label="(x) => `${x.id}: ${x.name}`"
+        :filter-options="['id', 'name']"
+        :tooltip="t('Create a new expense')"
+        :acls="[{ model: 'Expense', props: '*', accessType: 'WRITE' }]"
+        @keydown.tab.prevent="autocompleteExpense"
+    >
+        <template #form>
+            <CreateNewExpenseForm @on-data-saved="$refs.expensesRef.fetch()" />
+        </template>
+    </VnSelectDialog>
+    <FetchData
+        ref="expensesRef"
+        url="Expenses"
+        auto-load
+        @on-fetch="(data) => (expenses = data)"
+    />
+</template>
+<i18n>
+es:
+    Create a new expense: Crear nuevo gasto
+</i18n>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 2c8392397..aa9c671d9 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -1,21 +1,16 @@
 <script setup>
-import { ref, computed, nextTick } from 'vue';
+import { ref, computed, markRaw } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import { getTotal } from 'src/composables/getTotal';
 import { toCurrency } from 'src/filters';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import CrudModel from 'src/components/CrudModel.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CreateNewExpenseForm from 'src/components/CreateNewExpenseForm.vue';
 import { getExchange } from 'src/composables/getExchange';
-import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import VnSelectExpense from 'src/components/common/VnSelectExpense.vue';
 
 const { t } = useI18n();
-
 const arrayData = useArrayData();
 const route = useRoute();
 const invoiceIn = computed(() => arrayData.store.data);
@@ -24,100 +19,142 @@ const expenses = ref([]);
 const sageTaxTypes = ref([]);
 const sageTransactionTypes = ref([]);
 const rowsSelected = ref([]);
-const invoiceInFormRef = ref();
+const invoiceInVatTableRef = ref();
 
-defineProps({
-    actionIcon: {
-        type: String,
-        default: 'add',
-    },
-});
+defineProps({ actionIcon: { type: String, default: 'add' } });
+
+function taxRate(invoiceInTax) {
+    const sageTaxTypeId = invoiceInTax.taxTypeSageFk;
+    const taxRateSelection = sageTaxTypes.value.find(
+        (transaction) => transaction.id == sageTaxTypeId,
+    );
+    const taxTypeSage = taxRateSelection?.rate ?? 0;
+    const taxableBase = invoiceInTax?.taxableBase ?? 0;
+
+    return (taxTypeSage / 100) * taxableBase;
+}
 
 const columns = computed(() => [
     {
-        name: 'expense',
+        name: 'expenseFk',
         label: t('Expense'),
-        field: (row) => row.expenseFk,
-        options: expenses.value,
-        model: 'expenseFk',
-        optionValue: 'id',
-        optionLabel: (row) => `${row.id}: ${row.name}`,
+        component: markRaw(VnSelectExpense),
+        format: (row) => {
+            const expense = expenses.value.find((e) => e.id === row.expenseFk);
+            return expense ? `${expense.id}: ${expense.name}` : row.expenseFk;
+        },
         sortable: true,
         align: 'left',
+        isEditable: true,
+        create: true,
+        width: '250px',
     },
     {
-        name: 'taxablebase',
+        name: 'taxableBase',
         label: t('Taxable base'),
-        field: (row) => row.taxableBase,
-        model: 'taxableBase',
+        component: 'number',
+        attrs: {
+            clearable: true,
+            'clear-icon': 'close',
+        },
         sortable: true,
         align: 'left',
+        isEditable: true,
+        create: true,
     },
     {
         name: 'isDeductible',
         label: t('invoiceIn.isDeductible'),
-        field: (row) => row.isDeductible,
-        model: 'isDeductible',
+        component: 'checkbox',
         align: 'center',
+        isEditable: true,
+        create: true,
+        createAttrs: {
+            defaultValue: true,
+        },
+        width: '100px',
     },
     {
-        name: 'sageiva',
+        name: 'taxTypeSageFk',
         label: t('Sage iva'),
-        field: (row) => row.taxTypeSageFk,
-        options: sageTaxTypes.value,
-        model: 'taxTypeSageFk',
-        optionValue: 'id',
-        optionLabel: (row) => `${row.id}: ${row.vat}`,
+        component: 'select',
+        attrs: {
+            options: sageTaxTypes.value,
+            optionValue: 'id',
+            optionLabel: (row) => `${row.id}: ${row.vat}`,
+            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;
+        },
         sortable: true,
         align: 'left',
+        isEditable: true,
+        create: true,
     },
     {
-        name: 'sagetransaction',
+        name: 'transactionTypeSageFk',
         label: t('Sage transaction'),
-        field: (row) => row.transactionTypeSageFk,
-        options: sageTransactionTypes.value,
-        model: 'transactionTypeSageFk',
-        optionValue: 'id',
-        optionLabel: (row) => `${row.id}: ${row.transaction}`,
+        component: 'select',
+        attrs: {
+            options: sageTransactionTypes.value,
+            optionValue: 'id',
+            optionLabel: (row) => `${row.id}: ${row.transaction}`,
+            filterOptions: ['id', 'transaction'],
+        },
+        format: (row) => {
+            const transType = sageTransactionTypes.value.find(
+                (t) => t.id === row.transactionTypeSageFk,
+            );
+            return transType
+                ? `${transType.id}: ${transType.transaction}`
+                : row.transactionTypeSageFk;
+        },
         sortable: true,
         align: 'left',
+        isEditable: true,
+        create: true,
     },
     {
         name: 'rate',
         label: t('Rate'),
-        sortable: true,
-        field: (row) => taxRate(row, row.taxTypeSageFk),
+        sortable: false,
+        format: (row) => taxRate(row).toFixed(2),
         align: 'left',
     },
     {
-        name: 'foreignvalue',
+        name: 'foreignValue',
         label: t('Foreign value'),
+        component: 'number',
         sortable: true,
-        field: (row) => row.foreignValue,
         align: 'left',
+        create: true,
+        disable: !isNotEuro(currency.value),
     },
     {
         name: 'total',
-        label: 'Total',
+        label: t('Total'),
         align: 'left',
+        format: (row) => (Number(row.taxableBase || 0) + Number(taxRate(row))).toFixed(2),
     },
 ]);
 
+const tableRows = computed(
+    () => invoiceInVatTableRef.value?.CrudModelRef?.formData || [],
+);
 const taxableBaseTotal = computed(() => {
-    return getTotal(invoiceInFormRef.value.formData, 'taxableBase');
+    return getTotal(tableRows.value, 'taxableBase');
 });
-
 const taxRateTotal = computed(() => {
-    return getTotal(invoiceInFormRef.value.formData, null, {
-        cb: taxRate,
-    });
+    return tableRows.value.reduce((sum, row) => sum + Number(taxRate(row)), 0);
 });
-
 const combinedTotal = computed(() => {
     return +taxableBaseTotal.value + +taxRateTotal.value;
 });
 
-const filter = {
+const filter = computed(() => ({
     fields: [
         'id',
         'invoiceInFk',
@@ -131,388 +168,74 @@ const filter = {
     where: {
         invoiceInFk: route.params.id,
     },
-};
+}));
 
 const isNotEuro = (code) => code != 'EUR';
 
-function taxRate(invoiceInTax) {
-    const sageTaxTypeId = invoiceInTax.taxTypeSageFk;
-    const taxRateSelection = sageTaxTypes.value.find(
-        (transaction) => transaction.id == sageTaxTypeId,
+async function handleForeignValueUpdate(val, row) {
+    if (!isNotEuro(currency.value)) return;
+    row.taxableBase = await getExchange(
+        val,
+        invoiceIn.value?.currencyFk,
+        invoiceIn.value?.issued,
     );
-    const taxTypeSage = taxRateSelection?.rate ?? 0;
-    const taxableBase = invoiceInTax?.taxableBase ?? 0;
-
-    return ((taxTypeSage / 100) * taxableBase).toFixed(2);
-}
-
-function autocompleteExpense(evt, row, col, ref) {
-    const val = evt.target.value;
-    if (!val) return;
-
-    const param = isNaN(val) ? row[col.model] : val;
-    const lookup = expenses.value.find(
-        ({ id }) => id == useAccountShortToStandard(param),
-    );
-
-    ref.vnSelectDialogRef.vnSelectRef.toggleOption(lookup);
-}
-
-function setCursor(ref) {
-    nextTick(() => {
-        const select = ref.vnSelectDialogRef
-            ? ref.vnSelectDialogRef.vnSelectRef
-            : ref.vnSelectRef;
-        select.$el.querySelector('input').setSelectionRange(0, 0);
-    });
 }
 </script>
 <template>
-    <FetchData
-        ref="expensesRef"
-        url="Expenses"
-        auto-load
-        @on-fetch="(data) => (expenses = data)"
-    />
+    <FetchData url="Expenses" auto-load @on-fetch="(data) => (expenses = data)" />
     <FetchData url="SageTaxTypes" auto-load @on-fetch="(data) => (sageTaxTypes = data)" />
     <FetchData
         url="sageTransactionTypes"
         auto-load
         @on-fetch="(data) => (sageTransactionTypes = data)"
     />
-    <CrudModel
-        ref="invoiceInFormRef"
+    <VnTable
         v-if="invoiceIn"
+        ref="invoiceInVatTableRef"
         data-key="InvoiceInTaxes"
         url="InvoiceInTaxes"
+        save-url="InvoiceInTaxes/crud"
         :filter="filter"
         :data-required="{ invoiceInFk: $route.params.id }"
         auto-load
         v-model:selected="rowsSelected"
-        :go-to="`/invoice-in/${$route.params.id}/due-day`"
+        :columns="columns"
+        :is-editable="true"
+        :table="{ selection: 'multiple', 'row-key': '$index' }"
+        footer
+        :right-search="false"
+        :column-search="false"
+        :disable-option="{ card: true }"
+        class="q-pa-none"
+        :create="{
+            urlCreate: 'InvoiceInTaxes',
+            title: t('Add tax'),
+            formInitialData: { invoiceInFk: $route.params.id, isDeductible: true },
+            onDataSaved: () => invoiceInVatTableRef.reload(),
+        }"
+        :crud-model="{ goTo: `/invoice-in/${$route.params.id}/due-day` }"
     >
-        <template #body="{ rows }">
-            <QTable
-                v-model:selected="rowsSelected"
-                selection="multiple"
-                :columns="columns"
-                :rows="rows"
-                row-key="$index"
-                :grid="$q.screen.lt.sm"
-            >
-                <template #body-cell-expense="{ row, col }">
-                    <QTd>
-                        <VnSelectDialog
-                            :ref="`expenseRef-${row.$index}`"
-                            v-model="row[col.model]"
-                            :options="col.options"
-                            :option-value="col.optionValue"
-                            :option-label="col.optionLabel"
-                            :filter-options="['id', 'name']"
-                            :tooltip="t('Create a new expense')"
-                            :acls="[
-                                { model: 'Expense', props: '*', accessType: 'WRITE' },
-                            ]"
-                            @keydown.tab.prevent="
-                                autocompleteExpense(
-                                    $event,
-                                    row,
-                                    col,
-                                    $refs[`expenseRef-${row.$index}`],
-                                )
-                            "
-                            @update:model-value="
-                                setCursor($refs[`expenseRef-${row.$index}`])
-                            "
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    {{ `${scope.opt.id}: ${scope.opt.name}` }}
-                                </QItem>
-                            </template>
-                            <template #form>
-                                <CreateNewExpenseForm
-                                    @on-data-saved="$refs.expensesRef.fetch()"
-                                />
-                            </template>
-                        </VnSelectDialog>
-                    </QTd>
-                </template>
-                <template #body-cell-isDeductible="{ row }">
-                    <QTd align="center">
-                        <QCheckbox
-                            v-model="row.isDeductible"
-                            data-cy="isDeductible_checkbox"
-                        />
-                    </QTd>
-                </template>
-                <template #body-cell-taxablebase="{ row }">
-                    <QTd shrink>
-                        <VnInputNumber
-                            clear-icon="close"
-                            v-model="row.taxableBase"
-                            clearable
-                        />
-                    </QTd>
-                </template>
-                <template #body-cell-sageiva="{ row, col }">
-                    <QTd>
-                        <VnSelect
-                            :ref="`sageivaRef-${row.$index}`"
-                            v-model="row[col.model]"
-                            :options="col.options"
-                            :option-value="col.optionValue"
-                            :option-label="col.optionLabel"
-                            :filter-options="['id', 'vat']"
-                            data-cy="vat-sageiva"
-                            @update:model-value="
-                                setCursor($refs[`sageivaRef-${row.$index}`])
-                            "
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ scope.opt.vat }}</QItemLabel>
-                                        <QItemLabel>
-                                            {{ `#${scope.opt.id}` }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </QTd>
-                </template>
-                <template #body-cell-sagetransaction="{ row, col }">
-                    <QTd>
-                        <VnSelect
-                            :ref="`sagetransactionRef-${row.$index}`"
-                            v-model="row[col.model]"
-                            :options="col.options"
-                            :option-value="col.optionValue"
-                            :option-label="col.optionLabel"
-                            :filter-options="['id', 'transaction']"
-                            @update:model-value="
-                                setCursor($refs[`sagetransactionRef-${row.$index}`])
-                            "
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{
-                                            scope.opt.transaction
-                                        }}</QItemLabel>
-                                        <QItemLabel>
-                                            {{ `#${scope.opt.id}` }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </QTd>
-                </template>
-                <template #body-cell-foreignvalue="{ row }">
-                    <QTd shrink>
-                        <VnInputNumber
-                            :class="{
-                                'no-pointer-events': !isNotEuro(currency),
-                            }"
-                            :disable="!isNotEuro(currency)"
-                            v-model="row.foreignValue"
-                            @update:model-value="
-                                async (val) => {
-                                    if (!isNotEuro(currency)) return;
-                                    row.taxableBase = await getExchange(
-                                        val,
-                                        row.currencyFk,
-                                        invoiceIn.issued,
-                                    );
-                                }
-                            "
-                        />
-                    </QTd>
-                </template>
-                <template #bottom-row>
-                    <QTr class="bg">
-                        <QTd />
-                        <QTd />
-                        <QTd>
-                            {{ toCurrency(taxableBaseTotal) }}
-                        </QTd>
-                        <QTd />
-                        <QTd />
-                        <QTd />
-                        <QTd>
-                            {{ toCurrency(taxRateTotal) }}
-                        </QTd>
-                        <QTd />
-                        <QTd>
-                            {{ toCurrency(combinedTotal) }}
-                        </QTd>
-                    </QTr>
-                </template>
-
-                <template #item="props">
-                    <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
-                        <QCard bordered flat class="q-my-xs">
-                            <QCardSection>
-                                <QCheckbox v-model="props.selected" dense />
-                            </QCardSection>
-                            <QSeparator />
-                            <QList>
-                                <QItem>
-                                    <VnSelectDialog
-                                        :label="t('Expense')"
-                                        class="full-width"
-                                        v-model="props.row['expenseFk']"
-                                        :options="expenses"
-                                        option-value="id"
-                                        :option-label="(row) => `${row.id}:${row.name}`"
-                                        :filter-options="['id', 'name']"
-                                        :tooltip="t('Create a new expense')"
-                                    >
-                                        <template #option="scope">
-                                            <QItem v-bind="scope.itemProps">
-                                                {{ `${scope.opt.id}: ${scope.opt.name}` }}
-                                            </QItem>
-                                        </template>
-                                        <template #form>
-                                            <CreateNewExpenseForm />
-                                        </template>
-                                    </VnSelectDialog>
-                                </QItem>
-                                <QItem>
-                                    <VnInputNumber
-                                        :label="t('Taxable base')"
-                                        :class="{
-                                            'no-pointer-events': isNotEuro(currency),
-                                        }"
-                                        class="full-width"
-                                        :disable="isNotEuro(currency)"
-                                        clear-icon="close"
-                                        v-model="props.row.taxableBase"
-                                        clearable
-                                    />
-                                </QItem>
-                                <QItem>
-                                    <VnSelect
-                                        :label="t('Sage iva')"
-                                        class="full-width"
-                                        v-model="props.row['taxTypeSageFk']"
-                                        :options="sageTaxTypes"
-                                        option-value="id"
-                                        :option-label="(row) => `${row.id}:${row.vat}`"
-                                        :filter-options="['id', 'vat']"
-                                    >
-                                        <template #option="scope">
-                                            <QItem v-bind="scope.itemProps">
-                                                <QItemSection>
-                                                    <QItemLabel>{{
-                                                        scope.opt.vat
-                                                    }}</QItemLabel>
-                                                    <QItemLabel>
-                                                        {{ `#${scope.opt.id}` }}
-                                                    </QItemLabel>
-                                                </QItemSection>
-                                            </QItem>
-                                        </template>
-                                    </VnSelect>
-                                </QItem>
-                                <QItem>
-                                    <VnSelect
-                                        class="full-width"
-                                        v-model="props.row['transactionTypeSageFk']"
-                                        :options="sageTransactionTypes"
-                                        option-value="id"
-                                        :option-label="
-                                            (row) => `${row.id}:${row.transaction}`
-                                        "
-                                        :filter-options="['id', 'transaction']"
-                                    >
-                                        <template #option="scope">
-                                            <QItem v-bind="scope.itemProps">
-                                                <QItemSection>
-                                                    <QItemLabel>{{
-                                                        scope.opt.transaction
-                                                    }}</QItemLabel>
-                                                    <QItemLabel>
-                                                        {{ `#${scope.opt.id}` }}
-                                                    </QItemLabel>
-                                                </QItemSection>
-                                            </QItem>
-                                        </template>
-                                    </VnSelect>
-                                </QItem>
-                                <QItem>
-                                    {{ toCurrency(taxRate(props.row), currency) }}
-                                </QItem>
-                                <QItem>
-                                    <VnInputNumber
-                                        :label="t('Foreign value')"
-                                        class="full-width"
-                                        :class="{
-                                            'no-pointer-events': !isNotEuro(currency),
-                                        }"
-                                        :disable="!isNotEuro(currency)"
-                                        v-model="props.row.foreignValue"
-                                    />
-                                </QItem>
-                            </QList>
-                        </QCard>
-                    </div>
-                </template>
-            </QTable>
+        <template #column-footer-taxableBase>
+            {{ toCurrency(taxableBaseTotal) }}
         </template>
-    </CrudModel>
-    <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn
-            color="primary"
-            icon="add"
-            size="lg"
-            v-shortcut="'+'"
-            round
-            @click="invoiceInFormRef.insert({ isDeductible: true })"
-        >
-            <QTooltip>{{ t('Add tax') }}</QTooltip>
-        </QBtn>
-    </QPageSticky>
+        <template #column-footer-rate>
+            {{ toCurrency(taxRateTotal) }}
+        </template>
+        <template #column-footer-total>
+            {{ toCurrency(combinedTotal) }}
+        </template>
+    </VnTable>
 </template>
-
-<style lang="scss" scoped>
-.bg {
-    background-color: var(--vn-light-gray);
-}
-@media (max-width: $breakpoint-xs) {
-    .q-dialog {
-        .q-card {
-            &__section:not(:first-child) {
-                .q-item {
-                    flex-direction: column;
-
-                    .q-checkbox {
-                        margin-top: 2rem;
-                    }
-                }
-            }
-        }
-    }
-}
-.q-item {
-    min-height: 0;
-}
-.default-icon {
-    cursor: pointer;
-    border-radius: 50px;
-    background-color: $primary;
-}
-</style>
 <i18n>
 es:
     Expense: Gasto
     Create a new expense: Crear nuevo gasto
-    Add tax: Crear gasto
+    Add tax: Añadir Gasto/IVA # Changed label slightly
     Taxable base: Base imp.
-    Sage tax: Sage iva
+    Sage iva: Sage iva # Kept original label
     Sage transaction: Sage transacción
-    Rate: Tasa
+    Rate: Cuota # Changed label
     Foreign value: Divisa
+    Total: Total
+    invoiceIn.isDeductible: Deducible
 </i18n>

From d2452caef870ccf5933ef851c402622410cd6a0f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 28 Apr 2025 15:56:19 +0200
Subject: [PATCH 11/43] feat: refs #8388 update entry pre-accounting filter
 handling and enhance search info in localization files

---
 src/pages/Entry/EntryPreAccount.vue | 12 ++++++++----
 src/pages/Entry/locale/en.yml       |  2 +-
 src/pages/Entry/locale/es.yml       |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 5e1cda395..5f4d36df0 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -19,7 +19,9 @@ import { useQuasar } from 'quasar';
 import InvoiceInDescriptorProxy from '../InvoiceIn/Card/InvoiceInDescriptorProxy.vue';
 import { useStateStore } from 'src/stores/useStateStore';
 import { downloadFile } from 'src/composables/downloadFile';
+import { useRoute } from 'vue-router';
 
+const route = useRoute();
 const { t } = useI18n();
 const quasar = useQuasar();
 const { notify } = useNotify();
@@ -215,13 +217,14 @@ const columns = computed(() => [
 ]);
 
 onBeforeMount(async () => {
+    const filter = JSON.parse(route.query.entryPreaccountingFilter ?? '{}');
     const { data } = await axios.get('EntryConfigs/findOne', {
         params: { filter: JSON.stringify({ fields: ['maxDays', 'defaultDays'] }) },
     });
     maxDays = data.maxDays;
     defaultDays = data.defaultDays;
-    daysAgo.value = arrayData.store.userParams.daysAgo || defaultDays;
-    isBooked.value = arrayData.store.userParams.isBooked || false;
+    daysAgo.value = filter.daysAgo || defaultDays;
+    isBooked.value = filter.isBooked || false;
     stateStore.leftDrawer = false;
 });
 
@@ -237,8 +240,9 @@ function filterByDaysAgo(val) {
     if (!val) val = defaultDays;
     else if (val > maxDays) val = maxDays;
     daysAgo.value = val;
-    arrayData.store.userParams.daysAgo = daysAgo.value;
-    table.value.reload();
+    table.value.reload({
+        userParams: { ...arrayData.store.userParams, daysAgo: daysAgo.value },
+    });
 }
 
 async function preAccount() {
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 51e2a62e5..09caefc34 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -138,7 +138,7 @@ entry:
         fiscalCode: Account type
         daysAgo: Max 365 days
         search: Search
-        searchInfo: You can search by supplier name or nickname
+        searchInfo: You can search by supplier name, nickname or tax number
         btn: Pre-account
         hasInvoice: This entry has already an invoice in
         success: It has been successfully pre-accounted
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 5b1c19dfa..f67e3c76d 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -89,7 +89,7 @@ entry:
         fiscalCode: Tipo de cuenta
         daysAgo: Máximo 365 días
         search: Buscar
-        searchInfo: Puedes buscar por nombre o alias de proveedor
+        searchInfo: Puedes buscar por nombre, alias o cif de proveedor
         btn: Precontabilizar
         hasInvoice: Esta entrada ya tiene una f. recibida
         success: Se ha precontabilizado correctamente

From d1f676e6ff2dc10da098c4ff5fdf3569932e23a5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 28 Apr 2025 16:13:29 +0200
Subject: [PATCH 12/43] feat: refs #8388 add ACL check for adding invoices in
 EntryPreAccount.vue

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

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 5f4d36df0..45e871c7a 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -20,6 +20,7 @@ import InvoiceInDescriptorProxy from '../InvoiceIn/Card/InvoiceInDescriptorProxy
 import { useStateStore } from 'src/stores/useStateStore';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useRoute } from 'vue-router';
+import { useAcl } from 'src/composables/useAcl';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -395,6 +396,7 @@ async function createInvoice() {
     >
         <template #top-left>
             <QBtn
+                v-if="useAcl().hasAcl('Entry', 'addInvoiceIn', 'WRITE')"
                 data-cy="preAccount_btn"
                 icon="account_balance"
                 color="primary"

From ca0af4b3f6849a7971d718864e99e3c3c706b434 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 28 Apr 2025 16:45:34 +0200
Subject: [PATCH 13/43] feat: refs #8388 add 'isOrdered' and 'isReceived'
 fields to TravelFilter

---
 src/pages/Travel/Card/TravelFilter.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/Travel/Card/TravelFilter.js b/src/pages/Travel/Card/TravelFilter.js
index 0799e449c..12e537f31 100644
--- a/src/pages/Travel/Card/TravelFilter.js
+++ b/src/pages/Travel/Card/TravelFilter.js
@@ -13,6 +13,8 @@ export default {
         'daysInForward',
         'availabled',
         'awbFk',
+        'isOrdered',
+        'isReceived',
     ],
     include: [
         {

From d45d84d7077c3046073f11fbf3e88da8efcae006 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 30 Apr 2025 11:07:38 +0200
Subject: [PATCH 14/43] fix: refs #8388 update handleHeaderSelection to use
 selection function for row selection

---
 src/components/VnTable/VnTable.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 63a6feab0..b3e4d2a9a 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -651,7 +651,9 @@ const rowCtrlClickFunction = computed(() => {
 });
 const handleHeaderSelection = (evt, data) => {
     if (evt === 'selected' && data) {
-        selected.value = tableRef.value.rows;
+        const fn = $props.selectionFn;
+        const rows = tableRef.value.rows;
+        selected.value = fn ? fn(rows) : rows;
     } else if (evt === 'selectAll') {
         selected.value = data;
     } else {

From 0dfb5a47b78c19e3da756e9234d096f3d41618ee Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 30 Apr 2025 15:10:10 +0200
Subject: [PATCH 15/43] fix: refs #8388 enhance keydown event handling in
 VnTable and add expense fetching in InvoiceInVat

---
 src/components/VnTable/VnTable.vue        |  1 +
 src/components/common/VnSelectExpense.vue | 13 +------------
 src/pages/InvoiceIn/Card/InvoiceInVat.vue | 22 ++++++++++++++++++++--
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index b3e4d2a9a..7bcecdf2b 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -476,6 +476,7 @@ async function renderInput(rowId, field, clickedElement) {
                     await destroyInput(rowId, field, clickedElement);
             },
             keydown: async (event) => {
+                await column?.cellEvent?.['keydown']?.(event, row);
                 switch (event.key) {
                     case 'Tab':
                         await handleTabKey(event, rowId, field);
diff --git a/src/components/common/VnSelectExpense.vue b/src/components/common/VnSelectExpense.vue
index 406715b84..c44e983b5 100644
--- a/src/components/common/VnSelectExpense.vue
+++ b/src/components/common/VnSelectExpense.vue
@@ -1,7 +1,6 @@
 <script setup>
-import { ref, useTemplateRef } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
 import VnSelectDialog from './VnSelectDialog.vue';
 import CreateNewExpenseForm from '../CreateNewExpenseForm.vue';
 import FetchData from '../FetchData.vue';
@@ -9,15 +8,6 @@ import FetchData from '../FetchData.vue';
 const model = defineModel({ type: [String, Number, Object] });
 const { t } = useI18n();
 const expenses = ref([]);
-const selectDialogRef = useTemplateRef('selectDialogRef');
-
-async function autocompleteExpense(evt) {
-    const val = evt.target.value;
-    if (!val || isNaN(val)) return;
-    const lookup = expenses.value.find(({ id }) => id == useAccountShortToStandard(val));
-    if (selectDialogRef.value)
-        selectDialogRef.value.vnSelectDialogRef.vnSelectRef.toggleOption(lookup);
-}
 </script>
 <template>
     <VnSelectDialog
@@ -30,7 +20,6 @@ async function autocompleteExpense(evt) {
         :filter-options="['id', 'name']"
         :tooltip="t('Create a new expense')"
         :acls="[{ model: 'Expense', props: '*', accessType: 'WRITE' }]"
-        @keydown.tab.prevent="autocompleteExpense"
     >
         <template #form>
             <CreateNewExpenseForm @on-data-saved="$refs.expensesRef.fetch()" />
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index aa9c671d9..6b55970d3 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -9,6 +9,8 @@ import FetchData from 'src/components/FetchData.vue';
 import { getExchange } from 'src/composables/getExchange';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnSelectExpense from 'src/components/common/VnSelectExpense.vue';
+import axios from 'axios';
+import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
 
 const { t } = useI18n();
 const arrayData = useArrayData();
@@ -48,6 +50,22 @@ const columns = computed(() => [
         isEditable: true,
         create: true,
         width: '250px',
+        cellEvent: {
+            keydown: async (evt, row) => {
+                if (evt.key !== 'Tab') return;
+                const val = evt.target.value;
+                if (!val || isNaN(val)) return;
+                row.expenseFk = (
+                    await axios.get(`Expenses`, {
+                        params: {
+                            filter: JSON.stringify({
+                                where: { id: useAccountShortToStandard(val) },
+                            }),
+                        },
+                    })
+                ).data[0].id;
+            },
+        },
     },
     {
         name: 'taxableBase',
@@ -104,13 +122,13 @@ const columns = computed(() => [
             optionLabel: (row) => `${row.id}: ${row.transaction}`,
             filterOptions: ['id', 'transaction'],
         },
-        format: (row) => {
+        format: (row, dashIfEmpty) => {
             const transType = sageTransactionTypes.value.find(
                 (t) => t.id === row.transactionTypeSageFk,
             );
             return transType
                 ? `${transType.id}: ${transType.transaction}`
-                : row.transactionTypeSageFk;
+                : dashIfEmpty(row.transactionTypeSageFk);
         },
         sortable: true,
         align: 'left',

From ce69b5e2749fe82e6d6126032cf649e99fbe9c4a Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 30 Apr 2025 15:14:15 +0200
Subject: [PATCH 16/43] fix: refs #8388 rollback

---
 src/boot/quasar.js | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/boot/quasar.js b/src/boot/quasar.js
index 8ef748c01..b654eac5d 100644
--- a/src/boot/quasar.js
+++ b/src/boot/quasar.js
@@ -22,14 +22,6 @@ export default boot(({ app, router }) => {
         }
 
         switch (response?.status) {
-            case 401:
-                if (!router.currentRoute.value.name.includes('login')) {
-                    message = 'errors.sessionExpired';
-                } else message = 'login.loginError';
-                break;
-            case 403:
-                if (!message || message.toLowerCase() === 'access denied')
-                    message = 'errors.accessDenied';
             case 422:
                 if (error.name == 'ValidationError')
                     message +=

From f8c3bfe2cdcafcce24afdd1869643558433072ef Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 30 Apr 2025 15:14:43 +0200
Subject: [PATCH 17/43] fix: refs #8388 rollback

---
 src/boot/quasar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/boot/quasar.js b/src/boot/quasar.js
index b654eac5d..a8c397b83 100644
--- a/src/boot/quasar.js
+++ b/src/boot/quasar.js
@@ -7,7 +7,7 @@ import { QLayout } from 'quasar';
 import mainShortcutMixin from './mainShortcutMixin';
 import { useCau } from 'src/composables/useCau';
 
-export default boot(({ app, router }) => {
+export default boot(({ app }) => {
     QForm.mixins = [qFormMixin];
     QLayout.mixins = [mainShortcutMixin];
 

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 18/43] 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})

From 65f77b41e6bbc1a6aa0f935c57b922ac547d2efb Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 30 Apr 2025 18:39:15 +0200
Subject: [PATCH 19/43] fix: refs #8388 enhance fiscalCode formatting in
 EntryPreAccount

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

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 7b16a7886..1b9f3222b 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -187,7 +187,7 @@ const columns = computed(() => [
     {
         name: 'fiscalCode',
         label: t('entry.preAccount.fiscalCode'),
-        format: ({ fiscalCode }) => t(fiscalCode),
+        format: ({ fiscalCode }, dashIfEmpty) => t(dashIfEmpty(fiscalCode)),
         columnFilter: {
             component: 'select',
             name: 'fiscalCode',

From 9f56fc292b14c1910c31447090dec60f009e42fa Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 12 May 2025 11:18:04 +0200
Subject: [PATCH 20/43] fix: refs #8564 improve error handling in password
 change validation

---
 src/components/common/VnChangePassword.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/common/VnChangePassword.vue b/src/components/common/VnChangePassword.vue
index d8374498f..102697265 100644
--- a/src/components/common/VnChangePassword.vue
+++ b/src/components/common/VnChangePassword.vue
@@ -37,7 +37,7 @@ const validate = async () => {
         await props.submitFn(newPassword, oldPassword);
         emit('onSubmit');
     } catch (e) {
-        notify('errors.writeRequest', 'negative');
+        throw e;
     } finally {
         changePassDialog.value.hide();
         isLoading.value = false;

From ab542c18722817c37fa0027d34f13f85c78a461e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 12 May 2025 11:20:16 +0200
Subject: [PATCH 21/43] fix: refs #8564 remove unnecessary error rethrow in
 password change validation

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

diff --git a/src/components/common/VnChangePassword.vue b/src/components/common/VnChangePassword.vue
index 102697265..9fbc8fda8 100644
--- a/src/components/common/VnChangePassword.vue
+++ b/src/components/common/VnChangePassword.vue
@@ -36,8 +36,6 @@ const validate = async () => {
         isLoading.value = true;
         await props.submitFn(newPassword, oldPassword);
         emit('onSubmit');
-    } catch (e) {
-        throw e;
     } finally {
         changePassDialog.value.hide();
         isLoading.value = false;

From 7dbe5c24ec2e349e32ecd7dae53dc71d6e3eb8ef Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 12 May 2025 13:17:07 +0200
Subject: [PATCH 22/43] fix: refs #8388 update format functions to handle empty
 values and adjust column widths

---
 src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue | 11 ++++-------
 src/pages/InvoiceIn/Card/InvoiceInVat.vue       | 17 ++++++++++++-----
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index c989f94e4..04c84edc2 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -28,9 +28,10 @@ const columns = computed(() => [
             sortBy: 'id',
             fields: ['id', 'description'],
         },
-        format: getCode,
+        format: (row, dashIfEmpty) => dashIfEmpty(getCode(row)),
         create: true,
         isEditable: true,
+        width: 'max-content',
     },
     {
         name: 'amount',
@@ -39,7 +40,6 @@ const columns = computed(() => [
         create: true,
         isEditable: true,
         columnFilter: false,
-        width: '30px',
     },
     {
         name: 'net',
@@ -48,7 +48,6 @@ const columns = computed(() => [
         create: true,
         isEditable: true,
         columnFilter: false,
-        width: '30px',
     },
     {
         name: 'stems',
@@ -57,7 +56,6 @@ const columns = computed(() => [
         create: true,
         isEditable: true,
         columnFilter: false,
-        width: '30px',
     },
     {
         name: 'countryFk',
@@ -70,7 +68,6 @@ const columns = computed(() => [
         create: true,
         isEditable: true,
         columnFilter: false,
-        width: '30px',
     },
 ]);
 
@@ -79,8 +76,8 @@ const tableRows = computed(
 );
 
 function getCode(row) {
-    const { id, description } = intrastats.value.find(({ id }) => id === row.intrastatFk);
-    return `${id}: ${description}`;
+    const code = intrastats.value.find(({ id }) => id === row.intrastatFk);
+    return code ? `${code.id}: ${code.description}` : null;
 }
 </script>
 <template>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 8e3750ef1..7fe5248b2 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -41,15 +41,15 @@ const columns = computed(() => [
         name: 'expenseFk',
         label: t('Expense'),
         component: markRaw(VnSelectExpense),
-        format: (row) => {
+        format: (row, dashIfEmpty) => {
             const expense = expenses.value.find((e) => e.id === row.expenseFk);
-            return expense ? `${expense.id}: ${expense.name}` : row.expenseFk;
+            return expense ? `${expense.id}: ${expense.name}` : dashIfEmpty(null);
         },
         sortable: true,
         align: 'left',
         isEditable: true,
         create: true,
-        width: '250px',
+        width: 'max-content',
         cellEvent: {
             keydown: async (evt, row) => {
                 if (evt.key !== 'Tab') return;
@@ -90,7 +90,6 @@ const columns = computed(() => [
         createAttrs: {
             defaultValue: true,
         },
-        width: '100px',
     },
     {
         name: 'taxTypeSageFk',
@@ -111,6 +110,7 @@ const columns = computed(() => [
         align: 'left',
         isEditable: true,
         create: true,
+        width: 'max-content',
     },
     {
         name: 'transactionTypeSageFk',
@@ -134,6 +134,7 @@ const columns = computed(() => [
         align: 'left',
         isEditable: true,
         create: true,
+        width: 'max-content',
     },
     {
         name: 'rate',
@@ -211,6 +212,12 @@ async function handleForeignValueUpdate(val, row) {
         auto-load
         @on-fetch="(data) => (sageTransactionTypes = data)"
     />
+    <QBtn
+        :to="`/invoice-in/${$route.params.id}/due-day`"
+        label="mock"
+        dense
+        size="md"
+    ></QBtn>
     <VnTable
         v-if="invoiceIn"
         ref="invoiceInVatTableRef"
@@ -236,7 +243,7 @@ async function handleForeignValueUpdate(val, row) {
             formInitialData: { invoiceInFk: $route.params.id, isDeductible: true },
             onDataSaved: () => invoiceInVatTableRef.reload(),
         }"
-        :crud-model="{ goTo: `/invoice-in/${$route.params.id}/due-day` }"
+        :go-to="`invoice-in/${$route.params.id}/due-day`"
     >
         <template #column-footer-taxableBase>
             {{ toCurrency(taxableBaseTotal) }}

From 505489fae6348fd3526b674f3d27cf2fc9ff1a79 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 12 May 2025 13:19:30 +0200
Subject: [PATCH 23/43] chore: refs #8388 drop useless code

---
 src/pages/InvoiceIn/Card/InvoiceInVat.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 7fe5248b2..7fdd879a2 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -212,12 +212,6 @@ async function handleForeignValueUpdate(val, row) {
         auto-load
         @on-fetch="(data) => (sageTransactionTypes = data)"
     />
-    <QBtn
-        :to="`/invoice-in/${$route.params.id}/due-day`"
-        label="mock"
-        dense
-        size="md"
-    ></QBtn>
     <VnTable
         v-if="invoiceIn"
         ref="invoiceInVatTableRef"

From cda841b95680fa5ebaf3d19784f812d6ec020ba2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 12 May 2025 13:56:59 +0200
Subject: [PATCH 24/43] fix: refs #8388 remove unused insert-on-load attribute
 from InvoiceIn components

---
 src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue | 1 -
 src/pages/InvoiceIn/Card/InvoiceInVat.vue       | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 04c84edc2..6244d94c4 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -117,7 +117,6 @@ function getCode(row) {
             data-cy="invoice-in-intrastat-table"
             :right-search="false"
             :disable-option="{ card: true }"
-            :insert-on-load="true"
         >
             <template #column-footer-amount>
                 {{ getTotal(tableRows, 'amount', { currency: 'default' }) }}
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 7fdd879a2..5295f5ed6 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -220,7 +220,6 @@ async function handleForeignValueUpdate(val, row) {
         save-url="InvoiceInTaxes/crud"
         :filter="filter"
         :data-required="{ invoiceInFk: $route.params.id }"
-        :insert-on-load="true"
         auto-load
         v-model:selected="rowsSelected"
         :columns="columns"
@@ -237,7 +236,7 @@ async function handleForeignValueUpdate(val, row) {
             formInitialData: { invoiceInFk: $route.params.id, isDeductible: true },
             onDataSaved: () => invoiceInVatTableRef.reload(),
         }"
-        :go-to="`invoice-in/${$route.params.id}/due-day`"
+        :go-to="`/invoice-in/${$route.params.id}/due-day`"
     >
         <template #column-footer-taxableBase>
             {{ toCurrency(taxableBaseTotal) }}

From 54a905d4363a786734e5242e45b34acc295ff52c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 12 May 2025 17:08:02 +0200
Subject: [PATCH 25/43] fix: refs #8388 remove unused save-changes event
 handler from VnTable component

---
 src/components/VnTable/VnTable.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 71d2152f1..4232dbee9 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -702,7 +702,6 @@ const handleHeaderSelection = (evt, data) => {
         :search-url="searchUrl"
         :disable-infinite-scroll="isTableMode"
         :before-save-fn="removeTextValue"
-        @save-changes="reload"
         :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
         :auto-load="hasParams || $attrs['auto-load']"
     >

From 5882f47f5f88f39223cedcf1d786cf7f45c578a5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 12 May 2025 17:17:32 +0200
Subject: [PATCH 26/43] fix: refs #8388 update CrudModel and VnTable to handle
 async reload and improve event handling

---
 src/components/CrudModel.vue       | 4 ++++
 src/components/VnTable/VnTable.vue | 5 +++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 21ad0e41a..c5a2a3e17 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -11,10 +11,12 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
 import SkeletonTable from 'components/ui/SkeletonTable.vue';
 import { tMobile } from 'src/composables/tMobile';
 import getDifferences from 'src/filters/getDifferences';
+import { useStateQueryStore } from 'src/stores/useStateQueryStore';
 
 const { push } = useRouter();
 const quasar = useQuasar();
 const stateStore = useStateStore();
+const stateQuery = useStateQueryStore();
 const { t } = useI18n();
 const { validate } = useValidator();
 const $attrs = useAttrs();
@@ -190,6 +192,8 @@ async function onSubmit() {
 
 async function onSubmitAndGo() {
     await onSubmit();
+    while (stateQuery.isLoading().value)
+        await new Promise((resolve) => setTimeout(resolve, 100));
     push({ path: $props.goTo });
 }
 
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 4232dbee9..218926de4 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -335,10 +335,10 @@ function stopEventPropagation(event) {
     event.stopPropagation();
 }
 
-function reload(params) {
+async function reload(params) {
     selected.value = [];
     selectAll.value = false;
-    CrudModelRef.value.reload(params);
+    await CrudModelRef.value.reload(params);
 }
 
 function columnName(col) {
@@ -702,6 +702,7 @@ const handleHeaderSelection = (evt, data) => {
         :search-url="searchUrl"
         :disable-infinite-scroll="isTableMode"
         :before-save-fn="removeTextValue"
+        @save-changes="reload"
         :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
         :auto-load="hasParams || $attrs['auto-load']"
     >

From 8764eeca92dc8645178179d267884175f4dcac15 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 12 May 2025 17:47:56 +0200
Subject: [PATCH 27/43] fix: refs #8388 remove unused save-changes event

---
 src/components/CrudModel.vue       | 2 --
 src/components/VnTable/VnTable.vue | 1 -
 2 files changed, 3 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index c5a2a3e17..85bd657a7 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -192,8 +192,6 @@ async function onSubmit() {
 
 async function onSubmitAndGo() {
     await onSubmit();
-    while (stateQuery.isLoading().value)
-        await new Promise((resolve) => setTimeout(resolve, 100));
     push({ path: $props.goTo });
 }
 
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 218926de4..c4cbd6617 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -702,7 +702,6 @@ const handleHeaderSelection = (evt, data) => {
         :search-url="searchUrl"
         :disable-infinite-scroll="isTableMode"
         :before-save-fn="removeTextValue"
-        @save-changes="reload"
         :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
         :auto-load="hasParams || $attrs['auto-load']"
     >

From 88a9299aa906093fb2cef26e926626a45587114c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 13 May 2025 10:21:03 +0200
Subject: [PATCH 28/43] fix: refs #8388 enhance click handler to ignore dialog
 interactions

---
 src/components/VnTable/VnTable.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index c4cbd6617..1c77d9962 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -392,12 +392,14 @@ function hasEditableFormat(column) {
 }
 
 const clickHandler = async (event) => {
-    const clickedElement = event.target.closest('td');
-    const isDateElement = event.target.closest('.q-date');
-    const isTimeElement = event.target.closest('.q-time');
-    const isQSelectDropDown = event.target.closest('.q-select__dropdown-icon');
+    const el = event.target;
+    const clickedElement = el.closest('td');
+    const isDateElement = el.closest('.q-date');
+    const isTimeElement = el.closest('.q-time');
+    const isQSelectDropDown = el.closest('.q-select__dropdown-icon');
+    const isDialog = el.closest('.q-dialog');
 
-    if (isDateElement || isTimeElement || isQSelectDropDown) return;
+    if (isDateElement || isTimeElement || isQSelectDropDown || isDialog) return;
 
     if (clickedElement === null) {
         await destroyInput(editingRow.value, editingField.value);

From cc397f6b2071e0716ef6e2eff3e70f9a1c0cf749 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 13 May 2025 10:30:51 +0200
Subject: [PATCH 29/43] fix: refs #8388 ensure navigation occurs after data
 reload in save function

---
 src/components/FormModel.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 771e7c884..c4b706a71 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -247,8 +247,8 @@ async function save() {
             res: response?.data,
             old: originalData.value,
         });
-        if ($props.goTo) return push({ path: $props.goTo });
         if ($props.reload) await arrayData.fetch({});
+        if ($props.goTo) return push({ path: $props.goTo });
         hasChanges.value = false;
     } finally {
         isLoading.value = false;

From f020db7fe1fc66ecda9fddff8bab2a50f69f33d1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 13 May 2025 11:13:14 +0200
Subject: [PATCH 30/43] refactor: refs #8388 update VnSelectExpense to use
 computed for expenses and improve data fetching

---
 src/components/common/VnSelectExpense.vue | 22 ++++++++++++----------
 src/pages/InvoiceIn/Card/InvoiceInVat.vue | 14 ++++++++------
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/components/common/VnSelectExpense.vue b/src/components/common/VnSelectExpense.vue
index c44e983b5..301056b47 100644
--- a/src/components/common/VnSelectExpense.vue
+++ b/src/components/common/VnSelectExpense.vue
@@ -1,13 +1,21 @@
 <script setup>
-import { ref } from 'vue';
+import { computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnSelectDialog from './VnSelectDialog.vue';
 import CreateNewExpenseForm from '../CreateNewExpenseForm.vue';
-import FetchData from '../FetchData.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const model = defineModel({ type: [String, Number, Object] });
 const { t } = useI18n();
-const expenses = ref([]);
+const arrayData = useArrayData('expenses', { url: 'Expenses' });
+const expenses = computed(() => arrayData.store.data);
+
+onMounted(async () => await arrayData.fetch({}));
+
+async function updateModel(evt) {
+    await arrayData.fetch({});
+    model.value = evt.id;
+}
 </script>
 <template>
     <VnSelectDialog
@@ -22,15 +30,9 @@ const expenses = ref([]);
         :acls="[{ model: 'Expense', props: '*', accessType: 'WRITE' }]"
     >
         <template #form>
-            <CreateNewExpenseForm @on-data-saved="$refs.expensesRef.fetch()" />
+            <CreateNewExpenseForm @on-data-saved="updateModel" />
         </template>
     </VnSelectDialog>
-    <FetchData
-        ref="expensesRef"
-        url="Expenses"
-        auto-load
-        @on-fetch="(data) => (expenses = data)"
-    />
 </template>
 <i18n>
 es:
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 5295f5ed6..6f04a5415 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, markRaw } from 'vue';
+import { ref, computed, markRaw, useTemplateRef, onBeforeMount } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
@@ -14,15 +14,15 @@ import { useAccountShortToStandard } from 'src/composables/useAccountShortToStan
 
 const { t } = useI18n();
 const arrayData = useArrayData();
+const expensesArrayData = useArrayData('expenses', { url: 'Expenses' });
 const route = useRoute();
 const invoiceIn = computed(() => arrayData.store.data);
 const currency = computed(() => invoiceIn.value?.currency?.code);
-const expenses = ref([]);
+const expenses = computed(() => expensesArrayData.store.data);
 const sageTaxTypes = ref([]);
 const sageTransactionTypes = ref([]);
 const rowsSelected = ref([]);
-const invoiceInVatTableRef = ref();
-
+const invoiceInVatTableRef = useTemplateRef('invoiceInVatTableRef');
 defineProps({ actionIcon: { type: String, default: 'add' } });
 
 function taxRate(invoiceInTax) {
@@ -42,7 +42,7 @@ const columns = computed(() => [
         label: t('Expense'),
         component: markRaw(VnSelectExpense),
         format: (row, dashIfEmpty) => {
-            const expense = expenses.value.find((e) => e.id === row.expenseFk);
+            const expense = expenses.value?.find((e) => e.id === row.expenseFk);
             return expense ? `${expense.id}: ${expense.name}` : dashIfEmpty(null);
         },
         sortable: true,
@@ -151,6 +151,7 @@ const columns = computed(() => [
         align: 'left',
         create: true,
         isEditable: isNotEuro(currency.value),
+        format: (row, dashIfEmpty) => dashIfEmpty(row.foreignValue),
         cellEvent: {
             'update:modelValue': async (value, oldValue, row) =>
                 await handleForeignValueUpdate(value, row),
@@ -193,6 +194,8 @@ const filter = computed(() => ({
     },
 }));
 
+onBeforeMount(async () => await expensesArrayData.fetch({}));
+
 const isNotEuro = (code) => code != 'EUR';
 
 async function handleForeignValueUpdate(val, row) {
@@ -205,7 +208,6 @@ async function handleForeignValueUpdate(val, row) {
 }
 </script>
 <template>
-    <FetchData url="Expenses" auto-load @on-fetch="(data) => (expenses = data)" />
     <FetchData url="SageTaxTypes" auto-load @on-fetch="(data) => (sageTaxTypes = data)" />
     <FetchData
         url="sageTransactionTypes"

From 1535be957f58ff454e3f880f7dbaae78839a05c0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 13 May 2025 13:26:20 +0200
Subject: [PATCH 31/43] feat: refs #8388 enable auto-load

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

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 1b9f3222b..2a23c75ea 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -403,6 +403,7 @@ async function createInvoice() {
             (data) => (totalAmount = data?.reduce((acc, entry) => acc + entry.amount, 0))
         "
         :selection-fn="(rows) => rows.filter((row) => !row.isBooked)"
+        auto-load
     >
         <template #top-left>
             <QBtn

From 26507c6f6bc3a0fdee309f3f616533a220e638a6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 13 May 2025 13:42:11 +0200
Subject: [PATCH 32/43] fix: refs #8388 improve DMS check logic in preAccount
 function

---
 src/pages/Entry/EntryPreAccount.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 2a23c75ea..9bd0871a9 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -264,8 +264,8 @@ async function preAccount() {
     hasDiferentDms.value = false;
     try {
         entries.forEach(({ gestDocFk }) => {
-            if (!dmsFk) dmsFk = gestDocFk;
-            if (gestDocFk && dmsFk && dmsFk !== gestDocFk) hasDiferentDms.value = true;
+            if (!dmsFk && gestDocFk) dmsFk = gestDocFk;
+            if (dmsFk && gestDocFk && dmsFk != gestDocFk) hasDiferentDms.value = true;
         });
         if (isAgricultural) {
             const year = new Date(landed).getFullYear();

From 34a2306db2aec48777fdb44f7d34c66ae4a34bcd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 13 May 2025 13:47:13 +0200
Subject: [PATCH 33/43] fix: refs #8388 rollback

---
 src/boot/quasar.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/boot/quasar.js b/src/boot/quasar.js
index ab8c4979b..7fb814c1f 100644
--- a/src/boot/quasar.js
+++ b/src/boot/quasar.js
@@ -7,7 +7,7 @@ import { QLayout } from 'quasar';
 import mainShortcutMixin from './mainShortcutMixin';
 import { useCau } from 'src/composables/useCau';
 
-export default boot(({ app }) => {
+export default boot(({ app, router }) => {
     QForm.mixins = [qFormMixin];
     QLayout.mixins = [mainShortcutMixin];
 

From d4337b32b40d16de789f86bf3cd3c928ccb86c58 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 13 May 2025 13:48:10 +0200
Subject: [PATCH 34/43] fix: refs #8388 rollback

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

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 85bd657a7..21ad0e41a 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -11,12 +11,10 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
 import SkeletonTable from 'components/ui/SkeletonTable.vue';
 import { tMobile } from 'src/composables/tMobile';
 import getDifferences from 'src/filters/getDifferences';
-import { useStateQueryStore } from 'src/stores/useStateQueryStore';
 
 const { push } = useRouter();
 const quasar = useQuasar();
 const stateStore = useStateStore();
-const stateQuery = useStateQueryStore();
 const { t } = useI18n();
 const { validate } = useValidator();
 const $attrs = useAttrs();

From 0a992094cf6db0f9aab26a82e67eb387b7c77465 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 13 May 2025 14:07:10 +0200
Subject: [PATCH 35/43] refactor: refs #8388 optimize expense fetching logic in
 columns computation

---
 src/pages/InvoiceIn/Card/InvoiceInVat.vue | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 6f04a5415..38e639f46 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -55,15 +55,9 @@ const columns = computed(() => [
                 if (evt.key !== 'Tab') return;
                 const val = evt.target.value;
                 if (!val || isNaN(val)) return;
-                row.expenseFk = (
-                    await axios.get(`Expenses`, {
-                        params: {
-                            filter: JSON.stringify({
-                                where: { id: useAccountShortToStandard(val) },
-                            }),
-                        },
-                    })
-                ).data[0].id;
+                row.expenseFk = expenses.value.find(
+                    (e) => e.id === useAccountShortToStandard(val),
+                )?.id;
             },
         },
     },

From 07f58bbec01a96afce28724c4032e645fae99370 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 13 May 2025 14:48:32 +0200
Subject: [PATCH 36/43] fix: refs #8388 simplify navigation logic in save
 function

---
 src/components/FormModel.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index c4b706a71..faba58b1e 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -248,7 +248,7 @@ async function save() {
             old: originalData.value,
         });
         if ($props.reload) await arrayData.fetch({});
-        if ($props.goTo) return push({ path: $props.goTo });
+        if ($props.goTo) push({ path: $props.goTo });
         hasChanges.value = false;
     } finally {
         isLoading.value = false;

From 2d0cb7277471a3629c1ae711a785b93d4468d7a1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 13 May 2025 16:37:44 +0200
Subject: [PATCH 37/43] refactor: refs #8388 compute totalAmount dynamically
 from arrayData

---
 src/pages/Entry/EntryPreAccount.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 9bd0871a9..3f921f435 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -53,12 +53,16 @@ const warehouses = ref([]);
 const defaultDmsDescription = ref();
 const dmsTypeId = ref();
 const selectedRows = ref([]);
-const totalAmount = ref();
 const hasDiferentDms = ref(false);
 let maxDays;
 let defaultDays;
 let supplierRef;
 let dmsFk;
+
+const totalAmount = computed(() => {
+    return arrayData.store.data.totalAmount ?? 0;
+});
+
 const totalSelectedAmount = computed(() => {
     if (!selectedRows.value.length) return 0;
     return selectedRows.value.reduce((acc, entry) => acc + entry.amount, 0);
@@ -397,13 +401,10 @@ async function createInvoice() {
         :user-params="{ daysAgo, isBooked }"
         :row-click="false"
         :table="{ selection: 'multiple' }"
-        :limit="0"
         :footer="true"
-        @on-fetch="
-            (data) => (totalAmount = data?.reduce((acc, entry) => acc + entry.amount, 0))
-        "
         :selection-fn="(rows) => rows.filter((row) => !row.isBooked)"
         auto-load
+        key-data="preAccounting"
     >
         <template #top-left>
             <QBtn

From 464a739a6bd3330077cfed3f8238edde5d6557cf Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 13 May 2025 17:23:45 +0200
Subject: [PATCH 38/43] refactor: refs #8388 compute totalAmount from fetched
 data instead of static reference

---
 src/pages/Entry/EntryPreAccount.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 3f921f435..9bd0871a9 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -53,16 +53,12 @@ const warehouses = ref([]);
 const defaultDmsDescription = ref();
 const dmsTypeId = ref();
 const selectedRows = ref([]);
+const totalAmount = ref();
 const hasDiferentDms = ref(false);
 let maxDays;
 let defaultDays;
 let supplierRef;
 let dmsFk;
-
-const totalAmount = computed(() => {
-    return arrayData.store.data.totalAmount ?? 0;
-});
-
 const totalSelectedAmount = computed(() => {
     if (!selectedRows.value.length) return 0;
     return selectedRows.value.reduce((acc, entry) => acc + entry.amount, 0);
@@ -401,10 +397,13 @@ async function createInvoice() {
         :user-params="{ daysAgo, isBooked }"
         :row-click="false"
         :table="{ selection: 'multiple' }"
+        :limit="0"
         :footer="true"
+        @on-fetch="
+            (data) => (totalAmount = data?.reduce((acc, entry) => acc + entry.amount, 0))
+        "
         :selection-fn="(rows) => rows.filter((row) => !row.isBooked)"
         auto-load
-        key-data="preAccounting"
     >
         <template #top-left>
             <QBtn

From 79e87833b9e16b0c28d29ec577fd2914b6177560 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 15 May 2025 13:29:40 +0200
Subject: [PATCH 39/43] fix: refs #8388 reload on delete

---
 src/components/CrudModel.vue | 57 ++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 21ad0e41a..4128fa44c 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -131,11 +131,10 @@ async function fetch(data) {
     const rows = keyData ? data[keyData] : data;
     resetData(rows);
     emit('onFetch', rows);
-    $props.insertOnLoad && await insert();
+    $props.insertOnLoad && (await insert());
     return rows;
 }
 
-
 function resetData(data) {
     if (!data) return;
     if (data && Array.isArray(data)) {
@@ -146,15 +145,22 @@ function resetData(data) {
     formData.value = JSON.parse(JSON.stringify(data));
 
     if (watchChanges.value) watchChanges.value(); //destroy watcher
-    watchChanges.value = watch(formData, (nVal) => {
-        hasChanges.value = false;
-        const filteredNewData = nVal.filter(row => !isRowEmpty(row) || row[$props.primaryKey]);
-        const filteredOriginal = originalData.value.filter(row => row[$props.primaryKey]);
+    watchChanges.value = watch(
+        formData,
+        (nVal) => {
+            hasChanges.value = false;
+            const filteredNewData = nVal.filter(
+                (row) => !isRowEmpty(row) || row[$props.primaryKey],
+            );
+            const filteredOriginal = originalData.value.filter(
+                (row) => row[$props.primaryKey],
+            );
 
-        const changes = getDifferences(filteredOriginal, filteredNewData);
-        hasChanges.value = !isEmpty(changes);
-
-    }, { deep: true });
+            const changes = getDifferences(filteredOriginal, filteredNewData);
+            hasChanges.value = !isEmpty(changes);
+        },
+        { deep: true },
+    );
 }
 async function reset() {
     await fetch(originalData.value);
@@ -183,9 +189,8 @@ async function onSubmit() {
         });
     }
     isLoading.value = true;
-    
+
     await saveChanges($props.saveFn ? formData.value : null);
-    
 }
 
 async function onSubmitAndGo() {
@@ -194,10 +199,10 @@ async function onSubmitAndGo() {
 }
 
 async function saveChanges(data) {
-    formData.value = formData.value.filter(row => 
-    row[$props.primaryKey] || !isRowEmpty(row)
+    formData.value = formData.value.filter(
+        (row) => row[$props.primaryKey] || !isRowEmpty(row),
     );
-    
+
     if ($props.saveFn) {
         $props.saveFn(data, getChanges);
         isLoading.value = false;
@@ -228,31 +233,29 @@ async function saveChanges(data) {
 }
 
 async function insert(pushData = { ...$props.dataRequired, ...$props.dataDefault }) {
-    formData.value = formData.value.filter(row => !isRowEmpty(row));
+    formData.value = formData.value.filter((row) => !isRowEmpty(row));
 
     const lastRow = formData.value.at(-1);
     const isLastRowEmpty = lastRow ? isRowEmpty(lastRow) : false;
-    
+
     if (formData.value.length && isLastRowEmpty) return;
     const $index = formData.value.length ? formData.value.at(-1).$index + 1 : 0;
-    
+
     const nRow = Object.assign({ $index }, pushData);
     formData.value.push(nRow);
-    
-    const hasChange = Object.keys(nRow).some(key => !isChange(nRow, key));
+
+    const hasChange = Object.keys(nRow).some((key) => !isChange(nRow, key));
     if (hasChange) hasChanges.value = true;
 }
 
 function isRowEmpty(row) {
-    return Object.keys(row).every(key => isChange(row, key));
+    return Object.keys(row).every((key) => isChange(row, key));
 }
 
-
-function isChange(row,key){
+function isChange(row, key) {
     return !row[key] || key == '$index' || Object.hasOwn($props.dataRequired || {}, key);
 }
 
-
 async function remove(data) {
     if (!data.length)
         return quasar.notify({
@@ -270,7 +273,9 @@ async function remove(data) {
             (form) => !preRemove.some((index) => index == form.$index),
         );
         formData.value = newData;
-        hasChanges.value = JSON.stringify(removeIndexField(formData.value)) !== JSON.stringify(removeIndexField(originalData.value));
+        hasChanges.value =
+            JSON.stringify(removeIndexField(formData.value)) !==
+            JSON.stringify(removeIndexField(originalData.value));
     }
     if (ids.length) {
         quasar
@@ -286,7 +291,7 @@ async function remove(data) {
             })
             .onOk(async () => {
                 newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
-                fetch(newData);
+                await reload();
             });
     }
 

From cf64b7069b9d5e28c3351b2c3ea1e8e178fd42ae Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 15 May 2025 14:38:27 +0200
Subject: [PATCH 40/43] feat: refs #8388 add filter options for intrastat table
 columns and update tests for row operations

---
 .../InvoiceIn/Card/InvoiceInIntrastat.vue     |  1 +
 .../invoiceIn/invoiceInIntrastat.spec.js      | 44 ++++++++++---------
 2 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 6244d94c4..9b2266b4b 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -27,6 +27,7 @@ const columns = computed(() => [
             'data-cy': 'intrastat-code',
             sortBy: 'id',
             fields: ['id', 'description'],
+            filterOptions: ['id', 'description']
         },
         format: (row, dashIfEmpty) => dashIfEmpty(getCode(row)),
         create: true,
diff --git a/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js b/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js
index 6a1c18785..97235b729 100644
--- a/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js
@@ -1,36 +1,38 @@
 /// <reference types="cypress" />
 describe('InvoiceInIntrastat', () => {
-    const firstRow = 'tbody > :nth-child(1)';
-    const thirdRow = 'tbody > :nth-child(3)';
-    const codes = `[data-cy="intrastat-code"]`;
-    const firstRowAmount = `${firstRow} > :nth-child(3)`;
-
+    const firstInstrastat = 'td[data-col-field="intrastatFk"][data-row-index="0"]';
+    const firstAmount = 'td[data-col-field="amount"][data-row-index="0"]';
+    const intrastat = 'Plantas vivas: Esqueje/injerto, Vid';
+    
     beforeEach(() => {
         cy.login('administrative');
         cy.visit(`/#/invoice-in/1/intrastat`);
     });
 
     it('should edit the first line', () => {
-        cy.selectOption(`${firstRow} ${codes}`, 'Plantas vivas: Esqueje/injerto, Vid');
-        cy.get(firstRowAmount).clear();
+        cy.get(firstInstrastat).click().type(`{selectall}{backspace}${intrastat}{enter}`);
+        cy.get(firstAmount).click().type('10{selectall}{backspace}20{enter}');
         cy.saveCard();
-        cy.get(codes)
-            .eq(0)
-            .should('have.value', '6021010: Plantas vivas: Esqueje/injerto, Vid');
+        cy.get(firstInstrastat).should('have.text', `6021010: ${intrastat}`);
     });
 
     it('should add a new row', () => {
-        cy.addRow();
-        cy.fillRow(thirdRow, [
-            false,
-            'Plantas vivas: Esqueje/injerto, Vid',
-            30,
-            10,
-            5,
-            'FR',
-        ]);
-        cy.saveCard();
-        cy.get('.q-notification__message').should('have.text', 'Data saved');
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.fillInForm(
+            {
+                'intrastat-code': {
+                    val: 'Plantas vivas: Esqueje/injerto, Vid',
+                    type: 'select',
+                },
+                Amount_input: '30',
+                Net_input: '10',
+                Stems_input: '5',
+                Country_select: { val: 'FR', type: 'select' },
+            },
+            { attr: 'data-cy' },
+        );
+        cy.dataCy('FormModelPopup_save').click();
+        cy.get('.q-notification__message').should('have.text', 'Data created');
     });
 
     it('should remove the first line', () => {

From 21d36a0d37c9fbe4b2f064548dba0682c104349c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 15 May 2025 16:05:16 +0200
Subject: [PATCH 41/43] refactor: refs #8388 streamline InvoiceInVat tests by
 removing unused variables and improving element selectors

---
 .../invoiceIn/invoiceInVat.spec.js            | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
index ff7d639e6..ad5f4560b 100644
--- a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
@@ -1,11 +1,11 @@
 /// <reference types="cypress" />
 describe('InvoiceInVat', () => {
-    const thirdRow = 'tbody > :nth-child(3)';
-    const firstLineVat = 'tbody > :nth-child(1) ';
-    const vats = '[data-cy="vat-sageiva"]';
     const dialogInputs = '.q-dialog label input';
-    const addBtn = 'tbody tr:nth-child(1) td:nth-child(2) .--add-icon';
     const randomInt = Math.floor(Math.random() * 100);
+    const firstTaxType = 'td[data-col-field="taxTypeSageFk"][data-row-index="0"]';
+    const firstExpense = 'td[data-col-field="expenseFk"][data-row-index="0"]';
+    const firstDeductible = 'td[data-col-field="isDeductible"][data-row-index="0"]';
+    const taxType = 'H.P. IVA 21% CEE';
 
     beforeEach(() => {
         cy.login('administrative');
@@ -13,27 +13,29 @@ describe('InvoiceInVat', () => {
     });
 
     it('should edit the sage iva', () => {
-        cy.selectOption(`${firstLineVat} ${vats}`, 'H.P. IVA 21% CEE');
+        cy.get(firstTaxType).click().type(`{selectall}{backspace}${taxType}{enter}`);
         cy.saveCard();
-        cy.get(vats).eq(0).should('have.value', '8: H.P. IVA 21% CEE');
+        cy.get(firstTaxType).should('have.text', `8: ${taxType}`);
     });
 
     it('should mark the line as deductible VAT', () => {
-        cy.get(`${firstLineVat}  [data-cy="isDeductible_checkbox"]`).click();
-
-        cy.saveCard();
-
-        cy.get(`${firstLineVat}  [data-cy="isDeductible_checkbox"]`)
-
-            .click();
+        cy.get(firstDeductible).click().click();
         cy.saveCard();
+        cy.get('.q-notification__message').should('have.text', 'Data saved');
     });
 
     it('should add a new row', () => {
-        cy.addRow();
-        cy.fillRow(thirdRow, [true, 2000000001, 30, 'H.P. IVA 10']);
-        cy.saveCard();
-        cy.get('.q-notification__message').should('have.text', 'Data saved');
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.fillInForm(
+            {
+                Expense_select: { val: '2000000001', type: 'select' },
+                'Taxable base_input': '30',
+                'vat-sageiva': { val: 'H.P. IVA 10', type: 'select' },
+            },
+            { attr: 'data-cy' },
+        );
+        cy.dataCy('FormModelPopup_save').click();
+        cy.get('.q-notification__message').should('have.text', 'Data created');
     });
 
     it('should remove the first line', () => {
@@ -41,10 +43,10 @@ describe('InvoiceInVat', () => {
     });
 
     it('should correctly handle expense addition', () => {
-        cy.get(addBtn).click();
+        cy.get(firstExpense).click();
+        cy.get('.--add-icon').click();
         cy.get(dialogInputs).eq(0).type(randomInt);
         cy.get(dialogInputs).eq(1).type('This is a dummy expense');
-
         cy.get('[data-cy="FormModelPopup_save"]').click();
         cy.get('.q-notification__message').should('have.text', 'Data created');
     });

From bfa8d6eec5b8d945e81620ffa56da4d4d6911d1e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 16 May 2025 13:33:07 +0200
Subject: [PATCH 42/43] test: refs #8388 change beforeEach to before for login
 and visit in InvoiceInVat tests

---
 test/cypress/integration/invoiceIn/invoiceInVat.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
index ad5f4560b..9da946cab 100644
--- a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
@@ -7,7 +7,7 @@ describe('InvoiceInVat', () => {
     const firstDeductible = 'td[data-col-field="isDeductible"][data-row-index="0"]';
     const taxType = 'H.P. IVA 21% CEE';
 
-    beforeEach(() => {
+    before(() => {
         cy.login('administrative');
         cy.visit(`/#/invoice-in/1/vat`);
     });

From 07c078093fed03128dea87ee8d551d4c5fabfafe Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 16 May 2025 17:24:38 +0200
Subject: [PATCH 43/43] refactor: refs #8388 change beforeEach to before in
 InvoiceInIntrastat tests

---
 test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js b/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js
index 19c29f9a7..3d9f00acf 100644
--- a/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js
@@ -4,7 +4,7 @@ describe('InvoiceInIntrastat', () => {
     const firstAmount = 'td[data-col-field="amount"][data-row-index="0"]';
     const intrastat = 'Plantas vivas: Esqueje/injerto, Vid';
 
-    beforeEach(() => {
+    before(() => {
         cy.login('administrative');
         cy.visit(`/#/invoice-in/1/intrastat`);
     });