From 7a1eb9bec64815ff8187c0cc63dc148ebcfef8e1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 11 Feb 2025 09:28:56 +0100
Subject: [PATCH 01/41] feat: refs #8277 add Entry Control page and update
 localization files

---
 src/i18n/locale/en.yml           |   1 +
 src/i18n/locale/es.yml           |   3 +-
 src/pages/Entry/EntryControl.vue | 146 +++++++++++++++++++++++++++++++
 src/router/modules/entry.js      |  26 +++---
 4 files changed, 164 insertions(+), 12 deletions(-)
 create mode 100644 src/pages/Entry/EntryControl.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index d615eef4c..fe4a0c45d 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -334,6 +334,7 @@ globals:
         parking: Parking
         vehicleList: Vehicles
         vehicle: Vehicle
+        entryControl: Entry control
     unsavedPopup:
         title: Unsaved changes will be lost
         subtitle: Are you sure exit without saving?
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index a082ca88d..956f11e15 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -334,6 +334,7 @@ globals:
         parking: Parking
         vehicleList: Vehículos
         vehicle: Vehículo
+        entryControl: Control de entradas
     unsavedPopup:
         title: Los cambios que no haya guardado se perderán
         subtitle: ¿Seguro que quiere salir sin guardar?
@@ -653,7 +654,7 @@ supplier:
         tableVisibleColumns:
             nif: NIF/CIF
             account: Cuenta
-        
+
     summary:
         responsible: Responsable
         verified: Verificado
diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
new file mode 100644
index 000000000..6fff84539
--- /dev/null
+++ b/src/pages/Entry/EntryControl.vue
@@ -0,0 +1,146 @@
+<script setup>
+import { ref, computed, markRaw } from 'vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import { useI18n } from 'vue-i18n';
+import FetchData from 'src/components/FetchData.vue';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
+
+const { t } = useI18n();
+const companies = ref([]);
+const countries = ref([]);
+const columns = computed(() => [
+    {
+        name: 'supplierFk',
+        label: t('globals.supplier'),
+        format: (row) => row.supplierFk,
+        columnFilter: {
+            component: markRaw(VnSelectSupplier),
+            label: null,
+            name: 'supplierFk',
+            url: 'Suppliers',
+        },
+    },
+    {
+        name: 'companyFk',
+        label: t('globals.company'),
+        columnFilter: {
+            component: 'select',
+            name: 'companyFk',
+            options: companies.value,
+        },
+    },
+    {
+        name: 'gestDocFk',
+        label: t('entry.gestDocFk'),
+    },
+    {
+        name: 'dmsType',
+        label: t('entry.dmsType'),
+        format: (row) => row.dmsType,
+    },
+    {
+        name: 'invoiceNumber',
+        label: t('entry.invoiceNumber'),
+    },
+    {
+        name: 'reference',
+        label: t('entry.reference'),
+    },
+    {
+        name: 'shipped',
+        label: t('entry.shipped'),
+    },
+    {
+        name: 'dated',
+        label: t('entry.dated'),
+    },
+    {
+        name: 'id',
+        label: t('entry.id'),
+        isId: true,
+        chip: {
+            condition: () => true,
+        },
+    },
+    {
+        name: 'invoiceInFk',
+        label: t('entry.invoiceInFk'),
+    },
+    {
+        name: 'country',
+        label: t('globals.country'),
+        format: (row) => row.country,
+        columnFilter: {
+            component: 'select',
+            name: 'country',
+            options: countries.value,
+        },
+    },
+    {
+        name: 'description',
+        label: t('globals.description'),
+    },
+    {
+        name: 'payDem',
+        label: t('entry.payDem'),
+    },
+    {
+        name: 'amount',
+        label: t('amount'),
+    },
+    {
+        name: 'isBooked',
+        label: t('entry.isBooked'),
+    },
+    {
+        name: 'received',
+        label: t('entry.received'),
+    },
+    // {
+    //     name: 'travelFk',
+    //     label: t('entry.travelFk'),
+    // },
+    // {
+    //     name: 'landed',
+    //     label: t('entry.landed'),
+    // },
+    // {
+    //     name: 'agencyMode',
+    //     label: t('entry.agencyMode'),
+    //     format: (row) => row.agencyMode,
+    // },
+    // {
+    //     name: 'isAgricultural',
+    //     label: t('entry.isAgricultural'),
+    // },
+    // {
+    //     name: 'account',
+    //     label: t('globals.account'),
+    // },
+    // {
+    //     name: 'nickname',
+    //     label: t('globals.nickname'),
+    // },
+]);
+</script>
+<template>
+    <FetchData
+        url="Countries"
+        :filter="{ fields: ['id', 'name'] }"
+        @on-fetch="(data) => (countries.value = data)"
+        auto-load
+    />
+    <FetchData
+        url="Companies"
+        :filter="{ fields: ['id', 'name'] }"
+        @on-fetch="(data) => (companies.value = data)"
+        auto-load
+    />
+    <VnTable
+        data-key="entryControl"
+        url="Entries/control"
+        :columns
+        auto-load
+        :right-search="false"
+    />
+</template>
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index f362c7653..5de296803 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -6,13 +6,7 @@ const entryCard = {
     component: () => import('src/pages/Entry/Card/EntryCard.vue'),
     redirect: { name: 'EntrySummary' },
     meta: {
-        menu: [
-            'EntryBasicData',
-            'EntryBuys',
-            'EntryNotes',
-            'EntryDms',
-            'EntryLog',
-        ],
+        menu: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryDms', 'EntryLog'],
     },
     children: [
         {
@@ -91,7 +85,8 @@ export default {
             'EntryLatestBuys',
             'EntryStockBought',
             'EntryWasteRecalc',
-        ]
+            'EntryControl',
+        ],
     },
     component: RouterView,
     redirect: { name: 'EntryMain' },
@@ -103,7 +98,7 @@ export default {
             redirect: { name: 'EntryIndexMain' },
             children: [
                 {
-                    path:'',
+                    path: '',
                     name: 'EntryIndexMain',
                     redirect: { name: 'EntryList' },
                     component: () => import('src/pages/Entry/EntryList.vue'),
@@ -127,7 +122,7 @@ export default {
                         icon: 'add',
                     },
                     component: () => import('src/pages/Entry/EntryCreate.vue'),
-                },                
+                },
                 {
                     path: 'my',
                     name: 'MyEntries',
@@ -164,7 +159,16 @@ export default {
                     },
                     component: () => import('src/pages/Entry/EntryWasteRecalc.vue'),
                 },
+                {
+                    path: 'control',
+                    name: 'EntryControl',
+                    meta: {
+                        title: 'entryControl',
+                        icon: 'help',
+                    },
+                    component: () => import('src/pages/Entry/EntryControl.vue'),
+                },
             ],
         },
     ],
-};
\ No newline at end of file
+};
-- 
2.40.1


From fa7705d2fc8fb8b1420e5d3d0718b2e7e9ab3db0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 12 Feb 2025 09:53:43 +0100
Subject: [PATCH 02/41] feat: refs #8277 add control labels and update column
 definitions in EntryControl component

---
 src/pages/Entry/EntryControl.vue | 112 ++++++++++++++++---------------
 src/pages/Entry/locale/en.yml    |  16 +++++
 src/pages/Entry/locale/es.yml    |  16 +++++
 3 files changed, 91 insertions(+), 53 deletions(-)

diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index 6fff84539..49ded3186 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -9,6 +9,53 @@ const { t } = useI18n();
 const companies = ref([]);
 const countries = ref([]);
 const columns = computed(() => [
+    {
+        name: 'companyFk',
+        label: t('globals.company'),
+        columnFilter: {
+            component: 'select',
+            name: 'companyFk',
+            optionLabel: 'code',
+            options: companies.value,
+        },
+    },
+    {
+        name: 'gestDocFk',
+        label: t('entry.control.gestDocFk'),
+    },
+    {
+        name: 'dmsType',
+        label: t('entry.control.dmsType'),
+        format: (row) => row.dmsType,
+    },
+    {
+        name: 'invoiceNumber',
+        label: t('entry.control.invoiceNumber'),
+    },
+    {
+        name: 'reference',
+        label: t('entry.control.reference'),
+    },
+    {
+        name: 'shipped',
+        label: t('entry.control.shipped'),
+    },
+    {
+        name: 'dated',
+        label: t('entry.control.dated'),
+    },
+    {
+        name: 'id',
+        label: t('entry.control.id'),
+        isId: true,
+        chip: {
+            condition: () => true,
+        },
+    },
+    {
+        name: 'invoiceInFk',
+        label: t('entry.control.invoiceInFk'),
+    },
     {
         name: 'supplierFk',
         label: t('globals.supplier'),
@@ -20,52 +67,6 @@ const columns = computed(() => [
             url: 'Suppliers',
         },
     },
-    {
-        name: 'companyFk',
-        label: t('globals.company'),
-        columnFilter: {
-            component: 'select',
-            name: 'companyFk',
-            options: companies.value,
-        },
-    },
-    {
-        name: 'gestDocFk',
-        label: t('entry.gestDocFk'),
-    },
-    {
-        name: 'dmsType',
-        label: t('entry.dmsType'),
-        format: (row) => row.dmsType,
-    },
-    {
-        name: 'invoiceNumber',
-        label: t('entry.invoiceNumber'),
-    },
-    {
-        name: 'reference',
-        label: t('entry.reference'),
-    },
-    {
-        name: 'shipped',
-        label: t('entry.shipped'),
-    },
-    {
-        name: 'dated',
-        label: t('entry.dated'),
-    },
-    {
-        name: 'id',
-        label: t('entry.id'),
-        isId: true,
-        chip: {
-            condition: () => true,
-        },
-    },
-    {
-        name: 'invoiceInFk',
-        label: t('entry.invoiceInFk'),
-    },
     {
         name: 'country',
         label: t('globals.country'),
@@ -82,7 +83,7 @@ const columns = computed(() => [
     },
     {
         name: 'payDem',
-        label: t('entry.payDem'),
+        label: t('entry.control.payDem'),
     },
     {
         name: 'amount',
@@ -90,11 +91,12 @@ const columns = computed(() => [
     },
     {
         name: 'isBooked',
-        label: t('entry.isBooked'),
+        label: t('entry.control.isBooked'),
     },
     {
         name: 'received',
-        label: t('entry.received'),
+        label: t('entry.control.received'),
+        component: 'checkbox'
     },
     // {
     //     name: 'travelFk',
@@ -127,13 +129,13 @@ const columns = computed(() => [
     <FetchData
         url="Countries"
         :filter="{ fields: ['id', 'name'] }"
-        @on-fetch="(data) => (countries.value = data)"
+        @on-fetch="(data) => (countries = data)"
         auto-load
     />
     <FetchData
         url="Companies"
-        :filter="{ fields: ['id', 'name'] }"
-        @on-fetch="(data) => (companies.value = data)"
+        :filter="{ fields: ['id', 'code'] }"
+        @on-fetch="(data) => (companies = data)"
         auto-load
     />
     <VnTable
@@ -142,5 +144,9 @@ const columns = computed(() => [
         :columns
         auto-load
         :right-search="false"
-    />
+    >
+        <template #column-companyFk="{ row }">
+            {{ row.companyFk }}
+        </template>
+    </VnTable>
 </template>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 80f3491a8..6ed918126 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -78,6 +78,22 @@ entry:
     searchInfo: You can search by entry reference
     descriptorMenu:
         showEntryReport: Show entry report
+    control:
+        gestDocFk: Gestdoc
+        dmsType: Gestdoc type
+        invoiceNumber: Entry ref.
+        reference: Gestdoc ref.
+        shipped:  Shipped
+        dated: Landed
+        id: Entry
+        invoiceInFk: Invoice in
+        supplierFk: Supplier
+        country: Country
+        description: Entry type
+        payDem: Payment term
+        amount: Amount
+        isBooked: B
+        received: R
 entryFilter:
     params:
         invoiceNumber: Invoice number
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index a5b968016..3f9a4b8c2 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -79,6 +79,22 @@ entry:
         showEntryReport: Ver informe del pedido
     search: Buscar entradas
     searchInfo: Puedes buscar por referencia de entrada
+    control:
+        gestDocFk: Gestdoc
+        dmsType: Tipo gestdoc
+        invoiceNumber: Ref. Entrada
+        reference: Ref. gestdoc
+        shipped:  F. envío
+        dated: F. llegada
+        id: Entrada
+        invoiceInFk: Recibida
+        supplierFk: Proveedor
+        country: País
+        description: Tipo de Entrada
+        payDem: Plazo de pago
+        amount: Importe
+        isBooked: C
+        received: R
 entryFilter:
     params:
         invoiceNumber: Núm. factura
-- 
2.40.1


From 1facb04d7a6c84032ebf6b348450bce14d758900 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 12 Feb 2025 18:24:41 +0100
Subject: [PATCH 03/41] feat: refs #8277 update EntryControl component with new
 column definitions and filters

---
 src/pages/Entry/EntryControl.vue | 42 +++++++++++++++++++++++---------
 src/pages/Entry/locale/en.yml    |  5 ++--
 src/pages/Entry/locale/es.yml    |  5 ++--
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index 49ded3186..9354f8b20 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -2,6 +2,7 @@
 import { ref, computed, markRaw } from 'vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import { useI18n } from 'vue-i18n';
+import { toDate, toCurrency } from 'src/filters';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
@@ -10,7 +11,7 @@ const companies = ref([]);
 const countries = ref([]);
 const columns = computed(() => [
     {
-        name: 'companyFk',
+        name: 'company',
         label: t('globals.company'),
         columnFilter: {
             component: 'select',
@@ -26,7 +27,13 @@ const columns = computed(() => [
     {
         name: 'dmsType',
         label: t('entry.control.dmsType'),
-        format: (row) => row.dmsType,
+        columnFilter: {
+            component: 'select',
+            label: null,
+            name: 'dmsType',
+            url: 'DmsTypes',
+            fields: ['id', 'name'],
+        },
     },
     {
         name: 'invoiceNumber',
@@ -39,10 +46,20 @@ const columns = computed(() => [
     {
         name: 'shipped',
         label: t('entry.control.shipped'),
+        format: ({ shipped }, dashIfEmpty) => dashIfEmpty(toDate(shipped)),
+        columnFilter: {
+            component: 'date',
+            name: 'shipped',
+        },
     },
     {
-        name: 'dated',
-        label: t('entry.control.dated'),
+        name: 'landed',
+        label: t('entry.control.landed'),
+        format: ({ landed }, dashIfEmpty) => dashIfEmpty(toDate(landed)),
+        columnFilter: {
+            component: 'date',
+            name: 'landed',
+        },
     },
     {
         name: 'id',
@@ -57,9 +74,9 @@ const columns = computed(() => [
         label: t('entry.control.invoiceInFk'),
     },
     {
-        name: 'supplierFk',
+        name: 'supplier',
         label: t('globals.supplier'),
-        format: (row) => row.supplierFk,
+        format: (row) => row.supplier,
         columnFilter: {
             component: markRaw(VnSelectSupplier),
             label: null,
@@ -70,7 +87,6 @@ const columns = computed(() => [
     {
         name: 'country',
         label: t('globals.country'),
-        format: (row) => row.country,
         columnFilter: {
             component: 'select',
             name: 'country',
@@ -87,16 +103,18 @@ const columns = computed(() => [
     },
     {
         name: 'amount',
-        label: t('amount'),
+        label: t('globals.amount'),
+        format: ({ amount }) => toCurrency(amount),
     },
     {
         name: 'isBooked',
         label: t('entry.control.isBooked'),
+        component: 'checkbox',
     },
     {
         name: 'received',
         label: t('entry.control.received'),
-        component: 'checkbox'
+        component: 'checkbox',
     },
     // {
     //     name: 'travelFk',
@@ -144,9 +162,9 @@ const columns = computed(() => [
         :columns
         auto-load
         :right-search="false"
+        :disable-option="{ card: true }"
+        redirect="Entry"
+        :order="['landed DESC']"
     >
-        <template #column-companyFk="{ row }">
-            {{ row.companyFk }}
-        </template>
     </VnTable>
 </template>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 119b06c37..bd7c4d002 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -136,15 +136,14 @@ entry:
         dmsType: Gestdoc type
         invoiceNumber: Entry ref.
         reference: Gestdoc ref.
-        shipped:  Shipped
-        dated: Landed
+        shipped: Shipped
+        landed: Landed
         id: Entry
         invoiceInFk: Invoice in
         supplierFk: Supplier
         country: Country
         description: Entry type
         payDem: Payment term
-        amount: Amount
         isBooked: B
         received: R
 entryFilter:
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 2519ad726..1c19df4c9 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -92,16 +92,15 @@ entry:
         gestDocFk: Gestdoc
         dmsType: Tipo gestdoc
         invoiceNumber: Ref. Entrada
-        reference: Ref. gestdoc
+        reference: Ref. GestDoc
         shipped: F. envío
-        dated: F. llegada
+        landed: F. llegada
         id: Entrada
         invoiceInFk: Recibida
         supplierFk: Proveedor
         country: País
         description: Tipo de Entrada
         payDem: Plazo de pago
-        amount: Importe
         isBooked: C
         received: R
     params:
-- 
2.40.1


From 234269bdef1eaa71b930866c4eb09f2601ac47e9 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 20 Mar 2025 08:57:13 +0100
Subject: [PATCH 04/41] feat: refs #8277 add entry type selection and
 localization to EntryControl

---
 src/pages/Entry/EntryControl.vue | 37 +++++++++++++++++++++++---------
 src/pages/Entry/locale/en.yml    |  1 +
 src/pages/Entry/locale/es.yml    |  1 +
 3 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index 9354f8b20..d833e5c27 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -9,6 +9,7 @@ import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 const { t } = useI18n();
 const companies = ref([]);
 const countries = ref([]);
+const entryTypes = ref([]);
 const columns = computed(() => [
     {
         name: 'company',
@@ -81,7 +82,6 @@ const columns = computed(() => [
             component: markRaw(VnSelectSupplier),
             label: null,
             name: 'supplierFk',
-            url: 'Suppliers',
         },
     },
     {
@@ -89,13 +89,21 @@ const columns = computed(() => [
         label: t('globals.country'),
         columnFilter: {
             component: 'select',
-            name: 'country',
+            name: 'countryFk',
             options: countries.value,
         },
     },
     {
         name: 'description',
-        label: t('globals.description'),
+        label: t('entry.control.entryType'),
+        columnFilter: {
+            component: 'select',
+            label: null,
+            name: 'typeFk',
+            options: entryTypes.value,
+            optionLabel: 'description',
+            optionValue: 'code',
+        },
     },
     {
         name: 'payDem',
@@ -105,6 +113,10 @@ const columns = computed(() => [
         name: 'amount',
         label: t('globals.amount'),
         format: ({ amount }) => toCurrency(amount),
+        columnFilter: {
+            component: 'number',
+            name: 'amount',
+        },
     },
     {
         name: 'isBooked',
@@ -129,10 +141,10 @@ const columns = computed(() => [
     //     label: t('entry.agencyMode'),
     //     format: (row) => row.agencyMode,
     // },
-    // {
-    //     name: 'isAgricultural',
-    //     label: t('entry.isAgricultural'),
-    // },
+    {
+        name: 'isAgricultural',
+        label: t('entry.isAgricultural'),
+    },
     // {
     //     name: 'account',
     //     label: t('globals.account'),
@@ -156,15 +168,20 @@ const columns = computed(() => [
         @on-fetch="(data) => (companies = data)"
         auto-load
     />
+    <FetchData
+        url="EntryTypes"
+        :filter="{ fields: ['code', 'description'] }"
+        @on-fetch="(data) => (entryTypes = data)"
+        auto-load
+    />
     <VnTable
         data-key="entryControl"
         url="Entries/control"
         :columns
         auto-load
-        :right-search="false"
         :disable-option="{ card: true }"
         redirect="Entry"
         :order="['landed DESC']"
-    >
-    </VnTable>
+        :right-search="false"
+    />
 </template>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 7309384e9..90368e4f0 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -133,6 +133,7 @@ entry:
         payDem: Payment term
         isBooked: B
         received: R
+        entryType: Entry type
 entryFilter:
     params:
         isExcludedFromAvailable: Excluded from available
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 2d58dc49b..6d0afa7e9 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -83,6 +83,7 @@ entry:
         payDem: Plazo de pago
         isBooked: C
         received: R
+        entryType: Tipo de entrada
     params:
         entryFk: Entrada
         observationTypeFk: Tipo de observación
-- 
2.40.1


From 9b3fc523770dd529eca609a431008f5d96d93828 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 20 Mar 2025 18:05:17 +0100
Subject: [PATCH 05/41] feat: refs #8277 add agricultural and account type
 fields, enhance filtering options, and update localization

---
 src/components/common/VnSelect.vue |   6 +-
 src/pages/Entry/EntryControl.vue   | 147 ++++++++++++++++++++++++-----
 src/pages/Entry/locale/en.yml      |   5 +
 src/pages/Entry/locale/es.yml      |   5 +
 4 files changed, 134 insertions(+), 29 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 339f90e0e..1e4f1589e 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -367,7 +367,7 @@ function getCaption(opt) {
     >
         <template #append>
             <QIcon
-                v-show="isClearable && value"
+                v-show="isClearable && value != null && value !== ''"
                 name="close"
                 @click="
                     () => {
@@ -382,7 +382,7 @@ function getCaption(opt) {
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
             <div v-if="slotName == 'append'">
                 <QIcon
-                    v-show="isClearable && value"
+                    v-show="isClearable && value != null && value !== ''"
                     name="close"
                     @click.stop="
                         () => {
@@ -407,7 +407,7 @@ function getCaption(opt) {
                     <QItemLabel>
                         {{ opt[optionLabel] }}
                     </QItemLabel>
-                    <QItemLabel caption v-if="getCaption(opt)">
+                    <QItemLabel caption v-if="getCaption(opt) !== false">
                         {{ `#${getCaption(opt)}` }}
                     </QItemLabel>
                 </QItemSection>
diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index d833e5c27..eac7f7629 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -1,16 +1,44 @@
 <script setup>
-import { ref, computed, markRaw } from 'vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
+import { ref, computed, markRaw, useTemplateRef, onBeforeMount } from 'vue';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate, toCurrency } from 'src/filters';
+import { useArrayData } from 'src/composables/useArrayData';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
+import EntryDescriptorProxy from './Card/EntryDescriptorProxy.vue';
+import SupplierDescriptorProxy from '../Supplier/Card/SupplierDescriptorProxy.vue';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
 const { t } = useI18n();
+const route = useRoute();
+const MAXDAYS = 365;
+const DEFAULTDAYS = 60;
+const dataKey = 'entryControl';
+const url = 'Entries/control';
+let arrayData = useArrayData(dataKey);
+const daysAgo = ref();
+const table = useTemplateRef('table');
 const companies = ref([]);
 const countries = ref([]);
 const entryTypes = ref([]);
+const entryAccounts = ref([]);
+const warehouses = ref([]);
 const columns = computed(() => [
+    {
+        name: 'id',
+        label: t('entry.control.id'),
+        isId: true,
+        chip: {
+            condition: () => true,
+        },
+    },
+    {
+        name: 'invoiceNumber',
+        label: t('entry.control.invoiceNumber'),
+    },
     {
         name: 'company',
         label: t('globals.company'),
@@ -21,6 +49,15 @@ const columns = computed(() => [
             options: companies.value,
         },
     },
+    {
+        name: 'warehouse',
+        label: t('globals.warehouse'),
+        columnFilter: {
+            component: 'select',
+            name: 'warehouseInFk',
+            options: warehouses.value,
+        },
+    },
     {
         name: 'gestDocFk',
         label: t('entry.control.gestDocFk'),
@@ -36,10 +73,6 @@ const columns = computed(() => [
             fields: ['id', 'name'],
         },
     },
-    {
-        name: 'invoiceNumber',
-        label: t('entry.control.invoiceNumber'),
-    },
     {
         name: 'reference',
         label: t('entry.control.reference'),
@@ -62,14 +95,6 @@ const columns = computed(() => [
             name: 'landed',
         },
     },
-    {
-        name: 'id',
-        label: t('entry.control.id'),
-        isId: true,
-        chip: {
-            condition: () => true,
-        },
-    },
     {
         name: 'invoiceInFk',
         label: t('entry.control.invoiceInFk'),
@@ -108,6 +133,20 @@ const columns = computed(() => [
     {
         name: 'payDem',
         label: t('entry.control.payDem'),
+        columnFilter: {
+            component: 'number',
+            name: 'payDem',
+        },
+    },
+    {
+        name: 'accountType',
+        label: t('entry.control.accountType'),
+        columnFilter: {
+            component: 'select',
+            name: 'accountType',
+            options: entryAccounts.value,
+            optionLabel: 'account',
+        },
     },
     {
         name: 'amount',
@@ -118,6 +157,11 @@ const columns = computed(() => [
             name: 'amount',
         },
     },
+    {
+        name: 'isAgricultural',
+        label: t('entry.control.isAgricultural'),
+        component: 'checkbox',
+    },
     {
         name: 'isBooked',
         label: t('entry.control.isBooked'),
@@ -133,18 +177,10 @@ const columns = computed(() => [
     //     label: t('entry.travelFk'),
     // },
     // {
-    //     name: 'landed',
-    //     label: t('entry.landed'),
-    // },
-    // {
     //     name: 'agencyMode',
     //     label: t('entry.agencyMode'),
     //     format: (row) => row.agencyMode,
     // },
-    {
-        name: 'isAgricultural',
-        label: t('entry.isAgricultural'),
-    },
     // {
     //     name: 'account',
     //     label: t('globals.account'),
@@ -154,6 +190,20 @@ const columns = computed(() => [
     //     label: t('globals.nickname'),
     // },
 ]);
+
+onBeforeMount(() => {
+    const curParams = JSON.parse(route.query[dataKey] ?? '{}');
+    const val = curParams.daysAgo ?? DEFAULTDAYS;
+    route.query[dataKey] = JSON.stringify({ ...curParams, daysAgo: val });
+    daysAgo.value = val;
+});
+
+function filterByDaysAgo(val) {
+    if (!val || val > MAXDAYS) val = MAXDAYS;
+    daysAgo.value = val;
+    arrayData.store.userParams.daysAgo = daysAgo.value;
+    table.value.reload();
+}
 </script>
 <template>
     <FetchData
@@ -168,20 +218,65 @@ const columns = computed(() => [
         @on-fetch="(data) => (companies = data)"
         auto-load
     />
+    <FetchData
+        url="Warehouses"
+        :filter="{ fields: ['id', 'name'] }"
+        @on-fetch="(data) => (warehouses = data)"
+        auto-load
+    />
     <FetchData
         url="EntryTypes"
         :filter="{ fields: ['code', 'description'] }"
         @on-fetch="(data) => (entryTypes = data)"
         auto-load
     />
-    <VnTable
-        data-key="entryControl"
-        url="Entries/control"
-        :columns
+    <FetchData
+        url="EntryAccounts"
+        :filter="{ fields: ['id', 'account'] }"
+        @on-fetch="(data) => (entryAccounts = data)"
         auto-load
+    />
+    <VnSearchbar
+        :data-key
+        :url
+        :label="t('entry.control.search')"
+        :info="t('entry.control.searchInfo')"
+    />
+    <VnTable
+        :data-key
+        :columns
+        :search-url="dataKey"
+        ref="table"
+        :url
         :disable-option="{ card: true }"
         redirect="Entry"
         :order="['landed DESC']"
         :right-search="false"
-    />
+        :user-params="{ daysAgo }"
+    >
+        <template #top-left>
+            <VnInputNumber
+                v-model="daysAgo"
+                :label="$t('globals.daysAgo')"
+                dense
+                :step="1"
+                :decimal-places="0"
+                @update:model-value="filterByDaysAgo"
+                debounce="500"
+                :title="t('entry.control.daysAgo')"
+            />
+        </template>
+        <template #column-id="{ row }">
+            <span class="link" @click.stop>
+                {{ row.id }}
+                <EntryDescriptorProxy :id="row.id" />
+            </span>
+        </template>
+        <template #column-supplier="{ row }">
+            <span class="link" @click.stop>
+                {{ row.supplier }}
+                <SupplierDescriptorProxy :id="row.supplierFk" />
+            </span>
+        </template>
+    </VnTable>
 </template>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 90368e4f0..0124ffb63 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -134,6 +134,11 @@ entry:
         isBooked: B
         received: R
         entryType: Entry type
+        isAgricultural: Agricultural
+        accountType: Account type
+        daysAgo: Max 360 days
+        search: Search
+        searchInfo: You can search by supplier name or nickname 
 entryFilter:
     params:
         isExcludedFromAvailable: Excluded from available
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 6d0afa7e9..7b3d22696 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -84,6 +84,11 @@ entry:
         isBooked: C
         received: R
         entryType: Tipo de entrada
+        isAgricultural: Agricultural
+        accountType: Tipo de cuenta
+        daysAgo: Máximo 360 días
+        search: Buscar
+        searchInfo: Puedes buscar por nombre o alias de proveedor
     params:
         entryFk: Entrada
         observationTypeFk: Tipo de observación
-- 
2.40.1


From 456eb0a8e407a707008fe9b0c846e7c1f7168912 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 21 Mar 2025 09:04:39 +0100
Subject: [PATCH 06/41] fix: refs #8277 update daysAgo limit to 365 days in
 localization files

---
 src/pages/Entry/locale/en.yml | 4 ++--
 src/pages/Entry/locale/es.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 0124ffb63..22106a2da 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -136,9 +136,9 @@ entry:
         entryType: Entry type
         isAgricultural: Agricultural
         accountType: Account type
-        daysAgo: Max 360 days
+        daysAgo: Max 365 days
         search: Search
-        searchInfo: You can search by supplier name or nickname 
+        searchInfo: You can search by supplier name or nickname
 entryFilter:
     params:
         isExcludedFromAvailable: Excluded from available
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 7b3d22696..88e3cdb5f 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -86,7 +86,7 @@ entry:
         entryType: Tipo de entrada
         isAgricultural: Agricultural
         accountType: Tipo de cuenta
-        daysAgo: Máximo 360 días
+        daysAgo: Máximo 365 días
         search: Buscar
         searchInfo: Puedes buscar por nombre o alias de proveedor
     params:
-- 
2.40.1


From b528bb4ed1756632aa428bae845259a1d4482970 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 21 Mar 2025 10:15:15 +0100
Subject: [PATCH 07/41] fix: refs #8277 update daysAgo handling to use watch
 for reactive updates and set max limit to 365

---
 src/pages/Entry/EntryControl.vue | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index eac7f7629..96e41f643 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -1,10 +1,9 @@
 <script setup>
-import VnTable from 'src/components/VnTable/VnTable.vue';
-import { ref, computed, markRaw, useTemplateRef, onBeforeMount } from 'vue';
-import { useRoute } from 'vue-router';
+import { ref, computed, markRaw, useTemplateRef, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { toDate, toCurrency } from 'src/filters';
 import { useArrayData } from 'src/composables/useArrayData';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 import EntryDescriptorProxy from './Card/EntryDescriptorProxy.vue';
@@ -13,12 +12,11 @@ import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
 const { t } = useI18n();
-const route = useRoute();
 const MAXDAYS = 365;
 const DEFAULTDAYS = 60;
 const dataKey = 'entryControl';
 const url = 'Entries/control';
-let arrayData = useArrayData(dataKey);
+const arrayData = useArrayData(dataKey);
 const daysAgo = ref();
 const table = useTemplateRef('table');
 const companies = ref([]);
@@ -191,15 +189,19 @@ const columns = computed(() => [
     // },
 ]);
 
-onBeforeMount(() => {
-    const curParams = JSON.parse(route.query[dataKey] ?? '{}');
-    const val = curParams.daysAgo ?? DEFAULTDAYS;
-    route.query[dataKey] = JSON.stringify({ ...curParams, daysAgo: val });
-    daysAgo.value = val;
-});
+watch(
+    () => arrayData.store.userParams.daysAgo,
+    (nVal, oVal) => {
+        if (!oVal && !nVal) daysAgo.value = DEFAULTDAYS;
+        else if (!nVal) daysAgo.value = MAXDAYS;
+        else daysAgo.value = nVal;
+    },
+    { immediate: true },
+);
 
 function filterByDaysAgo(val) {
-    if (!val || val > MAXDAYS) val = MAXDAYS;
+    if (!val) val = DEFAULTDAYS;
+    else if (val > MAXDAYS) val = MAXDAYS;
     daysAgo.value = val;
     arrayData.store.userParams.daysAgo = daysAgo.value;
     table.value.reload();
@@ -263,6 +265,7 @@ function filterByDaysAgo(val) {
                 :decimal-places="0"
                 @update:model-value="filterByDaysAgo"
                 debounce="500"
+                max="365"
                 :title="t('entry.control.daysAgo')"
             />
         </template>
-- 
2.40.1


From dbb8d2a1153105f372b9b69c92062d69496da7aa Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 21 Mar 2025 12:25:14 +0100
Subject: [PATCH 08/41] feat: refs #8277 add pre-account functionality and
 update daysAgo handling in EntryControl

---
 src/pages/Entry/EntryControl.vue | 33 ++++++++++++++++++++++----------
 src/pages/Entry/locale/en.yml    |  1 +
 src/pages/Entry/locale/es.yml    |  1 +
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index 96e41f643..3c9dd8d09 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, markRaw, useTemplateRef, watch } from 'vue';
+import { ref, computed, markRaw, useTemplateRef, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { toDate, toCurrency } from 'src/filters';
 import { useArrayData } from 'src/composables/useArrayData';
@@ -10,6 +10,7 @@ import EntryDescriptorProxy from './Card/EntryDescriptorProxy.vue';
 import SupplierDescriptorProxy from '../Supplier/Card/SupplierDescriptorProxy.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import axios from 'axios';
 
 const { t } = useI18n();
 const MAXDAYS = 365;
@@ -24,6 +25,7 @@ const countries = ref([]);
 const entryTypes = ref([]);
 const entryAccounts = ref([]);
 const warehouses = ref([]);
+const selectedRows = ref([]);
 const columns = computed(() => [
     {
         name: 'id',
@@ -189,15 +191,7 @@ const columns = computed(() => [
     // },
 ]);
 
-watch(
-    () => arrayData.store.userParams.daysAgo,
-    (nVal, oVal) => {
-        if (!oVal && !nVal) daysAgo.value = DEFAULTDAYS;
-        else if (!nVal) daysAgo.value = MAXDAYS;
-        else daysAgo.value = nVal;
-    },
-    { immediate: true },
-);
+onBeforeMount(() => (daysAgo.value = arrayData.store.userParams.daysAgo || DEFAULTDAYS));
 
 function filterByDaysAgo(val) {
     if (!val) val = DEFAULTDAYS;
@@ -206,6 +200,12 @@ function filterByDaysAgo(val) {
     arrayData.store.userParams.daysAgo = daysAgo.value;
     table.value.reload();
 }
+
+async function preAccount() {
+    await axios.post('Entries/preAccount', {
+        ids: selectedRows.value.map((row) => row.id),
+    });
+}
 </script>
 <template>
     <FetchData
@@ -243,8 +243,10 @@ function filterByDaysAgo(val) {
         :url
         :label="t('entry.control.search')"
         :info="t('entry.control.searchInfo')"
+        :search-remove-params="false"
     />
     <VnTable
+        v-model:selected="selectedRows"
         :data-key
         :columns
         :search-url="dataKey"
@@ -255,8 +257,19 @@ function filterByDaysAgo(val) {
         :order="['landed DESC']"
         :right-search="false"
         :user-params="{ daysAgo }"
+        :row-click="false"
+        :table="{ selection: 'multiple' }"
     >
         <template #top-left>
+            <QBtn
+                icon="account_balance"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows.length"
+                @click="preAccount"
+            >
+                <QTooltip>{{ t('entry.control.preAccount') }}</QTooltip>
+            </QBtn>
             <VnInputNumber
                 v-model="daysAgo"
                 :label="$t('globals.daysAgo')"
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 22106a2da..be954b771 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -139,6 +139,7 @@ entry:
         daysAgo: Max 365 days
         search: Search
         searchInfo: You can search by supplier name or nickname
+        preAccount: Pre-account
 entryFilter:
     params:
         isExcludedFromAvailable: Excluded from available
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 88e3cdb5f..6e8c85c6d 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -89,6 +89,7 @@ entry:
         daysAgo: Máximo 365 días
         search: Buscar
         searchInfo: Puedes buscar por nombre o alias de proveedor
+        preAccount: Precontabilizar
     params:
         entryFk: Entrada
         observationTypeFk: Tipo de observación
-- 
2.40.1


From 890667c8a6d9b4dc84d35b54502dc7a40497d007 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 24 Mar 2025 15:24:21 +0100
Subject: [PATCH 09/41] fix: refs #8277 add 'fit' class to supplier select
 component in EntryControl

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

diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index 3c9dd8d09..2ec121657 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -107,6 +107,7 @@ const columns = computed(() => [
             component: markRaw(VnSelectSupplier),
             label: null,
             name: 'supplierFk',
+            class: 'fit'
         },
     },
     {
-- 
2.40.1


From 41c2c560133d75aea2796d17beb911f1ee154103 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 24 Mar 2025 15:48:24 +0100
Subject: [PATCH 10/41] chore: refs #8277 notes

---
 src/pages/Entry/EntryControl.vue | 43 +++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index 2ec121657..8874c3756 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -107,7 +107,7 @@ const columns = computed(() => [
             component: markRaw(VnSelectSupplier),
             label: null,
             name: 'supplierFk',
-            class: 'fit'
+            class: 'fit',
         },
     },
     {
@@ -203,6 +203,47 @@ function filterByDaysAgo(val) {
 }
 
 async function preAccount() {
+    // MIsmo proveedor
+
+    // Check if it is agricultural
+    // si , sacar referencia de factura()
+
+    /*     If vIsFarmer Then
+
+vYearSupplierRef = db.getValueV("SELECT YEAR(t.landed) " & _
+                                    "FROM vn.entry e " & _
+                                        "JOIN vn.travel t ON t.id = e.travelFk " & _
+                                    "WHERE e.id = # ", vEntry)
+
+vSupplierRef = Nz(db.getValueV("SELECT IFNULL(MAX(CAST(ii.supplierRef AS UNSIGNED)) + 1, YEAR('" & vnNow() & "') * 1000 + 1) " & _
+                                "FROM vn.invoiceIn ii " & _
+                                    "JOIN vn.supplier s ON s.id = ii.supplierFk " & _
+                                    "JOIN vn.invoiceInConfig iic ON iic.sageFarmerWithholdingFk = s.withholdingSageFk " & _
+                                "WHERE ii.companyFk = # " & _
+                                    "AND YEAR(ii.issued) = # " & _
+                                    "AND supplierRef LIKE CONCAT('%',YEAR(ii.issued),'%') ", _
+                            rs("empresa_id"), _
+                            vYearSupplierRef), 0)
+
+If vSupplierRef = 0 Then
+     vSupplierRef = vYearSupplierRef & "001" 
+End If
+
+Else
+vSupplierRef = db.getValueV("SELECT reference FROM vn.dms WHERE id = #", Nz(Me.gestdoc_id, 0))
+End If */
+
+// no es agricultural 
+    // check if has gestdoc
+    // Yes, ask for inherit gestdoc or not
+    // No, open VNDms popup con los argumentos del codigo access
+
+    // Generar factura 
+    // Cabecera, 
+// ..........................................
+    // lineas...<
+    // Actualizar entradas (contabilizada, numero de factura) MAS TARDE
+
     await axios.post('Entries/preAccount', {
         ids: selectedRows.value.map((row) => row.id),
     });
-- 
2.40.1


From 06f721ae027e6a42e9187938bb6b223b336ce69a Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 25 Mar 2025 09:35:50 +0100
Subject: [PATCH 11/41] fix: refs #8277 validate supplier and company
 consistency in preAccount function

---
 src/pages/Entry/EntryControl.vue | 44 ++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index 8874c3756..f1b7196fc 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -11,8 +11,10 @@ import SupplierDescriptorProxy from '../Supplier/Card/SupplierDescriptorProxy.vu
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import axios from 'axios';
+import useNotify from 'src/composables/useNotify';
 
 const { t } = useI18n();
+const { notify } = useNotify();
 const MAXDAYS = 365;
 const DEFAULTDAYS = 60;
 const dataKey = 'entryControl';
@@ -203,18 +205,26 @@ function filterByDaysAgo(val) {
 }
 
 async function preAccount() {
-    // MIsmo proveedor
+    let selectedAgri;
+    const entries = selectedRows.value;
+    
+    for (const i in entries) {
+        const { supplierFk, companyFk, isAgricultural } = entries[i];
+        const nextEntry = entries[+i + 1];
+
+        if (!selectedAgri && isAgricultural) selectedAgri = entries[i];
+        if (!nextEntry) return;
+        else if (nextEntry.supplierFk !== supplierFk || nextEntry.companyFk !== companyFk)
+            return notify('Entries must have the same supplier and company', 'negative');
+
+    }
 
     // Check if it is agricultural
-    // si , sacar referencia de factura()
-
+    if(selectedAgri){
+        const supplierYearRef = new Date(selectedAgri.landed).getFullYear();
+    }
+    
     /*     If vIsFarmer Then
-
-vYearSupplierRef = db.getValueV("SELECT YEAR(t.landed) " & _
-                                    "FROM vn.entry e " & _
-                                        "JOIN vn.travel t ON t.id = e.travelFk " & _
-                                    "WHERE e.id = # ", vEntry)
-
 vSupplierRef = Nz(db.getValueV("SELECT IFNULL(MAX(CAST(ii.supplierRef AS UNSIGNED)) + 1, YEAR('" & vnNow() & "') * 1000 + 1) " & _
                                 "FROM vn.invoiceIn ii " & _
                                     "JOIN vn.supplier s ON s.id = ii.supplierFk " & _
@@ -226,27 +236,27 @@ vSupplierRef = Nz(db.getValueV("SELECT IFNULL(MAX(CAST(ii.supplierRef AS UNSIGNE
                             vYearSupplierRef), 0)
 
 If vSupplierRef = 0 Then
-     vSupplierRef = vYearSupplierRef & "001" 
+     vSupplierRef = vYearSupplierRef & "001"
 End If
 
 Else
 vSupplierRef = db.getValueV("SELECT reference FROM vn.dms WHERE id = #", Nz(Me.gestdoc_id, 0))
 End If */
 
-// no es agricultural 
+    // no es agricultural
     // check if has gestdoc
     // Yes, ask for inherit gestdoc or not
     // No, open VNDms popup con los argumentos del codigo access
 
-    // Generar factura 
-    // Cabecera, 
-// ..........................................
+    // Generar factura
+    // Cabecera,
+    // ..........................................
     // lineas...<
     // Actualizar entradas (contabilizada, numero de factura) MAS TARDE
 
-    await axios.post('Entries/preAccount', {
-        ids: selectedRows.value.map((row) => row.id),
-    });
+    // await axios.post('Entries/preAccount', {
+    //     ids: selectedRows.value.map((row) => row.id),
+    // });
 }
 </script>
 <template>
-- 
2.40.1


From a1840f14df87ba28444f336e0d9747620dba85a5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 25 Mar 2025 16:19:16 +0100
Subject: [PATCH 12/41] feat: refs #8277 add confirmation dialog for
 pre-accounting entries and update localization

---
 src/components/ui/VnConfirm.vue  |  38 +++++-----
 src/pages/Entry/EntryControl.vue | 126 +++++++++++++++++++++++--------
 src/pages/Entry/locale/en.yml    |   3 +
 src/pages/Entry/locale/es.yml    |   3 +
 4 files changed, 121 insertions(+), 49 deletions(-)

diff --git a/src/components/ui/VnConfirm.vue b/src/components/ui/VnConfirm.vue
index c6f539879..5714db9b2 100644
--- a/src/components/ui/VnConfirm.vue
+++ b/src/components/ui/VnConfirm.vue
@@ -89,24 +89,26 @@ function cancel() {
                 <slot name="customHTML"></slot>
             </QCardSection>
             <QCardActions align="right">
-                <QBtn
-                    :label="t('globals.cancel')"
-                    color="primary"
-                    :disable="isLoading"
-                    flat
-                    @click="cancel()"
-                    data-cy="VnConfirm_cancel"
-                />
-                <QBtn
-                    :label="t('globals.confirm')"
-                    :title="t('globals.confirm')"
-                    color="primary"
-                    :loading="isLoading"
-                    @click="confirm()"
-                    unelevated
-                    autofocus
-                    data-cy="VnConfirm_confirm"
-                />
+                <slot name="actions" :actions="{ confirm, cancel }">
+                    <QBtn
+                        :label="t('globals.cancel')"
+                        color="primary"
+                        :disable="isLoading"
+                        flat
+                        @click="cancel()"
+                        data-cy="VnConfirm_cancel"
+                    />
+                    <QBtn
+                        :label="t('globals.confirm')"
+                        :title="t('globals.confirm')"
+                        color="primary"
+                        :loading="isLoading"
+                        @click="confirm()"
+                        unelevated
+                        autofocus
+                        data-cy="VnConfirm_confirm"
+                    />
+                </slot>
             </QCardActions>
         </QCard>
     </QDialog>
diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index f1b7196fc..1cad0a4e5 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -12,15 +12,21 @@ import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify';
+import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import VnDms from 'src/components/common/VnDms.vue';
+import { date } from 'quasar';
 
 const { t } = useI18n();
 const { notify } = useNotify();
+const dialog = ref();
+const dmsDialog = ref();
 const MAXDAYS = 365;
 const DEFAULTDAYS = 60;
 const dataKey = 'entryControl';
 const url = 'Entries/control';
 const arrayData = useArrayData(dataKey);
 const daysAgo = ref();
+const dmsData = ref();
 const table = useTemplateRef('table');
 const companies = ref([]);
 const countries = ref([]);
@@ -28,6 +34,8 @@ const entryTypes = ref([]);
 const entryAccounts = ref([]);
 const warehouses = ref([]);
 const selectedRows = ref([]);
+let selectedGestDoc;
+let supplierRef;
 const columns = computed(() => [
     {
         name: 'id',
@@ -207,57 +215,89 @@ function filterByDaysAgo(val) {
 async function preAccount() {
     let selectedAgri;
     const entries = selectedRows.value;
-    
+
     for (const i in entries) {
         const { supplierFk, companyFk, isAgricultural } = entries[i];
         const nextEntry = entries[+i + 1];
 
+        // Is It agricultural?
         if (!selectedAgri && isAgricultural) selectedAgri = entries[i];
-        if (!nextEntry) return;
+        // Has It gestDoc?
+        if (!selectedGestDoc && entries[i].gestDocFk) selectedGestDoc = entries[i];
+        // Is It same supplier and company?
+        if (!nextEntry) break;
         else if (nextEntry.supplierFk !== supplierFk || nextEntry.companyFk !== companyFk)
             return notify('Entries must have the same supplier and company', 'negative');
-
     }
 
-    // Check if it is agricultural
-    if(selectedAgri){
-        const supplierYearRef = new Date(selectedAgri.landed).getFullYear();
+    // If It's agricultural, get the supplierRef
+    if (selectedAgri) {
+        const year = new Date(selectedAgri.landed).getFullYear();
+        supplierRef = (
+            await axios.get('InvoiceIns/getMaxRef', {
+                params: { companyFk: selectedAgri.companyFk, year },
+            })
+        ).data?.supplierRef;
+
+        return createInvoice(true);
+    } else if (selectedGestDoc) {
+        // If There's a allocated file for an entry? Ask to (update/updlod) the file
+        dialog.value.show();
+    } else {
+        // If There's no gestDoc, upload the file
+        uploadFile();
     }
-    
-    /*     If vIsFarmer Then
-vSupplierRef = Nz(db.getValueV("SELECT IFNULL(MAX(CAST(ii.supplierRef AS UNSIGNED)) + 1, YEAR('" & vnNow() & "') * 1000 + 1) " & _
-                                "FROM vn.invoiceIn ii " & _
-                                    "JOIN vn.supplier s ON s.id = ii.supplierFk " & _
-                                    "JOIN vn.invoiceInConfig iic ON iic.sageFarmerWithholdingFk = s.withholdingSageFk " & _
-                                "WHERE ii.companyFk = # " & _
-                                    "AND YEAR(ii.issued) = # " & _
-                                    "AND supplierRef LIKE CONCAT('%',YEAR(ii.issued),'%') ", _
-                            rs("empresa_id"), _
-                            vYearSupplierRef), 0)
-
-If vSupplierRef = 0 Then
-     vSupplierRef = vYearSupplierRef & "001"
-End If
-
-Else
-vSupplierRef = db.getValueV("SELECT reference FROM vn.dms WHERE id = #", Nz(Me.gestdoc_id, 0))
-End If */
-
-    // no es agricultural
-    // check if has gestdoc
-    // Yes, ask for inherit gestdoc or not
-    // No, open VNDms popup con los argumentos del codigo access
 
     // Generar factura
     // Cabecera,
     // ..........................................
-    // lineas...<
+    // lineas...
     // Actualizar entradas (contabilizada, numero de factura) MAS TARDE
 
     // await axios.post('Entries/preAccount', {
     //     ids: selectedRows.value.map((row) => row.id),
     // });
 }
+
+async function updateFile() {
+    await axios.post(`Dms/${selectedGestDoc.gestDocFk}/updateFile`, { dmsTypeId: 1 });
+}
+
+async function uploadFile() {
+    const firstSelectedEntry = selectedRows.value.at(0);
+    const { supplier, warehouseInFk, companyFk, invoiceNumber } = firstSelectedEntry;
+    dmsData.value = {
+        dmsTypeFk: 1,
+        warehouseFk: warehouseInFk,
+        companyFk: companyFk,
+        description: supplier + '.Fact: ' + invoiceNumber,
+        reference: invoiceNumber,
+    };
+    dmsDialog.value.show();
+}
+
+async function createInvoice(isAgricultural) {
+    const {
+        supplierFk,
+        landed,
+        shipped,
+        companyFk,
+        currencyFk,
+        gestDocFk: docFk,
+    } = selectedRows.value.at(0);
+    const lastDay = new Date(landed.getFullYear(), landed.getMonth() + 1, 0).getDate();
+    const issued = isAgricultural ? lastDay : shipped;
+    const siiTrascendencyInvoiceInFk = isAgricultural ? 2 : 1;
+    await axios.post('InvoiceIns', {
+        supplierFk,
+        supplierRef,
+        issued,
+        companyFk,
+        docFk,
+        currencyFk,
+        siiTrascendencyInvoiceInFk,
+    });
+}
 </script>
 <template>
     <FetchData
@@ -347,4 +387,28 @@ End If */
             </span>
         </template>
     </VnTable>
+    <VnConfirm
+        ref="dialog"
+        :title="t('entry.control.dialog.title')"
+        :message="t('entry.control.dialog.message')"
+    >
+        <template #actions>
+            <QBtn
+                :label="t('globals.yes')"
+                color="primary"
+                @click="updateFile"
+                autofocus
+            />
+            <QBtn :label="t('globals.no')" color="primary" flat @click="uploadFile" />
+            <QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
+        </template>
+    </VnConfirm>
+    <QDialog ref="dmsDialog">
+        <VnDms
+            model="dms"
+            :form-initial-data="dmsData"
+            url="Dms/uploadFile"
+            @data-saved="dmsData = null"
+        />
+    </QDialog>
 </template>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index be954b771..259c9e476 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -140,6 +140,9 @@ entry:
         search: Search
         searchInfo: You can search by supplier name or nickname
         preAccount: Pre-account
+        dialog:
+            title: Pre-account entries
+            message: Do you want the invoice to inherit the entry document?
 entryFilter:
     params:
         isExcludedFromAvailable: Excluded from available
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 1deb029bf..1b7d4701e 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -91,6 +91,9 @@ entry:
         search: Buscar
         searchInfo: Puedes buscar por nombre o alias de proveedor
         preAccount: Precontabilizar
+        dialog:
+            title: Precontabilizar entradas
+            message: ¿Desea que la factura herede el documento de la entrada?
     params:
         entryFk: Entrada
         observationTypeFk: Tipo de observación
-- 
2.40.1


From 1badf92b1cf9782f7626c6677771b2ffb148940f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 25 Mar 2025 17:28:13 +0100
Subject: [PATCH 13/41] feat: refs #8277 enhance pre-accounting process and
 integrate user warehouse data

---
 src/pages/Entry/EntryControl.vue | 54 ++++++++++++++++++--------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index 1cad0a4e5..23f92cffb 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -14,10 +14,11 @@ import axios from 'axios';
 import useNotify from 'src/composables/useNotify';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import VnDms from 'src/components/common/VnDms.vue';
-import { date } from 'quasar';
+import { useState } from 'src/composables/useState';
 
 const { t } = useI18n();
 const { notify } = useNotify();
+const user = useState().getUser();
 const dialog = ref();
 const dmsDialog = ref();
 const MAXDAYS = 365;
@@ -237,7 +238,7 @@ async function preAccount() {
             await axios.get('InvoiceIns/getMaxRef', {
                 params: { companyFk: selectedAgri.companyFk, year },
             })
-        ).data?.supplierRef;
+        ).data;
 
         return createInvoice(true);
     } else if (selectedGestDoc) {
@@ -247,28 +248,19 @@ async function preAccount() {
         // If There's no gestDoc, upload the file
         uploadFile();
     }
-
-    // Generar factura
-    // Cabecera,
-    // ..........................................
-    // lineas...
-    // Actualizar entradas (contabilizada, numero de factura) MAS TARDE
-
-    // await axios.post('Entries/preAccount', {
-    //     ids: selectedRows.value.map((row) => row.id),
-    // });
 }
 
 async function updateFile() {
     await axios.post(`Dms/${selectedGestDoc.gestDocFk}/updateFile`, { dmsTypeId: 1 });
+    table.value.reload();
 }
 
 async function uploadFile() {
     const firstSelectedEntry = selectedRows.value.at(0);
-    const { supplier, warehouseInFk, companyFk, invoiceNumber } = firstSelectedEntry;
+    const { supplier, companyFk, invoiceNumber } = firstSelectedEntry;
     dmsData.value = {
         dmsTypeFk: 1,
-        warehouseFk: warehouseInFk,
+        warehouseFk: user.value.warehouseFk,
         companyFk: companyFk,
         description: supplier + '.Fact: ' + invoiceNumber,
         reference: invoiceNumber,
@@ -285,18 +277,32 @@ async function createInvoice(isAgricultural) {
         currencyFk,
         gestDocFk: docFk,
     } = selectedRows.value.at(0);
-    const lastDay = new Date(landed.getFullYear(), landed.getMonth() + 1, 0).getDate();
+    const dateLanded = new Date(landed);
+    const lastDay = new Date(dateLanded.getFullYear(), dateLanded.getMonth() + 1, 0);
     const issued = isAgricultural ? lastDay : shipped;
     const siiTrascendencyInvoiceInFk = isAgricultural ? 2 : 1;
-    await axios.post('InvoiceIns', {
-        supplierFk,
-        supplierRef,
-        issued,
-        companyFk,
-        docFk,
-        currencyFk,
-        siiTrascendencyInvoiceInFk,
-    });
+    let err;
+
+    try {
+        // Create invoice
+        await axios.post('InvoiceIns', {
+            supplierFk,
+            supplierRef,
+            issued,
+            companyFk,
+            docFk,
+            currencyFk,
+            siiTrascendencyInvoiceInFk,
+        });
+
+        // create tax, due-day and intrastat
+
+        // update entries
+    } catch (e) {
+        throw e;
+    } finally {
+        table.value.reload();
+    }
 }
 </script>
 <template>
-- 
2.40.1


From ec328935c05c90a1bad504b4c6bc49bdc9ec1867 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 27 Mar 2025 14:48:09 +0100
Subject: [PATCH 14/41] feat: refs #8277 add isBooked parameter to EntryControl
 for enhanced filtering

---
 src/pages/Entry/EntryControl.vue | 49 ++++++++++----------------------
 1 file changed, 15 insertions(+), 34 deletions(-)

diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index 23f92cffb..96778ba25 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -27,6 +27,7 @@ const dataKey = 'entryControl';
 const url = 'Entries/control';
 const arrayData = useArrayData(dataKey);
 const daysAgo = ref();
+const isBooked = ref();
 const dmsData = ref();
 const table = useTemplateRef('table');
 const companies = ref([]);
@@ -203,7 +204,10 @@ const columns = computed(() => [
     // },
 ]);
 
-onBeforeMount(() => (daysAgo.value = arrayData.store.userParams.daysAgo || DEFAULTDAYS));
+onBeforeMount(() => {
+    daysAgo.value = arrayData.store.userParams.daysAgo || DEFAULTDAYS;
+    isBooked.value = arrayData.store.userParams.isBooked || false;
+});
 
 function filterByDaysAgo(val) {
     if (!val) val = DEFAULTDAYS;
@@ -214,15 +218,11 @@ function filterByDaysAgo(val) {
 }
 
 async function preAccount() {
-    let selectedAgri;
     const entries = selectedRows.value;
-
     for (const i in entries) {
-        const { supplierFk, companyFk, isAgricultural } = entries[i];
+        const { supplierFk, companyFk } = entries[i];
         const nextEntry = entries[+i + 1];
 
-        // Is It agricultural?
-        if (!selectedAgri && isAgricultural) selectedAgri = entries[i];
         // Has It gestDoc?
         if (!selectedGestDoc && entries[i].gestDocFk) selectedGestDoc = entries[i];
         // Is It same supplier and company?
@@ -230,9 +230,10 @@ async function preAccount() {
         else if (nextEntry.supplierFk !== supplierFk || nextEntry.companyFk !== companyFk)
             return notify('Entries must have the same supplier and company', 'negative');
     }
-
+    // Is It agricultural?
+    const selectedAgri = entries.at(0);
     // If It's agricultural, get the supplierRef
-    if (selectedAgri) {
+    if (selectedAgri.isAgricultural) {
         const year = new Date(selectedAgri.landed).getFullYear();
         supplierRef = (
             await axios.get('InvoiceIns/getMaxRef', {
@@ -266,38 +267,18 @@ async function uploadFile() {
         reference: invoiceNumber,
     };
     dmsDialog.value.show();
+
+    // Actualizo el gestDocFk de la entrada?
 }
 
 async function createInvoice(isAgricultural) {
-    const {
-        supplierFk,
-        landed,
-        shipped,
-        companyFk,
-        currencyFk,
-        gestDocFk: docFk,
-    } = selectedRows.value.at(0);
-    const dateLanded = new Date(landed);
-    const lastDay = new Date(dateLanded.getFullYear(), dateLanded.getMonth() + 1, 0);
-    const issued = isAgricultural ? lastDay : shipped;
-    const siiTrascendencyInvoiceInFk = isAgricultural ? 2 : 1;
     let err;
-
     try {
-        // Create invoice
-        await axios.post('InvoiceIns', {
-            supplierFk,
+        await axios.post(`Entries/preAccount`, {
+            ids: selectedRows.value.map((entry) => entry.id),
             supplierRef,
-            issued,
-            companyFk,
-            docFk,
-            currencyFk,
-            siiTrascendencyInvoiceInFk,
+            isAgricultural,
         });
-
-        // create tax, due-day and intrastat
-
-        // update entries
     } catch (e) {
         throw e;
     } finally {
@@ -354,7 +335,7 @@ async function createInvoice(isAgricultural) {
         redirect="Entry"
         :order="['landed DESC']"
         :right-search="false"
-        :user-params="{ daysAgo }"
+        :user-params="{ daysAgo, isBooked }"
         :row-click="false"
         :table="{ selection: 'multiple' }"
     >
-- 
2.40.1


From 1117d3d07a202dadd520f25dba748389885f8765 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 28 Mar 2025 09:49:44 +0100
Subject: [PATCH 15/41] feat: refs #8277 add invoice confirmation dialog and
 total amount calculation in EntryControl

---
 src/pages/Entry/EntryControl.vue | 81 ++++++++++++++++++++++++--------
 src/pages/Entry/locale/en.yml    |  1 +
 src/pages/Entry/locale/es.yml    |  1 +
 3 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index 96778ba25..be8faa593 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, markRaw, useTemplateRef, onBeforeMount } from 'vue';
+import { ref, computed, markRaw, useTemplateRef, onBeforeMount, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { toDate, toCurrency } from 'src/filters';
 import { useArrayData } from 'src/composables/useArrayData';
@@ -15,8 +15,10 @@ import useNotify from 'src/composables/useNotify';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import VnDms from 'src/components/common/VnDms.vue';
 import { useState } from 'src/composables/useState';
+import { useQuasar } from 'quasar';
 
 const { t } = useI18n();
+const quasar = useQuasar();
 const { notify } = useNotify();
 const user = useState().getUser();
 const dialog = ref();
@@ -36,6 +38,11 @@ const entryTypes = ref([]);
 const entryAccounts = ref([]);
 const warehouses = ref([]);
 const selectedRows = ref([]);
+const totalAmount = ref();
+const totalSelectedAmount = computed(() => {
+    if (!selectedRows.value.length) return 0;
+    return selectedRows.value.reduce((acc, entry) => acc + entry.amount, 0);
+});
 let selectedGestDoc;
 let supplierRef;
 const columns = computed(() => [
@@ -209,6 +216,14 @@ onBeforeMount(() => {
     isBooked.value = arrayData.store.userParams.isBooked || false;
 });
 
+watch(selectedRows, (nVal, oVal) => {
+    if (nVal.length > oVal.length && nVal.at(-1).invoiceInFk)
+        quasar.dialog({
+            component: VnConfirm,
+            componentProps: { title: t('entry.control.hasInvoice') },
+        });
+});
+
 function filterByDaysAgo(val) {
     if (!val) val = DEFAULTDAYS;
     else if (val > MAXDAYS) val = MAXDAYS;
@@ -233,27 +248,37 @@ async function preAccount() {
     // Is It agricultural?
     const selectedAgri = entries.at(0);
     // If It's agricultural, get the supplierRef
-    if (selectedAgri.isAgricultural) {
-        const year = new Date(selectedAgri.landed).getFullYear();
-        supplierRef = (
-            await axios.get('InvoiceIns/getMaxRef', {
-                params: { companyFk: selectedAgri.companyFk, year },
-            })
-        ).data;
+    try {
+        if (selectedAgri.isAgricultural) {
+            const year = new Date(selectedAgri.landed).getFullYear();
+            supplierRef = (
+                await axios.get('InvoiceIns/getMaxRef', {
+                    params: { companyFk: selectedAgri.companyFk, year },
+                })
+            ).data;
+            if (!supplierRef) supplierRef = year + '001';
 
-        return createInvoice(true);
-    } else if (selectedGestDoc) {
-        // If There's a allocated file for an entry? Ask to (update/updlod) the file
-        dialog.value.show();
-    } else {
-        // If There's no gestDoc, upload the file
-        uploadFile();
+            return createInvoice(true);
+        } else if (selectedGestDoc) {
+            // If There's an allocated file for an entry? Ask to (update/updload) the file
+            supplierRef = +(
+                await axios.get(`Dms/${selectedGestDoc.gestDocFk}`, {
+                    params: { filter: JSON.stringify({ fields: { reference: true } }) },
+                })
+            ).data?.reference;
+            dialog.value.show();
+        } else {
+            // If There's no gestDoc, upload the file
+            uploadFile();
+        }
+    } catch (e) {
+        throw e;
     }
 }
 
 async function updateFile() {
     await axios.post(`Dms/${selectedGestDoc.gestDocFk}/updateFile`, { dmsTypeId: 1 });
-    table.value.reload();
+    await createInvoice(false);
 }
 
 async function uploadFile() {
@@ -272,17 +297,19 @@ async function uploadFile() {
 }
 
 async function createInvoice(isAgricultural) {
-    let err;
     try {
         await axios.post(`Entries/preAccount`, {
             ids: selectedRows.value.map((entry) => entry.id),
             supplierRef,
             isAgricultural,
         });
+        // Una vez marcada las entradas como contabilizadas, no permitir contabilizarla otra vez?? Carlos
     } catch (e) {
         throw e;
     } finally {
         table.value.reload();
+        supplierRef = null;
+        selectedGestDoc = null;
     }
 }
 </script>
@@ -328,9 +355,9 @@ async function createInvoice(isAgricultural) {
         v-model:selected="selectedRows"
         :data-key
         :columns
+        :url
         :search-url="dataKey"
         ref="table"
-        :url
         :disable-option="{ card: true }"
         redirect="Entry"
         :order="['landed DESC']"
@@ -338,6 +365,11 @@ async function createInvoice(isAgricultural) {
         :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))
+        "
     >
         <template #top-left>
             <QBtn
@@ -373,6 +405,10 @@ async function createInvoice(isAgricultural) {
                 <SupplierDescriptorProxy :id="row.supplierFk" />
             </span>
         </template>
+        <template #column-footer-amount>
+            <div v-text="toCurrency(totalSelectedAmount)" />
+            <div v-text="toCurrency(totalAmount)" />
+        </template>
     </VnTable>
     <VnConfirm
         ref="dialog"
@@ -385,8 +421,15 @@ async function createInvoice(isAgricultural) {
                 color="primary"
                 @click="updateFile"
                 autofocus
+                v-close-popup
+            />
+            <QBtn
+                :label="t('globals.no')"
+                color="primary"
+                flat
+                @click="uploadFile"
+                v-close-popup
             />
-            <QBtn :label="t('globals.no')" color="primary" flat @click="uploadFile" />
             <QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
         </template>
     </VnConfirm>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 259c9e476..343db7a9c 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -140,6 +140,7 @@ entry:
         search: Search
         searchInfo: You can search by supplier name or nickname
         preAccount: Pre-account
+        hasInvoice: This entry has already an invoice in
         dialog:
             title: Pre-account entries
             message: Do you want the invoice to inherit the entry document?
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 1b7d4701e..fcc2efce3 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -91,6 +91,7 @@ entry:
         search: Buscar
         searchInfo: Puedes buscar por nombre o alias de proveedor
         preAccount: Precontabilizar
+        hasInvoice: Esta entrada ya tiene una f. recibida
         dialog:
             title: Precontabilizar entradas
             message: ¿Desea que la factura herede el documento de la entrada?
-- 
2.40.1


From 61a9676c322990e4ab24db2a3dc128a66a0eabff Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 28 Mar 2025 12:14:16 +0100
Subject: [PATCH 16/41] feat: refs #8277 changes

---
 src/pages/Entry/EntryControl.vue | 20 +++++++++++++++++++-
 src/router/modules/entry.js      |  1 +
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index be8faa593..effdbb653 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -16,11 +16,15 @@ import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import VnDms from 'src/components/common/VnDms.vue';
 import { useState } from 'src/composables/useState';
 import { useQuasar } from 'quasar';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import InvoiceInDescriptorProxy from '../InvoiceIn/Card/InvoiceInDescriptorProxy.vue';
+import { useStateStore } from 'src/stores/useStateStore';
 
 const { t } = useI18n();
 const quasar = useQuasar();
 const { notify } = useNotify();
 const user = useState().getUser();
+const stateStore = useStateStore();
 const dialog = ref();
 const dmsDialog = ref();
 const MAXDAYS = 365;
@@ -181,6 +185,7 @@ const columns = computed(() => [
         name: 'isAgricultural',
         label: t('entry.control.isAgricultural'),
         component: 'checkbox',
+        isEditable: false,
     },
     {
         name: 'isBooked',
@@ -191,6 +196,7 @@ const columns = computed(() => [
         name: 'received',
         label: t('entry.control.received'),
         component: 'checkbox',
+        isEditable: false,
     },
     // {
     //     name: 'travelFk',
@@ -214,9 +220,12 @@ const columns = computed(() => [
 onBeforeMount(() => {
     daysAgo.value = arrayData.store.userParams.daysAgo || DEFAULTDAYS;
     isBooked.value = arrayData.store.userParams.isBooked || false;
+    stateStore.leftDrawer = false;
 });
 
 watch(selectedRows, (nVal, oVal) => {
+    const lastRow = nVal.at(-1);
+    if (lastRow?.isBooked) selectedRows.value.pop();
     if (nVal.length > oVal.length && nVal.at(-1).invoiceInFk)
         quasar.dialog({
             component: VnConfirm,
@@ -310,6 +319,7 @@ async function createInvoice(isAgricultural) {
         table.value.reload();
         supplierRef = null;
         selectedGestDoc = null;
+        selectedRows.value.length = 0;
     }
 }
 </script>
@@ -351,12 +361,14 @@ async function createInvoice(isAgricultural) {
         :info="t('entry.control.searchInfo')"
         :search-remove-params="false"
     />
+    <VnSubToolbar />
     <VnTable
         v-model:selected="selectedRows"
         :data-key
         :columns
         :url
         :search-url="dataKey"
+        save-url="Entries/crud"
         ref="table"
         :disable-option="{ card: true }"
         redirect="Entry"
@@ -368,7 +380,7 @@ async function createInvoice(isAgricultural) {
         :limit="0"
         :footer="true"
         @on-fetch="
-            (data) => (totalAmount = data.reduce((acc, entry) => acc + entry.amount, 0))
+            (data) => (totalAmount = data?.reduce((acc, entry) => acc + entry.amount, 0))
         "
     >
         <template #top-left>
@@ -405,6 +417,12 @@ async function createInvoice(isAgricultural) {
                 <SupplierDescriptorProxy :id="row.supplierFk" />
             </span>
         </template>
+        <template #column-invoiceInFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.invoiceInFk }}
+                <InvoiceInDescriptorProxy :id="row.invoiceInFk" />
+            </span>
+        </template>
         <template #column-footer-amount>
             <div v-text="toCurrency(totalSelectedAmount)" />
             <div v-text="toCurrency(totalAmount)" />
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 1c88b183a..a43d16e5d 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -95,6 +95,7 @@ export default {
             name: 'EntryMain',
             path: '',
             component: () => import('src/components/common/VnModule.vue'),
+            props: (route) => ({ leftDrawer: route.name !== 'EntryControl' }),
             redirect: { name: 'EntryIndexMain' },
             children: [
                 {
-- 
2.40.1


From ec7a578bbcde2540ebc7a3d756a48e7bdf1b33d1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 1 Apr 2025 09:18:33 +0200
Subject: [PATCH 17/41] refactor(EntryControl): refs #8277 clean up supplierRef
 assignment and update comments

---
 src/pages/Entry/EntryControl.vue | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index effdbb653..aca71fd09 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -265,12 +265,10 @@ async function preAccount() {
                     params: { companyFk: selectedAgri.companyFk, year },
                 })
             ).data;
-            if (!supplierRef) supplierRef = year + '001';
-
             return createInvoice(true);
         } else if (selectedGestDoc) {
             // If There's an allocated file for an entry? Ask to (update/updload) the file
-            supplierRef = +(
+            supplierRef = (
                 await axios.get(`Dms/${selectedGestDoc.gestDocFk}`, {
                     params: { filter: JSON.stringify({ fields: { reference: true } }) },
                 })
@@ -280,13 +278,15 @@ async function preAccount() {
             // If There's no gestDoc, upload the file
             uploadFile();
         }
+
+
     } catch (e) {
         throw e;
     }
 }
 
 async function updateFile() {
-    await axios.post(`Dms/${selectedGestDoc.gestDocFk}/updateFile`, { dmsTypeId: 1 });
+    await axios.post(`Dms/${selectedGestDoc.gestDocFk}/updateFile`, { dmsTypeId: 1 }); // Sacar el id de invIN de dmsTYpe
     await createInvoice(false);
 }
 
@@ -297,12 +297,11 @@ async function uploadFile() {
         dmsTypeFk: 1,
         warehouseFk: user.value.warehouseFk,
         companyFk: companyFk,
-        description: supplier + '.Fact: ' + invoiceNumber,
+        description: supplier + '.Fact: ' + invoiceNumber, // Crear col InvocieInConfig, defaultDmsDescription
         reference: invoiceNumber,
     };
     dmsDialog.value.show();
-
-    // Actualizo el gestDocFk de la entrada?
+    await createInvoice(false); // Revisar
 }
 
 async function createInvoice(isAgricultural) {
@@ -312,7 +311,6 @@ async function createInvoice(isAgricultural) {
             supplierRef,
             isAgricultural,
         });
-        // Una vez marcada las entradas como contabilizadas, no permitir contabilizarla otra vez?? Carlos
     } catch (e) {
         throw e;
     } finally {
-- 
2.40.1


From 3120ca93e6f671cfa3bbd944dc259fcb18a770b0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 1 Apr 2025 16:31:08 +0200
Subject: [PATCH 18/41] refactor(EntryControl): refs #8277 update file handling
 and improve dialog management

---
 src/pages/Entry/EntryControl.vue | 81 +++++++++++++++++++-------------
 1 file changed, 48 insertions(+), 33 deletions(-)

diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index aca71fd09..21223dd90 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -16,17 +16,17 @@ import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import VnDms from 'src/components/common/VnDms.vue';
 import { useState } from 'src/composables/useState';
 import { useQuasar } from 'quasar';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import InvoiceInDescriptorProxy from '../InvoiceIn/Card/InvoiceInDescriptorProxy.vue';
 import { useStateStore } from 'src/stores/useStateStore';
+import { downloadFile } from 'src/composables/downloadFile';
 
 const { t } = useI18n();
 const quasar = useQuasar();
 const { notify } = useNotify();
 const user = useState().getUser();
 const stateStore = useStateStore();
-const dialog = ref();
-const dmsDialog = ref();
+const updateDialog = ref();
+const uploadDialog = ref();
 const MAXDAYS = 365;
 const DEFAULTDAYS = 60;
 const dataKey = 'entryControl';
@@ -41,14 +41,16 @@ const countries = ref([]);
 const entryTypes = ref([]);
 const entryAccounts = ref([]);
 const warehouses = ref([]);
+const defaultDmsDescription = ref();
+const dmsTypeId = ref();
 const selectedRows = ref([]);
 const totalAmount = ref();
 const totalSelectedAmount = computed(() => {
     if (!selectedRows.value.length) return 0;
     return selectedRows.value.reduce((acc, entry) => acc + entry.amount, 0);
 });
-let selectedGestDoc;
 let supplierRef;
+let dmsFk;
 const columns = computed(() => [
     {
         name: 'id',
@@ -243,50 +245,42 @@ function filterByDaysAgo(val) {
 
 async function preAccount() {
     const entries = selectedRows.value;
-    for (const i in entries) {
+    for (let i = 0; i < entries.length; i++) {
         const { supplierFk, companyFk } = entries[i];
         const nextEntry = entries[+i + 1];
 
-        // Has It gestDoc?
-        if (!selectedGestDoc && entries[i].gestDocFk) selectedGestDoc = entries[i];
-        // Is It same supplier and company?
+        if (!dmsFk && entries[i].gestDocFk) dmsFk = entries[i].gestDocFk;
         if (!nextEntry) break;
         else if (nextEntry.supplierFk !== supplierFk || nextEntry.companyFk !== companyFk)
             return notify('Entries must have the same supplier and company', 'negative');
     }
-    // Is It agricultural?
-    const selectedAgri = entries.at(0);
-    // If It's agricultural, get the supplierRef
+    const firstRow = entries.at(0);
     try {
-        if (selectedAgri.isAgricultural) {
-            const year = new Date(selectedAgri.landed).getFullYear();
+        if (firstRow.isAgricultural) {
+            const year = new Date(firstRow.landed).getFullYear();
             supplierRef = (
                 await axios.get('InvoiceIns/getMaxRef', {
-                    params: { companyFk: selectedAgri.companyFk, year },
+                    params: { companyFk: firstRow.companyFk, year },
                 })
             ).data;
             return createInvoice(true);
-        } else if (selectedGestDoc) {
-            // If There's an allocated file for an entry? Ask to (update/updload) the file
+        } else if (dmsFk) {
             supplierRef = (
-                await axios.get(`Dms/${selectedGestDoc.gestDocFk}`, {
+                await axios.get(`Dms/${dmsFk}`, {
                     params: { filter: JSON.stringify({ fields: { reference: true } }) },
                 })
             ).data?.reference;
-            dialog.value.show();
+            updateDialog.value.show();
         } else {
-            // If There's no gestDoc, upload the file
             uploadFile();
         }
-
-
     } catch (e) {
         throw e;
     }
 }
 
 async function updateFile() {
-    await axios.post(`Dms/${selectedGestDoc.gestDocFk}/updateFile`, { dmsTypeId: 1 }); // Sacar el id de invIN de dmsTYpe
+    await axios.post(`Dms/${dmsFk}/updateFile`, { dmsTypeId });
     await createInvoice(false);
 }
 
@@ -294,14 +288,18 @@ async function uploadFile() {
     const firstSelectedEntry = selectedRows.value.at(0);
     const { supplier, companyFk, invoiceNumber } = firstSelectedEntry;
     dmsData.value = {
-        dmsTypeFk: 1,
+        dmsTypeFk: dmsTypeId.value,
         warehouseFk: user.value.warehouseFk,
         companyFk: companyFk,
-        description: supplier + '.Fact: ' + invoiceNumber, // Crear col InvocieInConfig, defaultDmsDescription
-        reference: invoiceNumber,
+        description: supplier + defaultDmsDescription.value + invoiceNumber,
     };
-    dmsDialog.value.show();
-    await createInvoice(false); // Revisar
+    uploadDialog.value.show();
+}
+
+async function afterUploadFile({ reference }, res) {
+    supplierRef = reference;
+    dmsFk = res.data[0].id;
+    await createInvoice(false);
 }
 
 async function createInvoice(isAgricultural) {
@@ -309,6 +307,7 @@ async function createInvoice(isAgricultural) {
         await axios.post(`Entries/preAccount`, {
             ids: selectedRows.value.map((entry) => entry.id),
             supplierRef,
+            dmsFk,
             isAgricultural,
         });
     } catch (e) {
@@ -316,7 +315,7 @@ async function createInvoice(isAgricultural) {
     } finally {
         table.value.reload();
         supplierRef = null;
-        selectedGestDoc = null;
+        dmsFk = null;
         selectedRows.value.length = 0;
     }
 }
@@ -352,6 +351,19 @@ async function createInvoice(isAgricultural) {
         @on-fetch="(data) => (entryAccounts = data)"
         auto-load
     />
+    <FetchData
+        url="InvoiceInConfigs/findOne"
+        :filter="{ fields: ['defaultDmsDescription'] }"
+        @on-fetch="(data) => (defaultDmsDescription = data?.defaultDmsDescription)"
+        auto-load
+    />
+    <FetchData
+        url="DmsTypes/findOne"
+        :filter="{ fields: ['id'] }"
+        :where="{ code: 'invoiceIn' }"
+        @on-fetch="(data) => (dmsTypeId = data?.id)"
+        auto-load
+    />
     <VnSearchbar
         :data-key
         :url
@@ -359,7 +371,6 @@ async function createInvoice(isAgricultural) {
         :info="t('entry.control.searchInfo')"
         :search-remove-params="false"
     />
-    <VnSubToolbar />
     <VnTable
         v-model:selected="selectedRows"
         :data-key
@@ -399,7 +410,6 @@ async function createInvoice(isAgricultural) {
                 :decimal-places="0"
                 @update:model-value="filterByDaysAgo"
                 debounce="500"
-                max="365"
                 :title="t('entry.control.daysAgo')"
             />
         </template>
@@ -409,6 +419,11 @@ async function createInvoice(isAgricultural) {
                 <EntryDescriptorProxy :id="row.id" />
             </span>
         </template>
+        <template #column-gestDocFk="{ row }">
+            <span class="link" @click.stop="downloadFile(row.gestDocFk)">
+                {{ row.gestDocFk }}
+            </span>
+        </template>
         <template #column-supplier="{ row }">
             <span class="link" @click.stop>
                 {{ row.supplier }}
@@ -427,7 +442,7 @@ async function createInvoice(isAgricultural) {
         </template>
     </VnTable>
     <VnConfirm
-        ref="dialog"
+        ref="updateDialog"
         :title="t('entry.control.dialog.title')"
         :message="t('entry.control.dialog.message')"
     >
@@ -449,12 +464,12 @@ async function createInvoice(isAgricultural) {
             <QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
         </template>
     </VnConfirm>
-    <QDialog ref="dmsDialog">
+    <QDialog ref="uploadDialog">
         <VnDms
             model="dms"
             :form-initial-data="dmsData"
             url="Dms/uploadFile"
-            @data-saved="dmsData = null"
+            @on-data-saved="afterUploadFile"
         />
     </QDialog>
 </template>
-- 
2.40.1


From a92cbeb95db6ac1d0eb1dadcfa28cea2374dac2c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 1 Apr 2025 17:44:49 +0200
Subject: [PATCH 19/41] refactor(EntryControl): refs #8277 update dmsFk
 assignment to undefined for clarity

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

diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index 21223dd90..9d19a0382 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -315,7 +315,7 @@ async function createInvoice(isAgricultural) {
     } finally {
         table.value.reload();
         supplierRef = null;
-        dmsFk = null;
+        dmsFk = undefined;
         selectedRows.value.length = 0;
     }
 }
-- 
2.40.1


From 758ab77f6c6e29e7ec2adbecbd3d3a120015d514 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 1 Apr 2025 18:04:15 +0200
Subject: [PATCH 20/41] refactor(EntryControl): refs #8277 add hasFile property
 to upload file data structure

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

diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index 9d19a0382..5a73914d1 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -292,6 +292,7 @@ async function uploadFile() {
         warehouseFk: user.value.warehouseFk,
         companyFk: companyFk,
         description: supplier + defaultDmsDescription.value + invoiceNumber,
+        hasFile: false,
     };
     uploadDialog.value.show();
 }
-- 
2.40.1


From ec19ecdc9837545cf47a0f65be41caed390768e2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 3 Apr 2025 18:09:26 +0200
Subject: [PATCH 21/41] refactor: refs #8277 update account type labels and
 filter fields in EntryControl.vue

---
 src/pages/Entry/EntryControl.vue | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryControl.vue
index 5a73914d1..ba16db71c 100644
--- a/src/pages/Entry/EntryControl.vue
+++ b/src/pages/Entry/EntryControl.vue
@@ -171,7 +171,8 @@ const columns = computed(() => [
             component: 'select',
             name: 'accountType',
             options: entryAccounts.value,
-            optionLabel: 'account',
+            optionLabel: 'type',
+            optionValue: 'code',
         },
     },
     {
@@ -200,23 +201,6 @@ const columns = computed(() => [
         component: 'checkbox',
         isEditable: false,
     },
-    // {
-    //     name: 'travelFk',
-    //     label: t('entry.travelFk'),
-    // },
-    // {
-    //     name: 'agencyMode',
-    //     label: t('entry.agencyMode'),
-    //     format: (row) => row.agencyMode,
-    // },
-    // {
-    //     name: 'account',
-    //     label: t('globals.account'),
-    // },
-    // {
-    //     name: 'nickname',
-    //     label: t('globals.nickname'),
-    // },
 ]);
 
 onBeforeMount(() => {
@@ -348,7 +332,7 @@ async function createInvoice(isAgricultural) {
     />
     <FetchData
         url="EntryAccounts"
-        :filter="{ fields: ['id', 'account'] }"
+        :filter="{ fields: ['code', 'type'] }"
         @on-fetch="(data) => (entryAccounts = data)"
         auto-load
     />
-- 
2.40.1


From a1f93a87b25bad4fe04978ea75c66c73b29c0751 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 4 Apr 2025 12:00:32 +0200
Subject: [PATCH 22/41] refactor: refs #8277 rename entry control to
 pre-account in localization and routing

---
 src/i18n/locale/en.yml                               |  2 +-
 src/i18n/locale/es.yml                               |  2 +-
 .../Entry/{EntryControl.vue => EntryPreAccount.vue}  |  0
 src/router/modules/entry.js                          | 12 ++++++------
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename src/pages/Entry/{EntryControl.vue => EntryPreAccount.vue} (100%)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index d48205ee4..ef9565633 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -341,7 +341,7 @@ globals:
         parking: Parking
         vehicleList: Vehicles
         vehicle: Vehicle
-        entryControl: Entry control
+        entryPreAccount: Pre-account
     unsavedPopup:
         title: Unsaved changes will be lost
         subtitle: Are you sure exit without saving?
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index b7ce83875..79688291c 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -344,7 +344,7 @@ globals:
         parking: Parking
         vehicleList: Vehículos
         vehicle: Vehículo
-        entryControl: Control de entradas
+        entryPreAccount: Precontabilizar
     unsavedPopup:
         title: Los cambios que no haya guardado se perderán
         subtitle: ¿Seguro que quiere salir sin guardar?
diff --git a/src/pages/Entry/EntryControl.vue b/src/pages/Entry/EntryPreAccount.vue
similarity index 100%
rename from src/pages/Entry/EntryControl.vue
rename to src/pages/Entry/EntryPreAccount.vue
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index a43d16e5d..4567955fe 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -85,7 +85,7 @@ export default {
             'EntryLatestBuys',
             'EntryStockBought',
             'EntryWasteRecalc',
-            'EntryControl',
+            'EntryPreAccount',
         ],
     },
     component: RouterView,
@@ -95,7 +95,7 @@ export default {
             name: 'EntryMain',
             path: '',
             component: () => import('src/components/common/VnModule.vue'),
-            props: (route) => ({ leftDrawer: route.name !== 'EntryControl' }),
+            props: (route) => ({ leftDrawer: route.name !== 'EntryPreAccount' }),
             redirect: { name: 'EntryIndexMain' },
             children: [
                 {
@@ -154,12 +154,12 @@ export default {
                 },
                 {
                     path: 'control',
-                    name: 'EntryControl',
+                    name: 'EntryPreAccount',
                     meta: {
-                        title: 'entryControl',
-                        icon: 'help',
+                        title: 'entryPreAccount',
+                        icon: 'account_balance',
                     },
-                    component: () => import('src/pages/Entry/EntryControl.vue'),
+                    component: () => import('src/pages/Entry/EntryPreAccount.vue'),
                 },
             ],
         },
-- 
2.40.1


From cd7f9e15fc06d6195ef1f2471a1a071a3e3f3b25 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 4 Apr 2025 12:55:02 +0200
Subject: [PATCH 23/41] refactor: refs #8277 rename dmsType to dmsTypeFk in
 EntryPreAccount.vue

---
 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 ba16db71c..723b0d728 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -93,7 +93,7 @@ const columns = computed(() => [
         columnFilter: {
             component: 'select',
             label: null,
-            name: 'dmsType',
+            name: 'dmsTypeFk',
             url: 'DmsTypes',
             fields: ['id', 'name'],
         },
-- 
2.40.1


From f79d7e0d9f9b3f93c14239fb72171378088d9171 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 4 Apr 2025 17:14:42 +0200
Subject: [PATCH 24/41] refactor: refs #8277 rename entry control to
 pre-account in components and localization

---
 src/pages/Entry/EntryPreAccount.vue           | 45 ++++++++++---------
 src/pages/Entry/locale/en.yml                 |  5 ++-
 src/pages/Entry/locale/es.yml                 |  5 ++-
 src/router/modules/entry.js                   |  2 +-
 .../integration/entry/entryPreAccount.spec.js | 30 +++++++++++++
 5 files changed, 61 insertions(+), 26 deletions(-)
 create mode 100644 test/cypress/integration/entry/entryPreAccount.spec.js

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 723b0d728..379abf161 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -54,7 +54,7 @@ let dmsFk;
 const columns = computed(() => [
     {
         name: 'id',
-        label: t('entry.control.id'),
+        label: t('entry.preAccount.id'),
         isId: true,
         chip: {
             condition: () => true,
@@ -62,7 +62,7 @@ const columns = computed(() => [
     },
     {
         name: 'invoiceNumber',
-        label: t('entry.control.invoiceNumber'),
+        label: t('entry.preAccount.invoiceNumber'),
     },
     {
         name: 'company',
@@ -85,11 +85,11 @@ const columns = computed(() => [
     },
     {
         name: 'gestDocFk',
-        label: t('entry.control.gestDocFk'),
+        label: t('entry.preAccount.gestDocFk'),
     },
     {
         name: 'dmsType',
-        label: t('entry.control.dmsType'),
+        label: t('entry.preAccount.dmsType'),
         columnFilter: {
             component: 'select',
             label: null,
@@ -100,11 +100,11 @@ const columns = computed(() => [
     },
     {
         name: 'reference',
-        label: t('entry.control.reference'),
+        label: t('entry.preAccount.reference'),
     },
     {
         name: 'shipped',
-        label: t('entry.control.shipped'),
+        label: t('entry.preAccount.shipped'),
         format: ({ shipped }, dashIfEmpty) => dashIfEmpty(toDate(shipped)),
         columnFilter: {
             component: 'date',
@@ -113,7 +113,7 @@ const columns = computed(() => [
     },
     {
         name: 'landed',
-        label: t('entry.control.landed'),
+        label: t('entry.preAccount.landed'),
         format: ({ landed }, dashIfEmpty) => dashIfEmpty(toDate(landed)),
         columnFilter: {
             component: 'date',
@@ -122,7 +122,7 @@ const columns = computed(() => [
     },
     {
         name: 'invoiceInFk',
-        label: t('entry.control.invoiceInFk'),
+        label: t('entry.preAccount.invoiceInFk'),
     },
     {
         name: 'supplier',
@@ -146,7 +146,7 @@ const columns = computed(() => [
     },
     {
         name: 'description',
-        label: t('entry.control.entryType'),
+        label: t('entry.preAccount.entryType'),
         columnFilter: {
             component: 'select',
             label: null,
@@ -158,7 +158,7 @@ const columns = computed(() => [
     },
     {
         name: 'payDem',
-        label: t('entry.control.payDem'),
+        label: t('entry.preAccount.payDem'),
         columnFilter: {
             component: 'number',
             name: 'payDem',
@@ -166,7 +166,7 @@ const columns = computed(() => [
     },
     {
         name: 'accountType',
-        label: t('entry.control.accountType'),
+        label: t('entry.preAccount.accountType'),
         columnFilter: {
             component: 'select',
             name: 'accountType',
@@ -186,18 +186,18 @@ const columns = computed(() => [
     },
     {
         name: 'isAgricultural',
-        label: t('entry.control.isAgricultural'),
+        label: t('entry.preAccount.isAgricultural'),
         component: 'checkbox',
         isEditable: false,
     },
     {
         name: 'isBooked',
-        label: t('entry.control.isBooked'),
+        label: t('entry.preAccount.isBooked'),
         component: 'checkbox',
     },
     {
         name: 'received',
-        label: t('entry.control.received'),
+        label: t('entry.preAccount.received'),
         component: 'checkbox',
         isEditable: false,
     },
@@ -215,7 +215,7 @@ watch(selectedRows, (nVal, oVal) => {
     if (nVal.length > oVal.length && nVal.at(-1).invoiceInFk)
         quasar.dialog({
             component: VnConfirm,
-            componentProps: { title: t('entry.control.hasInvoice') },
+            componentProps: { title: t('entry.preAccount.hasInvoice') },
         });
 });
 
@@ -295,6 +295,7 @@ async function createInvoice(isAgricultural) {
             dmsFk,
             isAgricultural,
         });
+        notify(t('entry.preAccount.success'), 'positive');
     } catch (e) {
         throw e;
     } finally {
@@ -352,8 +353,8 @@ async function createInvoice(isAgricultural) {
     <VnSearchbar
         :data-key
         :url
-        :label="t('entry.control.search')"
-        :info="t('entry.control.searchInfo')"
+        :label="t('entry.preAccount.search')"
+        :info="t('entry.preAccount.searchInfo')"
         :search-remove-params="false"
     />
     <VnTable
@@ -376,16 +377,18 @@ async function createInvoice(isAgricultural) {
         @on-fetch="
             (data) => (totalAmount = data?.reduce((acc, entry) => acc + entry.amount, 0))
         "
+        auto-load
     >
         <template #top-left>
             <QBtn
+                data-cy="preAccount_btn"
                 icon="account_balance"
                 color="primary"
                 class="q-mr-sm"
                 :disable="!selectedRows.length"
                 @click="preAccount"
             >
-                <QTooltip>{{ t('entry.control.preAccount') }}</QTooltip>
+                <QTooltip>{{ t('entry.preAccount.preAccount') }}</QTooltip>
             </QBtn>
             <VnInputNumber
                 v-model="daysAgo"
@@ -395,7 +398,7 @@ async function createInvoice(isAgricultural) {
                 :decimal-places="0"
                 @update:model-value="filterByDaysAgo"
                 debounce="500"
-                :title="t('entry.control.daysAgo')"
+                :title="t('entry.preAccount.daysAgo')"
             />
         </template>
         <template #column-id="{ row }">
@@ -428,8 +431,8 @@ async function createInvoice(isAgricultural) {
     </VnTable>
     <VnConfirm
         ref="updateDialog"
-        :title="t('entry.control.dialog.title')"
-        :message="t('entry.control.dialog.message')"
+        :title="t('entry.preAccount.dialog.title')"
+        :message="t('entry.preAccount.dialog.message')"
     >
         <template #actions>
             <QBtn
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 343db7a9c..3428e3153 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -118,7 +118,7 @@ entry:
     searchInfo: You can search by entry reference
     descriptorMenu:
         showEntryReport: Show entry report
-    control:
+    preAccount:
         gestDocFk: Gestdoc
         dmsType: Gestdoc type
         invoiceNumber: Entry ref.
@@ -139,8 +139,9 @@ entry:
         daysAgo: Max 365 days
         search: Search
         searchInfo: You can search by supplier name or nickname
-        preAccount: Pre-account
+        btn: Pre-account
         hasInvoice: This entry has already an invoice in
+        success: It has been successfully pre-accounted
         dialog:
             title: Pre-account entries
             message: Do you want the invoice to inherit the entry document?
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index fcc2efce3..2d9f203b9 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -69,7 +69,7 @@ entry:
         observationType: Tipo de observación
     search: Buscar entradas
     searchInfo: Puedes buscar por referencia de entrada
-    control:
+    preAccount:
         gestDocFk: Gestdoc
         dmsType: Tipo gestdoc
         invoiceNumber: Ref. Entrada
@@ -90,8 +90,9 @@ entry:
         daysAgo: Máximo 365 días
         search: Buscar
         searchInfo: Puedes buscar por nombre o alias de proveedor
-        preAccount: Precontabilizar
+        btn: Precontabilizar
         hasInvoice: Esta entrada ya tiene una f. recibida
+        success: Se ha precontabilizado correctamente
         dialog:
             title: Precontabilizar entradas
             message: ¿Desea que la factura herede el documento de la entrada?
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 4567955fe..da380313b 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -153,7 +153,7 @@ export default {
                     component: () => import('src/pages/Entry/EntryWasteRecalc.vue'),
                 },
                 {
-                    path: 'control',
+                    path: 'pre-account',
                     name: 'EntryPreAccount',
                     meta: {
                         title: 'entryPreAccount',
diff --git a/test/cypress/integration/entry/entryPreAccount.spec.js b/test/cypress/integration/entry/entryPreAccount.spec.js
new file mode 100644
index 000000000..5626357ff
--- /dev/null
+++ b/test/cypress/integration/entry/entryPreAccount.spec.js
@@ -0,0 +1,30 @@
+/// <reference types="cypress" />
+describe('Entry PreAccount Functionality', () => {
+    beforeEach(() => {
+        cy.login('administrative');
+        cy.visit('/#/entry/pre-account');
+    });
+
+    it('should handle entries with different suppliers or companies', () => {
+        cy.selectRows([1, 4]);
+        cy.dataCy('preAccount_btn').click();
+        cy.checkNotification('Entries must have the same supplier and company');
+    });
+
+    it("should pre-account without questions if it's agricultural", () => {
+        cy.selectRows([2]);
+        cy.dataCy('preAccount_btn').click();
+        cy.checkNotification('It has been successfully pre-accounted');
+    });
+
+    it.only('should upload the document and pre-account', () => {
+        cy.selectRows([1]);
+        cy.dataCy('preAccount_btn').click();
+        cy.dataCy('Reference_input').type('{selectall}234343fh', { delay: 0 });
+        cy.dataCy('VnDms_inputFile').selectFile('test/cypress/fixtures/image.jpg', {
+            force: true,
+        });
+        cy.get('[data-cy="FormModelPopup_save"]').click();
+        cy.checkNotification('It has been successfully pre-accounted');
+    });
+});
-- 
2.40.1


From 5b80c22baef5f5bb08bb99691acd571e2fcd8a0e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 7 Apr 2025 12:49:25 +0200
Subject: [PATCH 25/41] fix: refs #8277 update tooltip text and add data-cy
 attributes for Cypress tests

---
 src/pages/Entry/EntryPreAccount.vue           |  4 ++-
 .../integration/entry/entryPreAccount.spec.js | 31 ++++++++++++++++---
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 379abf161..81a37e498 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -388,7 +388,7 @@ async function createInvoice(isAgricultural) {
                 :disable="!selectedRows.length"
                 @click="preAccount"
             >
-                <QTooltip>{{ t('entry.preAccount.preAccount') }}</QTooltip>
+                <QTooltip>{{ t('entry.preAccount.btn') }}</QTooltip>
             </QBtn>
             <VnInputNumber
                 v-model="daysAgo"
@@ -436,6 +436,7 @@ async function createInvoice(isAgricultural) {
     >
         <template #actions>
             <QBtn
+                data-cy="updateFile_yes"
                 :label="t('globals.yes')"
                 color="primary"
                 @click="updateFile"
@@ -443,6 +444,7 @@ async function createInvoice(isAgricultural) {
                 v-close-popup
             />
             <QBtn
+                data-cy="updateFile_no"
                 :label="t('globals.no')"
                 color="primary"
                 flat
diff --git a/test/cypress/integration/entry/entryPreAccount.spec.js b/test/cypress/integration/entry/entryPreAccount.spec.js
index 5626357ff..252ece8ac 100644
--- a/test/cypress/integration/entry/entryPreAccount.spec.js
+++ b/test/cypress/integration/entry/entryPreAccount.spec.js
@@ -5,8 +5,15 @@ describe('Entry PreAccount Functionality', () => {
         cy.visit('/#/entry/pre-account');
     });
 
-    it('should handle entries with different suppliers or companies', () => {
-        cy.selectRows([1, 4]);
+    it.only('should handle entries with different suppliers or companies', () => {
+        cy.contains('[data-col-field="id"]', /^\s*3\s*$/)
+            .parent()
+            .find('td > .q-checkbox')
+            .click();
+        cy.contains('[data-col-field="id"]', /^\s*2\s*$/)
+            .parent()
+            .find('td:nth-child(1)')
+            .click();
         cy.dataCy('preAccount_btn').click();
         cy.checkNotification('Entries must have the same supplier and company');
     });
@@ -17,14 +24,30 @@ describe('Entry PreAccount Functionality', () => {
         cy.checkNotification('It has been successfully pre-accounted');
     });
 
-    it.only('should upload the document and pre-account', () => {
+    it("should ask to upload a doc. if it's not agricultural and doesn't have doc. ", () => {
         cy.selectRows([1]);
         cy.dataCy('preAccount_btn').click();
         cy.dataCy('Reference_input').type('{selectall}234343fh', { delay: 0 });
         cy.dataCy('VnDms_inputFile').selectFile('test/cypress/fixtures/image.jpg', {
             force: true,
         });
-        cy.get('[data-cy="FormModelPopup_save"]').click();
+        cy.checkNotification('It has been successfully pre-accounted');
+    });
+
+    it('should ask to inherit the doc. and open VnDms popup if user choose "no"', () => {
+        cy.selectRows([2]);
+        cy.dataCy('preAccount_btn').click();
+        cy.dataCy('updateFile_no').click();
+        cy.get('#formModel').should('be.visible');
+    });
+
+    it('should ask to inherit the doc. and open VnDms popup if user choose "yes" and pre-account', () => {
+        cy.selectRows([2]);
+        cy.dataCy('preAccount_btn').click();
+        cy.dataCy('updateFile_yes').click();
         cy.checkNotification('It has been successfully pre-accounted');
     });
 });
+
+
+function selectRowsByCol(col= 'id', values = [])
\ No newline at end of file
-- 
2.40.1


From e127c4cec9767ef9cf59aa69487e7763ace43d9f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 7 Apr 2025 16:18:30 +0200
Subject: [PATCH 26/41] fix: refs #8277 improve tests

---
 src/pages/Entry/EntryPreAccount.vue           |  2 +-
 .../integration/entry/entryPreAccount.spec.js | 31 ++++++++++---------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 81a37e498..8dbd7a4cd 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -264,7 +264,7 @@ async function preAccount() {
 }
 
 async function updateFile() {
-    await axios.post(`Dms/${dmsFk}/updateFile`, { dmsTypeId });
+    await axios.post(`Dms/${dmsFk}/updateFile`, { dmsTypeId: dmsTypeId.value });
     await createInvoice(false);
 }
 
diff --git a/test/cypress/integration/entry/entryPreAccount.spec.js b/test/cypress/integration/entry/entryPreAccount.spec.js
index 252ece8ac..77488b19a 100644
--- a/test/cypress/integration/entry/entryPreAccount.spec.js
+++ b/test/cypress/integration/entry/entryPreAccount.spec.js
@@ -5,49 +5,50 @@ describe('Entry PreAccount Functionality', () => {
         cy.visit('/#/entry/pre-account');
     });
 
-    it.only('should handle entries with different suppliers or companies', () => {
-        cy.contains('[data-col-field="id"]', /^\s*3\s*$/)
-            .parent()
-            .find('td > .q-checkbox')
-            .click();
-        cy.contains('[data-col-field="id"]', /^\s*2\s*$/)
-            .parent()
-            .find('td:nth-child(1)')
-            .click();
+    it('should handle entries with different suppliers or companies', () => {
+        selectRowsByCol('id', [3, 2]);
         cy.dataCy('preAccount_btn').click();
         cy.checkNotification('Entries must have the same supplier and company');
     });
 
     it("should pre-account without questions if it's agricultural", () => {
-        cy.selectRows([2]);
+        selectRowsByCol('id', [2]);
         cy.dataCy('preAccount_btn').click();
         cy.checkNotification('It has been successfully pre-accounted');
     });
 
     it("should ask to upload a doc. if it's not agricultural and doesn't have doc. ", () => {
-        cy.selectRows([1]);
+        selectRowsByCol('id', [3]);
         cy.dataCy('preAccount_btn').click();
         cy.dataCy('Reference_input').type('{selectall}234343fh', { delay: 0 });
         cy.dataCy('VnDms_inputFile').selectFile('test/cypress/fixtures/image.jpg', {
             force: true,
         });
+        cy.dataCy('FormModelPopup_save').click();
         cy.checkNotification('It has been successfully pre-accounted');
     });
 
     it('should ask to inherit the doc. and open VnDms popup if user choose "no"', () => {
-        cy.selectRows([2]);
+        selectRowsByCol('id', [102]);
         cy.dataCy('preAccount_btn').click();
         cy.dataCy('updateFile_no').click();
         cy.get('#formModel').should('be.visible');
     });
 
     it('should ask to inherit the doc. and open VnDms popup if user choose "yes" and pre-account', () => {
-        cy.selectRows([2]);
+        selectRowsByCol('id', [102]);
         cy.dataCy('preAccount_btn').click();
         cy.dataCy('updateFile_yes').click();
         cy.checkNotification('It has been successfully pre-accounted');
     });
 });
 
-
-function selectRowsByCol(col= 'id', values = [])
\ No newline at end of file
+function selectRowsByCol(col = 'id', vals = []) {
+    for (const val of vals) {
+        const regex = new RegExp(`^\\s*(${val})\\s*$`);
+        cy.contains(`[data-col-field="${col}"]`, regex)
+            .parent()
+            .find('td > .q-checkbox')
+            .click();
+    }
+}
-- 
2.40.1


From e8af2b6a741f9f8d7857f9ba73dadaf313d49ac6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 7 Apr 2025 16:55:15 +0200
Subject: [PATCH 27/41] test: refs #8277 add unit tests for EntryPreAccount
 component

---
 src/pages/Entry/EntryPreAccount.vue           |  2 +-
 .../Entry/__tests__/EntryPreAccount.spec.js   | 58 +++++++++++++++++++
 2 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Entry/__tests__/EntryPreAccount.spec.js

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 8dbd7a4cd..2b5b42759 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -212,7 +212,7 @@ onBeforeMount(() => {
 watch(selectedRows, (nVal, oVal) => {
     const lastRow = nVal.at(-1);
     if (lastRow?.isBooked) selectedRows.value.pop();
-    if (nVal.length > oVal.length && nVal.at(-1).invoiceInFk)
+    if (nVal.length > oVal.length && lastRow.invoiceInFk)
         quasar.dialog({
             component: VnConfirm,
             componentProps: { title: t('entry.preAccount.hasInvoice') },
diff --git a/src/pages/Entry/__tests__/EntryPreAccount.spec.js b/src/pages/Entry/__tests__/EntryPreAccount.spec.js
new file mode 100644
index 000000000..3cdb3cb02
--- /dev/null
+++ b/src/pages/Entry/__tests__/EntryPreAccount.spec.js
@@ -0,0 +1,58 @@
+import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import EntryPreAccount from '../EntryPreAccount.vue';
+
+describe('EntryPreAccount', () => {
+    let wrapper;
+    let vm;
+
+    beforeAll(() => {
+        vi.spyOn(axios, 'get').mockImplementation(() => ({ data: [] }));
+        wrapper = createWrapper(EntryPreAccount);
+        vm = wrapper.vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('filterByDaysAgo()', () => {
+        it('should set daysAgo to DEFAULTDAYS if no value is provided', () => {
+            vm.filterByDaysAgo();
+            expect(vm.daysAgo).toBe(vm.DEFAULTDAYS);
+            expect(vm.arrayData.store.userParams.daysAgo).toBe(vm.DEFAULTDAYS);
+        });
+
+        it('should set daysAgo to MAXDAYS if the value exceeds MAXDAYS', () => {
+            vm.filterByDaysAgo(500);
+            expect(vm.daysAgo).toBe(vm.MAXDAYS);
+            expect(vm.arrayData.store.userParams.daysAgo).toBe(vm.MAXDAYS);
+        });
+
+        it('should set daysAgo to the provided value if it is valid', () => {
+            vm.filterByDaysAgo(30);
+            expect(vm.daysAgo).toBe(30);
+            expect(vm.arrayData.store.userParams.daysAgo).toBe(30);
+        });
+    });
+
+    describe('Dialog behavior when adding a new row', () => {
+        it('should open the dialog if the new row has invoiceInFk', async () => {
+            const dialogSpy = vi.spyOn(vm.quasar, 'dialog');
+            const selectedRows = [{ id: 1, invoiceInFk: 123 }];
+            vm.selectedRows = selectedRows;
+            await vm.$nextTick();
+            expect(dialogSpy).toHaveBeenCalledWith({
+                component: vm.VnConfirm,
+                componentProps: { title: vm.t('entry.preAccount.hasInvoice') },
+            });
+        });
+
+        it('should not open the dialog if the new row does not have invoiceInFk', async () => {
+            const dialogSpy = vi.spyOn(vm.quasar, 'dialog');
+            vm.selectedRows = [{ id: 1, invoiceInFk: null }];
+            await vm.$nextTick();
+            expect(dialogSpy).not.toHaveBeenCalled();
+        });
+    });
+});
-- 
2.40.1


From 966f52d3e36d7bf2ad8374880e48f28466bd2eff Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 7 Apr 2025 17:15:52 +0200
Subject: [PATCH 28/41] chore: refs #8277 replace end-point name

---
 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 2b5b42759..80ce315f4 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -29,8 +29,8 @@ const updateDialog = ref();
 const uploadDialog = ref();
 const MAXDAYS = 365;
 const DEFAULTDAYS = 60;
-const dataKey = 'entryControl';
-const url = 'Entries/control';
+const dataKey = 'entryPreaccountingFilter';
+const url = 'Entries/preAccountingFilter';
 const arrayData = useArrayData(dataKey);
 const daysAgo = ref();
 const isBooked = ref();
-- 
2.40.1


From 87d4e02c9dbea6c828c17e2a1a51bd838727073d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 8 Apr 2025 11:01:37 +0200
Subject: [PATCH 29/41] fix(entryPreAccount): refs #8277 update test cases to
 use correct row ID for document inheritance

---
 test/cypress/integration/entry/entryPreAccount.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/entry/entryPreAccount.spec.js b/test/cypress/integration/entry/entryPreAccount.spec.js
index 77488b19a..5a9c0f183 100644
--- a/test/cypress/integration/entry/entryPreAccount.spec.js
+++ b/test/cypress/integration/entry/entryPreAccount.spec.js
@@ -29,14 +29,14 @@ describe('Entry PreAccount Functionality', () => {
     });
 
     it('should ask to inherit the doc. and open VnDms popup if user choose "no"', () => {
-        selectRowsByCol('id', [102]);
+        selectRowsByCol('id', [101]);
         cy.dataCy('preAccount_btn').click();
         cy.dataCy('updateFile_no').click();
         cy.get('#formModel').should('be.visible');
     });
 
     it('should ask to inherit the doc. and open VnDms popup if user choose "yes" and pre-account', () => {
-        selectRowsByCol('id', [102]);
+        selectRowsByCol('id', [101]);
         cy.dataCy('preAccount_btn').click();
         cy.dataCy('updateFile_yes').click();
         cy.checkNotification('It has been successfully pre-accounted');
-- 
2.40.1


From 35b09c829ed60eaadfcc7ef4c911c6f0033c6e5b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 8 Apr 2025 18:00:37 +0200
Subject: [PATCH 30/41] fix(EntryPreAccount): refs #8277 remove unused save-url
 property from table component

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

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 80ce315f4..d2e5d51f8 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -363,7 +363,6 @@ async function createInvoice(isAgricultural) {
         :columns
         :url
         :search-url="dataKey"
-        save-url="Entries/crud"
         ref="table"
         :disable-option="{ card: true }"
         redirect="Entry"
-- 
2.40.1


From a0e3aab4e0021c150346a8b0a13230b9e11c54ee Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 10 Apr 2025 11:33:19 +0200
Subject: [PATCH 31/41] feat(EntryPreAccount): refs #8277 add company color
 badge to invoice entry table

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

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index d2e5d51f8..fbc1d2fc5 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -406,6 +406,12 @@ async function createInvoice(isAgricultural) {
                 <EntryDescriptorProxy :id="row.id" />
             </span>
         </template>
+        <template #column-company="{ row }">
+            {{ row.color }}
+            <QBadge :color="{ 'background-color': `${row.color} !important` }">
+                {{ row.company }}
+            </QBadge>
+        </template>
         <template #column-gestDocFk="{ row }">
             <span class="link" @click.stop="downloadFile(row.gestDocFk)">
                 {{ row.gestDocFk }}
-- 
2.40.1


From fb638542bbb9dbab6f51ce6e748516d0d1a469eb Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 11 Apr 2025 17:17:01 +0200
Subject: [PATCH 32/41] refactor: refs #8277 remove redundant axios import from
 helper in EntryPreAccount tests

---
 src/pages/Entry/__tests__/EntryPreAccount.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Entry/__tests__/EntryPreAccount.spec.js b/src/pages/Entry/__tests__/EntryPreAccount.spec.js
index 3cdb3cb02..8690b82b8 100644
--- a/src/pages/Entry/__tests__/EntryPreAccount.spec.js
+++ b/src/pages/Entry/__tests__/EntryPreAccount.spec.js
@@ -1,6 +1,7 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { createWrapper } from 'app/test/vitest/helper';
 import EntryPreAccount from '../EntryPreAccount.vue';
+import axios from 'axios';
 
 describe('EntryPreAccount', () => {
     let wrapper;
-- 
2.40.1


From e680cbc25d4adfe0831dd8c25465995adf6f6779 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 14 Apr 2025 12:04:13 +0200
Subject: [PATCH 33/41] refactor: refs #8277 update invoice creation logic and
 adjust data filtering options

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

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index fbc1d2fc5..9cd44ac8e 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -172,7 +172,8 @@ const columns = computed(() => [
             name: 'accountType',
             options: entryAccounts.value,
             optionLabel: 'type',
-            optionValue: 'code',
+            optionValue: 'id',
+            sortBy: 'id',
         },
     },
     {
@@ -247,7 +248,7 @@ async function preAccount() {
                     params: { companyFk: firstRow.companyFk, year },
                 })
             ).data;
-            return createInvoice(true);
+            return createInvoice();
         } else if (dmsFk) {
             supplierRef = (
                 await axios.get(`Dms/${dmsFk}`, {
@@ -284,16 +285,15 @@ async function uploadFile() {
 async function afterUploadFile({ reference }, res) {
     supplierRef = reference;
     dmsFk = res.data[0].id;
-    await createInvoice(false);
+    await createInvoice();
 }
 
-async function createInvoice(isAgricultural) {
+async function createInvoice() {
     try {
-        await axios.post(`Entries/preAccount`, {
+        await axios.post(`Entries/addInvoiceIn`, {
             ids: selectedRows.value.map((entry) => entry.id),
             supplierRef,
             dmsFk,
-            isAgricultural,
         });
         notify(t('entry.preAccount.success'), 'positive');
     } catch (e) {
@@ -333,7 +333,7 @@ async function createInvoice(isAgricultural) {
     />
     <FetchData
         url="EntryAccounts"
-        :filter="{ fields: ['code', 'type'] }"
+        :filter="{ fields: ['id', 'type'] }"
         @on-fetch="(data) => (entryAccounts = data)"
         auto-load
     />
-- 
2.40.1


From a02174af7bc4d503932523269b2a2c25414a4731 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 14 Apr 2025 15:07:10 +0200
Subject: [PATCH 34/41] refactor: refs #8277 update QBadge styling for company
 column in invoice creation

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

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 9cd44ac8e..95e997949 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -407,10 +407,10 @@ async function createInvoice() {
             </span>
         </template>
         <template #column-company="{ row }">
-            {{ row.color }}
-            <QBadge :color="{ 'background-color': `${row.color} !important` }">
-                {{ row.company }}
-            </QBadge>
+            <QBadge
+                :style="{ backgroundColor: row.color ? `#${row.color}` : 'transparent' }"
+                :label="row.company"
+            />
         </template>
         <template #column-gestDocFk="{ row }">
             <span class="link" @click.stop="downloadFile(row.gestDocFk)">
-- 
2.40.1


From 3d1da8345c26a17198e2b58db010e835270bbf84 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 14 Apr 2025 17:02:39 +0200
Subject: [PATCH 35/41] refactor: refs #8277 simplify QBadge usage in invoice
 creation component

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

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 95e997949..c19370cc0 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -407,10 +407,7 @@ async function createInvoice() {
             </span>
         </template>
         <template #column-company="{ row }">
-            <QBadge
-                :style="{ backgroundColor: row.color ? `#${row.color}` : 'transparent' }"
-                :label="row.company"
-            />
+            <QBadge :color="row.color ?? 'transparent'" :label="row.company" />
         </template>
         <template #column-gestDocFk="{ row }">
             <span class="link" @click.stop="downloadFile(row.gestDocFk)">
-- 
2.40.1


From 00063ae20aeb31c794f91033da60c780d44fc58c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 15 Apr 2025 16:27:25 +0200
Subject: [PATCH 36/41] fix: refs #8277 update entry account options to use
 'code' for value and sorting

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

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index c19370cc0..7e6f22b59 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -172,8 +172,8 @@ const columns = computed(() => [
             name: 'accountType',
             options: entryAccounts.value,
             optionLabel: 'type',
-            optionValue: 'id',
-            sortBy: 'id',
+            optionValue: 'code',
+            sortBy: 'code',
         },
     },
     {
@@ -333,8 +333,10 @@ async function createInvoice() {
     />
     <FetchData
         url="EntryAccounts"
-        :filter="{ fields: ['id', 'type'] }"
-        @on-fetch="(data) => (entryAccounts = data)"
+        :filter="{ fields: ['code', 'type'] }"
+        @on-fetch="
+            (data) => (entryAccounts = data.map((x) => ({ ...x, type: $t(x.type) })))
+        "
         auto-load
     />
     <FetchData
-- 
2.40.1


From d51b03a941a6fe505b62ae0e692e940bbe4aa9cc Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 15 Apr 2025 18:50:13 +0200
Subject: [PATCH 37/41] fix: refs #8277 update preAccount function to handle
 agricultural entries and adjust notification checks

---
 src/pages/Entry/EntryPreAccount.vue           | 39 +++++++++++--------
 .../integration/entry/entryPreAccount.spec.js |  6 +++
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 7e6f22b59..dfb0d7ed1 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -230,23 +230,17 @@ function filterByDaysAgo(val) {
 
 async function preAccount() {
     const entries = selectedRows.value;
-    for (let i = 0; i < entries.length; i++) {
-        const { supplierFk, companyFk } = entries[i];
-        const nextEntry = entries[+i + 1];
-
-        if (!dmsFk && entries[i].gestDocFk) dmsFk = entries[i].gestDocFk;
-        if (!nextEntry) break;
-        else if (nextEntry.supplierFk !== supplierFk || nextEntry.companyFk !== companyFk)
-            return notify('Entries must have the same supplier and company', 'negative');
-    }
-    const firstRow = entries.at(0);
+    const { companyFk, isAgricultural, landed } = entries.at(0);
     try {
-        if (firstRow.isAgricultural) {
-            const year = new Date(firstRow.landed).getFullYear();
+        await axios.get('Entries/canAddInvoiceIn', {
+            params: { entryIds: entries.map(({ id }) => id) },
+        });
+
+        dmsFk = entries.find(({ gestDocFk }) => gestDocFk)?.gestDocFk;
+        if (isAgricultural) {
+            const year = new Date(landed).getFullYear();
             supplierRef = (
-                await axios.get('InvoiceIns/getMaxRef', {
-                    params: { companyFk: firstRow.companyFk, year },
-                })
+                await axios.get('InvoiceIns/getMaxRef', { params: { companyFk, year } })
             ).data;
             return createInvoice();
         } else if (dmsFk) {
@@ -266,7 +260,7 @@ async function preAccount() {
 
 async function updateFile() {
     await axios.post(`Dms/${dmsFk}/updateFile`, { dmsTypeId: dmsTypeId.value });
-    await createInvoice(false);
+    await createInvoice();
 }
 
 async function uploadFile() {
@@ -335,7 +329,7 @@ async function createInvoice() {
         url="EntryAccounts"
         :filter="{ fields: ['code', 'type'] }"
         @on-fetch="
-            (data) => (entryAccounts = data.map((x) => ({ ...x, type: $t(x.type) })))
+            (data) => (entryAccounts = data.map((x) => ({ ...x, type: t(x.type) })))
         "
         auto-load
     />
@@ -467,3 +461,14 @@ async function createInvoice() {
         />
     </QDialog>
 </template>
+<i18n>
+en:
+    IntraCommunity: Intra-community
+    NonCommunity: Non-community
+    CanaryIsland: Canary Islands
+es:
+    IntraCommunity: Intracomunitario
+    NonCommunity: Extracomunitario
+    CanaryIsland: Islas Canarias
+    National: Nacional
+</i18n>
diff --git a/test/cypress/integration/entry/entryPreAccount.spec.js b/test/cypress/integration/entry/entryPreAccount.spec.js
index 5a9c0f183..8b271a493 100644
--- a/test/cypress/integration/entry/entryPreAccount.spec.js
+++ b/test/cypress/integration/entry/entryPreAccount.spec.js
@@ -11,6 +11,12 @@ describe('Entry PreAccount Functionality', () => {
         cy.checkNotification('Entries must have the same supplier and company');
     });
 
+    it('should handle entries with different gestdoc files', () => {
+        selectRowsByCol('id', [3, 101]);
+        cy.dataCy('preAccount_btn').click();
+        cy.checkNotification('Entries have different gestdoc file');
+    });
+
     it("should pre-account without questions if it's agricultural", () => {
         selectRowsByCol('id', [2]);
         cy.dataCy('preAccount_btn').click();
-- 
2.40.1


From 4c8681d124dfb803348884d4106c95b5794ba9d3 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 16 Apr 2025 18:30:04 +0200
Subject: [PATCH 38/41] refactor: refs #8277 update daysAgo logic to use
 dynamic maxDays and defaultDays from API response

---
 src/pages/Entry/EntryPreAccount.vue           | 27 ++++++++++---------
 .../Entry/__tests__/EntryPreAccount.spec.js   | 18 ++++++++-----
 .../integration/entry/entryPreAccount.spec.js | 16 ++---------
 3 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index dfb0d7ed1..42b741e2b 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -27,8 +27,8 @@ const user = useState().getUser();
 const stateStore = useStateStore();
 const updateDialog = ref();
 const uploadDialog = ref();
-const MAXDAYS = 365;
-const DEFAULTDAYS = 60;
+let maxDays;
+let defaultDays;
 const dataKey = 'entryPreaccountingFilter';
 const url = 'Entries/preAccountingFilter';
 const arrayData = useArrayData(dataKey);
@@ -204,8 +204,13 @@ const columns = computed(() => [
     },
 ]);
 
-onBeforeMount(() => {
-    daysAgo.value = arrayData.store.userParams.daysAgo || DEFAULTDAYS;
+onBeforeMount(async () => {
+    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;
     stateStore.leftDrawer = false;
 });
@@ -221,8 +226,8 @@ watch(selectedRows, (nVal, oVal) => {
 });
 
 function filterByDaysAgo(val) {
-    if (!val) val = DEFAULTDAYS;
-    else if (val > MAXDAYS) val = MAXDAYS;
+    if (!val) val = defaultDays;
+    else if (val > maxDays) val = maxDays;
     daysAgo.value = val;
     arrayData.store.userParams.daysAgo = daysAgo.value;
     table.value.reload();
@@ -232,10 +237,6 @@ async function preAccount() {
     const entries = selectedRows.value;
     const { companyFk, isAgricultural, landed } = entries.at(0);
     try {
-        await axios.get('Entries/canAddInvoiceIn', {
-            params: { entryIds: entries.map(({ id }) => id) },
-        });
-
         dmsFk = entries.find(({ gestDocFk }) => gestDocFk)?.gestDocFk;
         if (isAgricultural) {
             const year = new Date(landed).getFullYear();
@@ -293,10 +294,10 @@ async function createInvoice() {
     } catch (e) {
         throw e;
     } finally {
-        table.value.reload();
         supplierRef = null;
         dmsFk = undefined;
         selectedRows.value.length = 0;
+        table.value.reload();
     }
 }
 </script>
@@ -434,7 +435,7 @@ async function createInvoice() {
     >
         <template #actions>
             <QBtn
-                data-cy="updateFile_yes"
+                data-cy="updateFileYes"
                 :label="t('globals.yes')"
                 color="primary"
                 @click="updateFile"
@@ -442,7 +443,7 @@ async function createInvoice() {
                 v-close-popup
             />
             <QBtn
-                data-cy="updateFile_no"
+                data-cy="updateFileNo"
                 :label="t('globals.no')"
                 color="primary"
                 flat
diff --git a/src/pages/Entry/__tests__/EntryPreAccount.spec.js b/src/pages/Entry/__tests__/EntryPreAccount.spec.js
index 8690b82b8..0140a5f1e 100644
--- a/src/pages/Entry/__tests__/EntryPreAccount.spec.js
+++ b/src/pages/Entry/__tests__/EntryPreAccount.spec.js
@@ -8,7 +8,11 @@ describe('EntryPreAccount', () => {
     let vm;
 
     beforeAll(() => {
-        vi.spyOn(axios, 'get').mockImplementation(() => ({ data: [] }));
+        vi.spyOn(axios, 'get').mockImplementation((url) => {
+            if (url == 'EntryConfigs/findOne')
+                return { data: { maxDays: 90, defaultDays: 30 } };
+            return { data: [] };
+        });
         wrapper = createWrapper(EntryPreAccount);
         vm = wrapper.vm;
     });
@@ -18,16 +22,16 @@ describe('EntryPreAccount', () => {
     });
 
     describe('filterByDaysAgo()', () => {
-        it('should set daysAgo to DEFAULTDAYS if no value is provided', () => {
+        it('should set daysAgo to defaultDays if no value is provided', () => {
             vm.filterByDaysAgo();
-            expect(vm.daysAgo).toBe(vm.DEFAULTDAYS);
-            expect(vm.arrayData.store.userParams.daysAgo).toBe(vm.DEFAULTDAYS);
+            expect(vm.daysAgo).toBe(vm.defaultDays);
+            expect(vm.arrayData.store.userParams.daysAgo).toBe(vm.defaultDays);
         });
 
-        it('should set daysAgo to MAXDAYS if the value exceeds MAXDAYS', () => {
+        it('should set daysAgo to maxDays if the value exceeds maxDays', () => {
             vm.filterByDaysAgo(500);
-            expect(vm.daysAgo).toBe(vm.MAXDAYS);
-            expect(vm.arrayData.store.userParams.daysAgo).toBe(vm.MAXDAYS);
+            expect(vm.daysAgo).toBe(vm.maxDays);
+            expect(vm.arrayData.store.userParams.daysAgo).toBe(vm.maxDays);
         });
 
         it('should set daysAgo to the provided value if it is valid', () => {
diff --git a/test/cypress/integration/entry/entryPreAccount.spec.js b/test/cypress/integration/entry/entryPreAccount.spec.js
index 8b271a493..59fa4ee45 100644
--- a/test/cypress/integration/entry/entryPreAccount.spec.js
+++ b/test/cypress/integration/entry/entryPreAccount.spec.js
@@ -5,18 +5,6 @@ describe('Entry PreAccount Functionality', () => {
         cy.visit('/#/entry/pre-account');
     });
 
-    it('should handle entries with different suppliers or companies', () => {
-        selectRowsByCol('id', [3, 2]);
-        cy.dataCy('preAccount_btn').click();
-        cy.checkNotification('Entries must have the same supplier and company');
-    });
-
-    it('should handle entries with different gestdoc files', () => {
-        selectRowsByCol('id', [3, 101]);
-        cy.dataCy('preAccount_btn').click();
-        cy.checkNotification('Entries have different gestdoc file');
-    });
-
     it("should pre-account without questions if it's agricultural", () => {
         selectRowsByCol('id', [2]);
         cy.dataCy('preAccount_btn').click();
@@ -37,14 +25,14 @@ describe('Entry PreAccount Functionality', () => {
     it('should ask to inherit the doc. and open VnDms popup if user choose "no"', () => {
         selectRowsByCol('id', [101]);
         cy.dataCy('preAccount_btn').click();
-        cy.dataCy('updateFile_no').click();
+        cy.dataCy('updateFileNo').click();
         cy.get('#formModel').should('be.visible');
     });
 
     it('should ask to inherit the doc. and open VnDms popup if user choose "yes" and pre-account', () => {
         selectRowsByCol('id', [101]);
         cy.dataCy('preAccount_btn').click();
-        cy.dataCy('updateFile_yes').click();
+        cy.dataCy('updateFileYes').click();
         cy.checkNotification('It has been successfully pre-accounted');
     });
 });
-- 
2.40.1


From 7e04a794cb31e692b0341e9c1ddb8801d4725ff5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 17 Apr 2025 10:49:35 +0200
Subject: [PATCH 39/41] chore: refs #8277 rename received

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

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 42b741e2b..1fc728407 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -197,8 +197,8 @@ const columns = computed(() => [
         component: 'checkbox',
     },
     {
-        name: 'received',
-        label: t('entry.preAccount.received'),
+        name: 'isReceived',
+        label: t('entry.preAccount.isReceived'),
         component: 'checkbox',
         isEditable: false,
     },
@@ -247,7 +247,7 @@ async function preAccount() {
         } else if (dmsFk) {
             supplierRef = (
                 await axios.get(`Dms/${dmsFk}`, {
-                    params: { filter: JSON.stringify({ fields: { reference: true } }) },
+                    params: { filter: JSON.stringify({ fields: ['reference'] }) },
                 })
             ).data?.reference;
             updateDialog.value.show();
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 3428e3153..b4f40c4e2 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -132,7 +132,7 @@ entry:
         description: Entry type
         payDem: Payment term
         isBooked: B
-        received: R
+        isReceived: R
         entryType: Entry type
         isAgricultural: Agricultural
         accountType: Account type
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 2d9f203b9..e462b30f3 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -83,7 +83,7 @@ entry:
         description: Tipo de Entrada
         payDem: Plazo de pago
         isBooked: C
-        received: R
+        isReceived: R
         entryType: Tipo de entrada
         isAgricultural: Agricultural
         accountType: Tipo de cuenta
-- 
2.40.1


From 200b1ab329776c1dd54daf834ac2ecc8037f5574 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 17 Apr 2025 16:27:00 +0200
Subject: [PATCH 40/41] refactor(EntryPreAccount): refs #8277 rename
 accountType to fiscalCode and update related data fetching

---
 src/pages/Entry/EntryPreAccount.vue | 26 ++++++++++++++------------
 src/pages/Entry/locale/en.yml       |  2 +-
 src/pages/Entry/locale/es.yml       |  2 +-
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 1fc728407..cda2ffd5e 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -39,7 +39,7 @@ const table = useTemplateRef('table');
 const companies = ref([]);
 const countries = ref([]);
 const entryTypes = ref([]);
-const entryAccounts = ref([]);
+const supplierFiscalTypes = ref([]);
 const warehouses = ref([]);
 const defaultDmsDescription = ref();
 const dmsTypeId = ref();
@@ -165,13 +165,14 @@ const columns = computed(() => [
         },
     },
     {
-        name: 'accountType',
-        label: t('entry.preAccount.accountType'),
+        name: 'fiscalCode',
+        label: t('entry.preAccount.fiscalCode'),
+        format: ({ fiscalCode }) => t(fiscalCode),
         columnFilter: {
             component: 'select',
-            name: 'accountType',
-            options: entryAccounts.value,
-            optionLabel: 'type',
+            name: 'fiscalCode',
+            options: supplierFiscalTypes.value,
+            optionLabel: 'locale',
             optionValue: 'code',
             sortBy: 'code',
         },
@@ -327,10 +328,11 @@ async function createInvoice() {
         auto-load
     />
     <FetchData
-        url="EntryAccounts"
-        :filter="{ fields: ['code', 'type'] }"
+        url="supplierFiscalTypes"
+        :filter="{ fields: ['code'] }"
         @on-fetch="
-            (data) => (entryAccounts = data.map((x) => ({ ...x, type: t(x.type) })))
+            (data) =>
+                (supplierFiscalTypes = data.map((x) => ({ locale: t(x.code), ...x })))
         "
         auto-load
     />
@@ -466,10 +468,10 @@ async function createInvoice() {
 en:
     IntraCommunity: Intra-community
     NonCommunity: Non-community
-    CanaryIsland: Canary Islands
+    CanaryIslands: Canary Islands
 es:
-    IntraCommunity: Intracomunitario
-    NonCommunity: Extracomunitario
+    IntraCommunity: Intracomunitaria
+    NonCommunity: Extracomunitaria
     CanaryIsland: Islas Canarias
     National: Nacional
 </i18n>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index b4f40c4e2..3c0f078fe 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -135,7 +135,7 @@ entry:
         isReceived: R
         entryType: Entry type
         isAgricultural: Agricultural
-        accountType: Account type
+        fiscalCode: Account type
         daysAgo: Max 365 days
         search: Search
         searchInfo: You can search by supplier name or nickname
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index e462b30f3..0addbca94 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -86,7 +86,7 @@ entry:
         isReceived: R
         entryType: Tipo de entrada
         isAgricultural: Agricultural
-        accountType: Tipo de cuenta
+        fiscalCode: Tipo de cuenta
         daysAgo: Máximo 365 días
         search: Buscar
         searchInfo: Puedes buscar por nombre o alias de proveedor
-- 
2.40.1


From 23ceaf9c9bfd242d3212296c11e1c1b1a0f7a0d7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 17 Apr 2025 18:10:46 +0200
Subject: [PATCH 41/41] fix(itemTax): refs #8277 update tax type from 'General
 VAT' to 'IVA General' for accuracy

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

diff --git a/test/cypress/integration/item/itemTax.spec.js b/test/cypress/integration/item/itemTax.spec.js
index 971e3a732..10c3ee889 100644
--- a/test/cypress/integration/item/itemTax.spec.js
+++ b/test/cypress/integration/item/itemTax.spec.js
@@ -6,7 +6,7 @@ describe('Item tax', () => {
     });
 
     it('should modify the tax for Spain', () => {
-        cy.dataCy('Class_select').eq(1).type('General VAT{enter}');
+        cy.dataCy('Class_select').eq(1).type('IVA General{enter}');
         cy.dataCy('crudModelDefaultSaveBtn').click();
         cy.checkNotification('Data saved');
     });
-- 
2.40.1