From b49c912b66a05173db935c8227d5eb8c9b36cd7f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 26 Nov 2024 12:51:50 +0100
Subject: [PATCH 01/38] fix: refs #7936 rollback

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

diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 08834ecb8..c2637bac3 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -187,7 +187,6 @@ const formatOpt = (row, { model, options }, prop) => {
                 </template>
                 <template #body-cell-taxablebase="{ row }">
                     <QTd>
-                        {{ currency }}
                         <VnInputNumber
                             :class="{
                                 'no-pointer-events': isNotEuro(currency),
-- 
2.40.1


From cc72f220dc2989fad37e27e60771b83d32fa1cbe Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 26 Nov 2024 13:26:14 +0100
Subject: [PATCH 02/38] feat: refs #7936 enhance vn-select

---
 src/components/common/VnSelect.vue               | 14 +++++++++++++-
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue |  5 ++++-
 src/pages/InvoiceIn/InvoiceInFilter.vue          |  1 -
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 571faad64..0167451b4 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -312,7 +312,7 @@ function handleKeyDown(event) {
             <QIcon
                 v-show="value"
                 name="close"
-                @click.stop="
+                @click="
                     () => {
                         value = null;
                         emit('remove');
@@ -325,6 +325,18 @@ function handleKeyDown(event) {
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
             <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
         </template>
+        <template #option="{ opt, itemProps }">
+            <QItem v-bind="itemProps">
+                <QItemSection>
+                    <QItemLabel v-if="opt[optionValue] == opt[optionLabel]">{{
+                        opt[optionLabel]
+                    }}</QItemLabel>
+                    <QItemLabel v-else>{{
+                        `#${opt[optionValue]} - ${opt[optionLabel]}`
+                    }}</QItemLabel>
+                </QItemSection>
+            </QItem>
+        </template>
     </QSelect>
 </template>
 
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 92f3fffca..50631f7ab 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -356,7 +356,10 @@ const createInvoiceInCorrection = async () => {
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('invoiceIn.list.issued')" :value="toDate(entity.issued)" />
-            <VnLv :label="t('invoiceIn.summary.booked')" :value="toDate(entity.booked)" />
+            <VnLv
+                :label="t('invoiceIn.summary.bookedDate')"
+                :value="toDate(entity.booked)"
+            />
             <VnLv :label="t('invoiceIn.list.amount')" :value="toCurrency(totalAmount)" />
             <VnLv :label="t('invoiceIn.list.supplier')">
                 <template #value>
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index d1c0856b5..605d6eda8 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -50,7 +50,6 @@ const activities = ref([]);
                         dense
                         outlined
                         rounded
-                        :filter-options="['id', 'name']"
                     />
                 </QItemSection>
             </QItem>
-- 
2.40.1


From 185d4f93a74219d70fdc1974f1df3761340c999b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 26 Nov 2024 13:41:26 +0100
Subject: [PATCH 03/38] fix: refs #7936 serial

---
 src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue b/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue
index 4f8c9d70b..19ed73e50 100644
--- a/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue
+++ b/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue
@@ -8,7 +8,11 @@ defineProps({ dataKey: { type: String, required: true } });
 const { t } = useI18n();
 </script>
 <template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true">
+    <VnFilterPanel
+        :data-key="dataKey"
+        :search-button="true"
+        :unremovable-params="['daysAgo']"
+    >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
-- 
2.40.1


From f5f1cdf0ac03a04a2604f6c6f234cd5f4e5e1142 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 26 Nov 2024 14:06:14 +0100
Subject: [PATCH 04/38] fix: refs #7936 tabulation wip

---
 src/components/common/VnSelect.vue        | 23 -----------------------
 src/pages/InvoiceIn/Card/InvoiceInVat.vue |  3 ---
 2 files changed, 26 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 0167451b4..7b12b2852 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -259,28 +259,6 @@ async function onScroll({ to, direction, from, index }) {
 }
 
 defineExpose({ opts: myOptions });
-
-function handleKeyDown(event) {
-    if (event.key === 'Tab') {
-        event.preventDefault();
-
-        const inputValue = vnSelectRef.value?.inputValue;
-
-        if (inputValue) {
-            const matchingOption = myOptions.value.find(
-                (option) =>
-                    option[optionLabel.value].toLowerCase() === inputValue.toLowerCase()
-            );
-
-            if (matchingOption) {
-                emit('update:modelValue', matchingOption[optionValue.value]);
-            } else {
-                emit('update:modelValue', inputValue);
-            }
-            vnSelectRef.value?.hidePopup();
-        }
-    }
-}
 </script>
 
 <template>
@@ -291,7 +269,6 @@ function handleKeyDown(event) {
         :option-value="optionValue"
         v-bind="$attrs"
         @filter="filterHandler"
-        @keydown="handleKeyDown"
         :emit-value="nullishToTrue($attrs['emit-value'])"
         :map-options="nullishToTrue($attrs['map-options'])"
         :use-input="nullishToTrue($attrs['use-input'])"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index c2637bac3..526092f02 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -208,7 +208,6 @@ const formatOpt = (row, { model, options }, prop) => {
                             :option-label="col.optionLabel"
                             :filter-options="['id', 'vat']"
                             :hide-selected="false"
-                            :fill-input="false"
                             :display-value="formatOpt(row, col, 'vat')"
                         >
                             <template #option="scope">
@@ -233,9 +232,7 @@ const formatOpt = (row, { model, options }, prop) => {
                             :option-label="col.optionLabel"
                             :filter-options="['id', 'transaction']"
                             :autofocus="col.tabIndex == 1"
-                            input-debounce="0"
                             :hide-selected="false"
-                            :fill-input="false"
                             :display-value="formatOpt(row, col, 'transaction')"
                         >
                             <template #option="scope">
-- 
2.40.1


From 070b831392e2acf2f2e4056c5380c9a6ec88f47c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 26 Nov 2024 14:48:32 +0100
Subject: [PATCH 05/38] feat: refs #7936 limit decimal places

---
 src/components/common/VnInputNumber.vue | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/components/common/VnInputNumber.vue b/src/components/common/VnInputNumber.vue
index 1cad6c245..460b39d63 100644
--- a/src/components/common/VnInputNumber.vue
+++ b/src/components/common/VnInputNumber.vue
@@ -1,13 +1,26 @@
 <script setup>
 import VnInput from 'src/components/common/VnInput.vue';
-import { ref } from 'vue';
-import { useAttrs } from 'vue';
+
+defineProps({
+    step: { type: Number, default: 0.01 },
+    decimalPlaces: { type: Number, default: 2 },
+});
 
 const model = defineModel({ type: [Number, String] });
-const $attrs = useAttrs();
-const step = ref($attrs.step || 0.01);
 </script>
-
 <template>
-    <VnInput v-bind="$attrs" v-model.number="model" type="number" :step="step" />
+    <VnInput
+        v-bind="$attrs"
+        v-model.number="model"
+        type="number"
+        :step="step"
+        @input="
+            (evt) => {
+                const val = evt.target.value;
+                const [, decimal] = val.split('.');
+                if (val && decimal?.length > decimalPlaces)
+                    model = parseFloat(val).toFixed(decimalPlaces);
+            }
+        "
+    />
 </template>
-- 
2.40.1


From 3f2cd6294874bcc7c09e0a99b3be4ec9f7784f6f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 26 Nov 2024 14:53:53 +0100
Subject: [PATCH 06/38] fix: refs #7936 decimal places & locale

---
 src/composables/getTotal.js                     | 4 ++--
 src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue | 2 +-
 src/pages/InvoiceIn/Card/InvoiceInVat.vue       | 5 -----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/composables/getTotal.js b/src/composables/getTotal.js
index 41c4330c4..24ac3aa27 100644
--- a/src/composables/getTotal.js
+++ b/src/composables/getTotal.js
@@ -1,10 +1,10 @@
 import { toCurrency } from 'src/filters';
 
 export function getTotal(rows, key, opts = {}) {
-    const { currency, cb } = opts;
+    const { currency, cb, decimalPlaces } = opts;
     const total = rows.reduce((acc, row) => acc + +(cb ? cb(row) : row[key] || 0), 0);
 
     return currency
         ? toCurrency(total, currency == 'default' ? undefined : currency)
-        : total;
+        : parseFloat(total).toFixed(decimalPlaces ?? 2);
 }
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index bee50a07d..08ce0755d 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -261,7 +261,7 @@ const formatOpt = (row, { model, options }, prop) => {
         country: Country
     es:
         Code: Código
-        amount: Cantidad
+        amount: Valor mercancía
         net: Neto
         stems: Tallos
         country: País
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 526092f02..100eecda6 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -188,11 +188,6 @@ const formatOpt = (row, { model, options }, prop) => {
                 <template #body-cell-taxablebase="{ row }">
                     <QTd>
                         <VnInputNumber
-                            :class="{
-                                'no-pointer-events': isNotEuro(currency),
-                            }"
-                            :disable="isNotEuro(currency)"
-                            label=""
                             clear-icon="close"
                             v-model="row.taxableBase"
                             clearable
-- 
2.40.1


From aba33a617ee8d331c010cb67b3656b1049e4ed96 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 26 Nov 2024 16:34:37 +0100
Subject: [PATCH 07/38] fix: refs #7936 changes

---
 src/components/ui/VnFilterPanel.vue     | 23 +++++++++++--
 src/i18n/locale/en.yml                  |  4 +++
 src/i18n/locale/es.yml                  |  4 +++
 src/pages/InvoiceIn/InvoiceInFilter.vue | 43 +++++++++++++++----------
 src/pages/InvoiceIn/InvoiceInList.vue   | 12 +++++++
 5 files changed, 66 insertions(+), 20 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index fb1125fda..714fe3f31 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -6,7 +6,7 @@ import { useRoute } from 'vue-router';
 import toDate from 'filters/toDate';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
-const { t } = useI18n();
+const { t, te } = useI18n();
 const $props = defineProps({
     modelValue: {
         type: Object,
@@ -226,6 +226,12 @@ function sanitizer(params) {
     }
     return params;
 }
+
+const getLocale = (label) => {
+    const param = label.split('.').at(-1);
+    const globalLocale = `globals.params.${param}`;
+    return te(globalLocale) ? t(globalLocale) : t(`params.${param}`);
+};
 </script>
 
 <template>
@@ -274,7 +280,12 @@ function sanitizer(params) {
                         :removable="!unremovableParams?.includes(chip.label)"
                         @remove="remove(chip.label)"
                     >
-                        <slot name="tags" :tag="chip" :format-fn="formatValue">
+                        <slot
+                            name="tags"
+                            :tag="chip"
+                            :format-fn="formatValue"
+                            :get-locale="getLocale"
+                        >
                             <div class="q-gutter-x-xs">
                                 <strong>{{ chip.label }}:</strong>
                                 <span>"{{ formatValue(chip.value) }}"</span>
@@ -287,6 +298,7 @@ function sanitizer(params) {
                         :params="userParams"
                         :tags="customTags"
                         :format-fn="formatValue"
+                        :get-locale="getLocale"
                         :search-fn="search"
                     />
                 </div>
@@ -294,7 +306,12 @@ function sanitizer(params) {
             <QSeparator />
         </QList>
         <QList dense class="list q-gutter-y-sm q-mt-sm">
-            <slot name="body" :params="sanitizer(userParams)" :search-fn="search"></slot>
+            <slot
+                name="body"
+                :params="sanitizer(userParams)"
+                :get-locale="getLocale"
+                :search-fn="search"
+            ></slot>
         </QList>
     </QForm>
     <QInnerLoading
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 221908dbf..622ef833b 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -331,6 +331,10 @@ globals:
         fi: FI
         myTeam: My team
         departmentFk: Department
+        companyFk: Company
+        from: From
+        to: To
+        supplierFk: Supplier
     changePass: Change password
     deleteConfirmTitle: Delete selected elements
     changeState: Change state
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 1a075dc50..20317aa49 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -335,6 +335,10 @@ globals:
         SSN: NSS
         fi: NIF
         myTeam: Mi equipo
+        companyFk: Empresa
+        from: Desde
+        to: Hasta
+        supplierFk: Proveedor
     changePass: Cambiar contraseña
     deleteConfirmTitle: Eliminar los elementos seleccionados
     changeState: Cambiar estado
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 605d6eda8..1e8b650a1 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -21,21 +21,29 @@ const activities = ref([]);
         @on-fetch="(data) => (activities = data)"
     />
     <VnFilterPanel :data-key="dataKey" :search-button="true">
-        <template #tags="{ tag, formatFn }">
+        <template #tags="{ tag, formatFn, getLocale }">
             <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <strong>{{ getLocale(tag.label) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
         <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
-                    <VnInputDate :label="t('From')" v-model="params.from" is-outlined />
+                    <VnInputDate
+                        :label="t('globals.from')"
+                        v-model="params.from"
+                        is-outlined
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInputDate :label="t('To')" v-model="params.to" is-outlined />
+                    <VnInputDate
+                        :label="t('globals.to')"
+                        v-model="params.to"
+                        is-outlined
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -45,7 +53,6 @@ const activities = ref([]);
                         url="Suppliers"
                         :fields="['id', 'nickname']"
                         :label="t('params.supplierFk')"
-                        option-value="id"
                         option-label="nickname"
                         dense
                         outlined
@@ -112,6 +119,20 @@ const activities = ref([]);
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        v-model="params.companyFk"
+                        :label="t('globals.company')"
+                        url="Companies"
+                        option-label="code"
+                        :fields="['id', 'code']"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <QCheckbox
@@ -120,8 +141,6 @@ const activities = ref([]);
                         @update:model-value="searchFn()"
                         toggle-indeterminate
                     />
-                </QItemSection>
-                <QItemSection>
                     <QCheckbox
                         :label="t('params.correctingFk')"
                         v-model="params.correctingFk"
@@ -141,7 +160,6 @@ en:
         supplierRef: Supplier ref.
         supplierFk: Supplier
         fi: Supplier fiscal id
-        clientFk: Customer
         amount: Amount
         created: Created
         awb: AWB
@@ -152,17 +170,13 @@ en:
         isBooked: is booked
         correctedFk: Rectified
         issued: Issued
-        to: To
-        from: From
         awbCode: AWB
         correctingFk: Rectificative
-        supplierActivityFk: Supplier activity
 es:
     params:
         search: Id o nombre proveedor
         supplierRef: Ref. proveedor
         supplierFk: Proveedor
-        clientFk: Cliente
         fi: CIF proveedor
         serialNumber: Num. serie
         serial: Serie
@@ -175,11 +189,6 @@ es:
         dued: Vencida
         correctedFk: Rectificada
         correctingFk: Rectificativa
-        supplierActivityFk: Actividad proveedor
-        from: Desde
-        to: Hasta
-    From: Desde
-    To: Hasta
     Amount: Importe
     Issued: Fecha factura
     Id or supplier: Id o proveedor
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 8d658bee3..0beb2cdf8 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -79,6 +79,18 @@ const cols = computed(() => [
         label: t('invoiceIn.list.amount'),
         format: ({ amount }) => toCurrency(amount),
     },
+    {
+        name: 'companyFk',
+        label: t('globals.company'),
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Companies',
+                fields: ['id', 'code'],
+                optionLabel: 'code',
+            },
+        },
+    },
     {
         align: 'right',
         name: 'tableActions',
-- 
2.40.1


From 953f6f4af3564ad84ec81c81365a737f80261a2c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 27 Nov 2024 09:54:56 +0100
Subject: [PATCH 08/38] refactor: refs #7936 locale

---
 src/components/ui/VnFilterPanel.vue           |  4 +-
 src/i18n/locale/en.yml                        |  6 ++
 src/i18n/locale/es.yml                        |  4 ++
 .../InvoiceIn/Card/InvoiceInBasicData.vue     |  2 +-
 .../InvoiceIn/Card/InvoiceInDescriptor.vue    | 10 +--
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 68 +++++++++----------
 src/pages/InvoiceIn/InvoiceInCreate.vue       |  6 +-
 src/pages/InvoiceIn/InvoiceInFilter.vue       | 47 +++----------
 src/pages/InvoiceIn/InvoiceInList.vue         | 18 ++---
 src/pages/InvoiceIn/locale/en.yml             |  7 +-
 src/pages/InvoiceIn/locale/es.yml             |  6 +-
 11 files changed, 85 insertions(+), 93 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 714fe3f31..22bd89675 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -230,7 +230,9 @@ function sanitizer(params) {
 const getLocale = (label) => {
     const param = label.split('.').at(-1);
     const globalLocale = `globals.params.${param}`;
-    return te(globalLocale) ? t(globalLocale) : t(`params.${param}`);
+    if (te(globalLocale)) return t(globalLocale);
+    else if (te(t(`params.${param}`)));
+    else return t(`${route.meta.moduleName}.params.${param}`);
 };
 </script>
 
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 622ef833b..e89bf3ba3 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -335,6 +335,12 @@ globals:
         from: From
         to: To
         supplierFk: Supplier
+        supplierRef: Supplier ref
+        serial: Serial
+        amount: Importe
+        awbCode: AWB
+        correctedFk: Rectified
+        correctingFk: Rectificative
     changePass: Change password
     deleteConfirmTitle: Delete selected elements
     changeState: Change state
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 20317aa49..e1080421d 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -339,6 +339,10 @@ globals:
         from: Desde
         to: Hasta
         supplierFk: Proveedor
+        supplierRef: Ref. proveedor
+        serial: Serie
+        amount: Importe
+        awbCode: AWB
     changePass: Cambiar contraseña
     deleteConfirmTitle: Eliminar los elementos seleccionados
     changeState: Cambiar estado
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 209681b7c..d22ee5b16 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -262,7 +262,7 @@ function deleteFile(dmsFk) {
             </VnRow>
             <VnRow>
                 <VnSelect
-                    :label="t('invoiceIn.summary.sage')"
+                    :label="t('InvoiceIn.summary.sage')"
                     v-model="data.withholdingSageFk"
                     :options="sageWithholdings"
                     option-value="id"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 50631f7ab..10575eb69 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -355,13 +355,13 @@ const createInvoiceInCorrection = async () => {
             </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('invoiceIn.list.issued')" :value="toDate(entity.issued)" />
+            <VnLv :label="t('Invoicein.list.issued')" :value="toDate(entity.issued)" />
             <VnLv
-                :label="t('invoiceIn.summary.bookedDate')"
+                :label="t('Invoicein.summary.bookedDate')"
                 :value="toDate(entity.booked)"
             />
-            <VnLv :label="t('invoiceIn.list.amount')" :value="toCurrency(totalAmount)" />
-            <VnLv :label="t('invoiceIn.list.supplier')">
+            <VnLv :label="t('Invoicein.list.amount')" :value="toCurrency(totalAmount)" />
+            <VnLv :label="t('Invoicein.list.supplier')">
                 <template #value>
                     <span class="link">
                         {{ entity?.supplier?.nickname }}
@@ -378,7 +378,7 @@ const createInvoiceInCorrection = async () => {
                     color="primary"
                     :to="routes.getSupplier(entity.supplierFk)"
                 >
-                    <QTooltip>{{ t('invoiceIn.list.supplier') }}</QTooltip>
+                    <QTooltip>{{ t('Invoicein.list.supplier') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 08fc11f69..06e6d790f 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -26,14 +26,14 @@ const intrastatTotals = ref({ amount: 0, net: 0, stems: 0 });
 const vatColumns = ref([
     {
         name: 'expense',
-        label: 'invoiceIn.summary.expense',
+        label: 'InvoiceIn.summary.expense',
         field: (row) => row.expenseFk,
         sortable: true,
         align: 'left',
     },
     {
         name: 'landed',
-        label: 'invoiceIn.summary.taxableBase',
+        label: 'InvoiceIn.summary.taxableBase',
         field: (row) => row.taxableBase,
         format: (value) => toCurrency(value),
         sortable: true,
@@ -41,7 +41,7 @@ const vatColumns = ref([
     },
     {
         name: 'vat',
-        label: 'invoiceIn.summary.sageVat',
+        label: 'InvoiceIn.summary.sageVat',
         field: (row) => {
             if (row.taxTypeSage) return `#${row.taxTypeSage.id} : ${row.taxTypeSage.vat}`;
         },
@@ -51,7 +51,7 @@ const vatColumns = ref([
     },
     {
         name: 'transaction',
-        label: 'invoiceIn.summary.sageTransaction',
+        label: 'InvoiceIn.summary.sageTransaction',
         field: (row) => {
             if (row.transactionTypeSage)
                 return `#${row.transactionTypeSage.id} : ${row.transactionTypeSage?.transaction}`;
@@ -62,7 +62,7 @@ const vatColumns = ref([
     },
     {
         name: 'rate',
-        label: 'invoiceIn.summary.rate',
+        label: 'InvoiceIn.summary.rate',
         field: (row) => taxRate(row.taxableBase, row.taxTypeSage?.rate),
         format: (value) => toCurrency(value),
         sortable: true,
@@ -70,7 +70,7 @@ const vatColumns = ref([
     },
     {
         name: 'currency',
-        label: 'invoiceIn.summary.currency',
+        label: 'InvoiceIn.summary.currency',
         field: (row) => row.foreignValue,
         format: (val) => val && toCurrency(val, currency.value),
         sortable: true,
@@ -81,21 +81,21 @@ const vatColumns = ref([
 const dueDayColumns = ref([
     {
         name: 'date',
-        label: 'invoiceIn.summary.dueDay',
+        label: 'InvoiceIn.summary.dueDay',
         field: (row) => toDate(row.dueDated),
         sortable: true,
         align: 'left',
     },
     {
         name: 'bank',
-        label: 'invoiceIn.summary.bank',
+        label: 'InvoiceIn.summary.bank',
         field: (row) => row.bank.bank,
         sortable: true,
         align: 'left',
     },
     {
         name: 'amount',
-        label: 'invoiceIn.list.amount',
+        label: 'InvoiceIn.list.amount',
         field: (row) => row.amount,
         format: (value) => toCurrency(value),
         sortable: true,
@@ -103,7 +103,7 @@ const dueDayColumns = ref([
     },
     {
         name: 'landed',
-        label: 'invoiceIn.summary.foreignValue',
+        label: 'InvoiceIn.summary.foreignValue',
         field: (row) => row.foreignValue,
         format: (val) => val && toCurrency(val, currency.value),
         sortable: true,
@@ -114,7 +114,7 @@ const dueDayColumns = ref([
 const intrastatColumns = ref([
     {
         name: 'code',
-        label: 'invoiceIn.summary.code',
+        label: 'InvoiceIn.summary.code',
         field: (row) => {
             return `${row.intrastat.id}: ${row.intrastat?.description}`;
         },
@@ -123,21 +123,21 @@ const intrastatColumns = ref([
     },
     {
         name: 'amount',
-        label: 'invoiceIn.list.amount',
+        label: 'InvoiceIn.list.amount',
         field: (row) => toCurrency(row.amount),
         sortable: true,
         align: 'left',
     },
     {
         name: 'net',
-        label: 'invoiceIn.summary.net',
+        label: 'InvoiceIn.summary.net',
         field: (row) => row.net,
         sortable: true,
         align: 'left',
     },
     {
         name: 'stems',
-        label: 'invoiceIn.summary.stems',
+        label: 'InvoiceIn.summary.stems',
         field: (row) => row.stems,
         format: (value) => value,
         sortable: true,
@@ -145,7 +145,7 @@ const intrastatColumns = ref([
     },
     {
         name: 'landed',
-        label: 'invoiceIn.summary.country',
+        label: 'InvoiceIn.summary.country',
         field: (row) => row.country?.code,
         format: (value) => value,
         sortable: true,
@@ -210,7 +210,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     />
                 </QCardSection>
                 <VnLv
-                    :label="t('invoiceIn.list.supplier')"
+                    :label="t('InvoiceIn.list.supplier')"
                     :value="entity.supplier?.name"
                 >
                     <template #value>
@@ -221,14 +221,14 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     </template>
                 </VnLv>
                 <VnLv
-                    :label="t('invoiceIn.list.supplierRef')"
+                    :label="t('InvoiceIn.list.supplierRef')"
                     :value="entity.supplierRef"
                 />
                 <VnLv
-                    :label="t('invoiceIn.summary.currency')"
+                    :label="t('InvoiceIn.summary.currency')"
                     :value="entity.currency?.code"
                 />
-                <VnLv :label="t('invoiceIn.serial')" :value="`${entity.serial}`" />
+                <VnLv :label="t('InvoiceIn.serial')" :value="`${entity.serial}`" />
             </QCard>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
@@ -239,19 +239,19 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 </QCardSection>
                 <VnLv
                     :ellipsis-value="false"
-                    :label="t('invoiceIn.summary.issued')"
+                    :label="t('InvoiceIn.summary.issued')"
                     :value="toDate(entity.issued)"
                 />
                 <VnLv
-                    :label="t('invoiceIn.summary.operated')"
+                    :label="t('InvoiceIn.summary.operated')"
                     :value="toDate(entity.operated)"
                 />
                 <VnLv
-                    :label="t('invoiceIn.summary.bookEntried')"
+                    :label="t('InvoiceIn.summary.bookEntried')"
                     :value="toDate(entity.bookEntried)"
                 />
                 <VnLv
-                    :label="t('invoiceIn.summary.bookedDate')"
+                    :label="t('InvoiceIn.summary.bookedDate')"
                     :value="toDate(entity.booked)"
                 />
             </QCard>
@@ -263,18 +263,18 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     />
                 </QCardSection>
                 <VnLv
-                    :label="t('invoiceIn.summary.sage')"
+                    :label="t('InvoiceIn.summary.sage')"
                     :value="entity.sageWithholding?.withholding"
                 />
                 <VnLv
-                    :label="t('invoiceIn.summary.vat')"
+                    :label="t('InvoiceIn.summary.vat')"
                     :value="entity.expenseDeductible?.name"
                 />
                 <VnLv
-                    :label="t('invoiceIn.card.company')"
+                    :label="t('InvoiceIn.card.company')"
                     :value="entity.company?.code"
                 />
-                <VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
+                <VnLv :label="t('InvoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
             </QCard>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
@@ -285,11 +285,11 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 </QCardSection>
                 <QCardSection class="q-pa-none">
                     <VnLv
-                        :label="t('invoiceIn.summary.taxableBase')"
+                        :label="t('InvoiceIn.summary.taxableBase')"
                         :value="toCurrency(entity.totals.totalTaxableBase)"
                     />
                     <VnLv label="Total" :value="toCurrency(entity.totals.totalVat)" />
-                    <VnLv :label="t('invoiceIn.summary.dueTotal')">
+                    <VnLv :label="t('InvoiceIn.summary.dueTotal')">
                         <template #value>
                             <QChip
                                 dense
@@ -297,8 +297,8 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                                 :color="amountsNotMatch ? 'negative' : 'transparent'"
                                 :title="
                                     amountsNotMatch
-                                        ? t('invoiceIn.summary.noMatch')
-                                        : t('invoiceIn.summary.dueTotal')
+                                        ? t('InvoiceIn.summary.noMatch')
+                                        : t('InvoiceIn.summary.dueTotal')
                                 "
                             >
                                 {{ toCurrency(entity.totals.totalDueDay) }}
@@ -309,7 +309,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
             </QCard>
             <!--Vat-->
             <QCard v-if="entity.invoiceInTax.length" class="vat">
-                <VnTitle :url="getLink('vat')" :text="t('invoiceIn.card.vat')" />
+                <VnTitle :url="getLink('vat')" :text="t('InvoiceIn.card.vat')" />
                 <QTable
                     :columns="vatColumns"
                     :rows="entity.invoiceInTax"
@@ -357,7 +357,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
             </QCard>
             <!--Due Day-->
             <QCard v-if="entity.invoiceInDueDay.length" class="due-day">
-                <VnTitle :url="getLink('due-day')" :text="t('invoiceIn.card.dueDay')" />
+                <VnTitle :url="getLink('due-day')" :text="t('InvoiceIn.card.dueDay')" />
                 <QTable :columns="dueDayColumns" :rows="entity.invoiceInDueDay" flat>
                     <template #header="dueDayProps">
                         <QTr :props="dueDayProps" class="bg">
@@ -395,7 +395,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
             <QCard v-if="entity.invoiceInIntrastat.length">
                 <VnTitle
                     :url="getLink('intrastat')"
-                    :text="t('invoiceIn.card.intrastat')"
+                    :text="t('InvoiceIn.card.intrastat')"
                 />
                 <QTable
                     :columns="intrastatColumns"
diff --git a/src/pages/InvoiceIn/InvoiceInCreate.vue b/src/pages/InvoiceIn/InvoiceInCreate.vue
index c809e032b..200997f65 100644
--- a/src/pages/InvoiceIn/InvoiceInCreate.vue
+++ b/src/pages/InvoiceIn/InvoiceInCreate.vue
@@ -83,7 +83,7 @@ const redirectToInvoiceInBasicData = (__, { id }) => {
                         </template>
                     </VnSelect>
                     <VnInput
-                        :label="t('invoiceIn.list.supplierRef')"
+                        :label="t('InvoiceIn.list.supplierRef')"
                         v-model="data.supplierRef"
                     />
                 </VnRow>
@@ -97,10 +97,10 @@ const redirectToInvoiceInBasicData = (__, { id }) => {
                         map-options
                         hide-selected
                         :required="true"
-                        :rules="validate('invoiceIn.companyFk')"
+                        :rules="validate('InvoiceIn.companyFk')"
                     />
                     <VnInputDate
-                        :label="t('invoiceIn.summary.issued')"
+                        :label="t('InvoiceIn.summary.issued')"
                         v-model="data.issued"
                     />
                 </VnRow>
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 1e8b650a1..2991a4190 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -27,7 +27,7 @@ const activities = ref([]);
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params, searchFn }">
+        <template #body="{ params, searchFn, getLocale }">
             <QItem>
                 <QItemSection>
                     <VnInputDate
@@ -52,7 +52,7 @@ const activities = ref([]);
                         v-model="params.supplierFk"
                         url="Suppliers"
                         :fields="['id', 'nickname']"
-                        :label="t('params.supplierFk')"
+                        :label="getLocale('supplierFk')"
                         option-label="nickname"
                         dense
                         outlined
@@ -63,7 +63,7 @@ const activities = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInput
-                        :label="t('params.supplierRef')"
+                        :label="getLocale('supplierRef')"
                         v-model="params.supplierRef"
                         is-outlined
                         lazy-rules
@@ -73,7 +73,7 @@ const activities = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInput
-                        :label="t('params.fi')"
+                        :label="getLocale('fi')"
                         v-model="params.fi"
                         is-outlined
                         lazy-rules
@@ -83,7 +83,7 @@ const activities = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInput
-                        :label="t('params.serial')"
+                        :label="getLocale('serial')"
                         v-model="params.serial"
                         is-outlined
                         lazy-rules
@@ -93,7 +93,7 @@ const activities = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInput
-                        :label="t('params.account')"
+                        :label="getLocale('account')"
                         v-model="params.account"
                         is-outlined
                         lazy-rules
@@ -103,7 +103,7 @@ const activities = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInput
-                        :label="t('params.awb')"
+                        :label="getLocale('globals.params.awbCode')"
                         v-model="params.awbCode"
                         is-outlined
                         lazy-rules
@@ -113,7 +113,7 @@ const activities = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInputNumber
-                        :label="t('Amount')"
+                        :label="t('globals.amount')"
                         v-model="params.amount"
                         is-outlined
                     />
@@ -136,7 +136,7 @@ const activities = ref([]);
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('invoiceIn.isBooked')"
+                        :label="t('InvoiceIn.isBooked')"
                         v-model="params.isBooked"
                         @update:model-value="searchFn()"
                         toggle-indeterminate
@@ -157,40 +157,11 @@ const activities = ref([]);
 en:
     params:
         search: Id or supplier name
-        supplierRef: Supplier ref.
-        supplierFk: Supplier
-        fi: Supplier fiscal id
-        amount: Amount
-        created: Created
-        awb: AWB
-        dued: Dued
-        serialNumber: Serial Number
-        serial: Serial
         account: Ledger account
-        isBooked: is booked
-        correctedFk: Rectified
-        issued: Issued
-        awbCode: AWB
         correctingFk: Rectificative
 es:
     params:
         search: Id o nombre proveedor
-        supplierRef: Ref. proveedor
-        supplierFk: Proveedor
-        fi: CIF proveedor
-        serialNumber: Num. serie
-        serial: Serie
-        awb: AWB
-        amount: Importe
-        issued: Emitida
-        isBooked: Contabilizada
         account: Cuenta contable
-        created: Creada
-        dued: Vencida
-        correctedFk: Rectificada
         correctingFk: Rectificativa
-    Amount: Importe
-    Issued: Fecha factura
-    Id or supplier: Id o proveedor
-    More options: Más opciones
 </i18n>
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 0beb2cdf8..4c9059dbe 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -32,7 +32,7 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'supplierFk',
-        label: t('invoiceIn.list.supplier'),
+        label: t('InvoiceIn.list.supplier'),
         columnFilter: {
             component: 'select',
             attrs: {
@@ -45,16 +45,16 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'supplierRef',
-        label: t('invoiceIn.list.supplierRef'),
+        label: t('InvoiceIn.list.supplierRef'),
     },
     {
         align: 'left',
         name: 'serial',
-        label: t('invoiceIn.serial'),
+        label: t('InvoiceIn.serial'),
     },
     {
         align: 'left',
-        label: t('invoiceIn.list.issued'),
+        label: t('InvoiceIn.list.issued'),
         name: 'issued',
         component: null,
         columnFilter: {
@@ -65,18 +65,18 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'isBooked',
-        label: t('invoiceIn.isBooked'),
+        label: t('InvoiceIn.isBooked'),
         columnFilter: false,
     },
     {
         align: 'left',
         name: 'awbCode',
-        label: t('invoiceIn.list.awb'),
+        label: t('InvoiceIn.list.awb'),
     },
     {
         align: 'left',
         name: 'amount',
-        label: t('invoiceIn.list.amount'),
+        label: t('InvoiceIn.list.amount'),
         format: ({ amount }) => toCurrency(amount),
     },
     {
@@ -163,7 +163,7 @@ const cols = computed(() => [
                 </template>
             </VnSelect>
             <VnInput
-                :label="t('invoiceIn.list.supplierRef')"
+                :label="t('InvoiceIn.list.supplierRef')"
                 v-model="data.supplierRef"
             />
             <VnSelect
@@ -175,7 +175,7 @@ const cols = computed(() => [
                 option-label="code"
                 :required="true"
             />
-            <VnInputDate :label="t('invoiceIn.summary.issued')" v-model="data.issued" />
+            <VnInputDate :label="t('InvoiceIn.summary.issued')" v-model="data.issued" />
         </template>
     </VnTable>
 </template>
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index b39511f29..c917f524e 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -1,4 +1,4 @@
-invoiceIn:
+InvoiceIn:
     serial: Serial
     isBooked: Is booked
     list:
@@ -39,3 +39,8 @@ invoiceIn:
         net: Net
         stems: Stems
         country: Country
+    params:
+        search: Id or supplier name
+        account: Ledger account
+        correctingFk: Rectificative
+        isBooked: Is booked
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index 5f483dd08..f7e9b7034 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -1,4 +1,4 @@
-invoiceIn:
+InvoiceIn:
     serial: Serie
     isBooked: Contabilizada
     list:
@@ -38,3 +38,7 @@ invoiceIn:
         net: Neto
         stems: Tallos
         country: País
+    params:
+        search: Id o nombre proveedor
+        account: Cuenta contable
+        correctingFk: Rectificativa
-- 
2.40.1


From 70ca31aa46361550557d23dff11d53b9b8e72231 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 27 Nov 2024 10:24:09 +0100
Subject: [PATCH 09/38] feat: refs #7936 add company filter

---
 src/pages/InvoiceIn/InvoiceInFilter.vue | 36 +++++--------------------
 src/pages/InvoiceIn/InvoiceInList.vue   |  4 +++
 src/pages/InvoiceIn/locale/en.yml       |  1 +
 src/pages/InvoiceIn/locale/es.yml       |  1 +
 4 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 2991a4190..8f69bf262 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -1,25 +1,14 @@
 <script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
 import VnSelect from 'components/common/VnSelect.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
-import FetchData from 'components/FetchData.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
-const { t } = useI18n();
 defineProps({ dataKey: { type: String, required: true } });
-const activities = ref([]);
 </script>
 
 <template>
-    <FetchData
-        url="SupplierActivities"
-        auto-load
-        @on-fetch="(data) => (activities = data)"
-    />
     <VnFilterPanel :data-key="dataKey" :search-button="true">
         <template #tags="{ tag, formatFn, getLocale }">
             <div class="q-gutter-x-xs">
@@ -31,7 +20,7 @@ const activities = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInputDate
-                        :label="t('globals.from')"
+                        :label="$t('globals.from')"
                         v-model="params.from"
                         is-outlined
                     />
@@ -40,7 +29,7 @@ const activities = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInputDate
-                        :label="t('globals.to')"
+                        :label="$t('globals.to')"
                         v-model="params.to"
                         is-outlined
                     />
@@ -113,7 +102,7 @@ const activities = ref([]);
             <QItem>
                 <QItemSection>
                     <VnInputNumber
-                        :label="t('globals.amount')"
+                        :label="$t('globals.amount')"
                         v-model="params.amount"
                         is-outlined
                     />
@@ -123,7 +112,7 @@ const activities = ref([]);
                 <QItemSection>
                     <VnSelect
                         v-model="params.companyFk"
-                        :label="t('globals.company')"
+                        :label="$t('globals.company')"
                         url="Companies"
                         option-label="code"
                         :fields="['id', 'code']"
@@ -136,13 +125,13 @@ const activities = ref([]);
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('InvoiceIn.isBooked')"
+                        :label="$t('InvoiceIn.isBooked')"
                         v-model="params.isBooked"
                         @update:model-value="searchFn()"
                         toggle-indeterminate
                     />
                     <QCheckbox
-                        :label="t('params.correctingFk')"
+                        :label="getLocale('params.correctingFk')"
                         v-model="params.correctingFk"
                         @update:model-value="searchFn()"
                         toggle-indeterminate
@@ -152,16 +141,3 @@ const activities = ref([]);
         </template>
     </VnFilterPanel>
 </template>
-
-<i18n>
-en:
-    params:
-        search: Id or supplier name
-        account: Ledger account
-        correctingFk: Rectificative
-es:
-    params:
-        search: Id o nombre proveedor
-        account: Cuenta contable
-        correctingFk: Rectificativa
-</i18n>
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 4c9059dbe..82e550aca 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -14,6 +14,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
+import FetchData from 'src/components/FetchData.vue';
 
 const stateStore = useStateStore();
 const { viewSummary } = useSummaryDialog();
@@ -23,6 +24,7 @@ onMounted(async () => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
 
 const tableRef = ref();
+const companies = ref([]);
 const cols = computed(() => [
     {
         align: 'left',
@@ -90,6 +92,7 @@ const cols = computed(() => [
                 optionLabel: 'code',
             },
         },
+        format: (row) => row.code,
     },
     {
         align: 'right',
@@ -113,6 +116,7 @@ const cols = computed(() => [
 ]);
 </script>
 <template>
+    <FetchData url="Companies" @on-fetch="(data) => (companies = data)" auto-load />
     <InvoiceInSearchbar />
     <RightMenu>
         <template #right-panel>
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index c917f524e..91d08c3ca 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -43,4 +43,5 @@ InvoiceIn:
         search: Id or supplier name
         account: Ledger account
         correctingFk: Rectificative
+        correctedFk: Corrected
         isBooked: Is booked
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index f7e9b7034..80ab9866b 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -42,3 +42,4 @@ InvoiceIn:
         search: Id o nombre proveedor
         account: Cuenta contable
         correctingFk: Rectificativa
+        correctedFk: Rectificada
-- 
2.40.1


From c55530ad1e9a9fda663ca46d8704943cf3cbaade Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 27 Nov 2024 10:36:03 +0100
Subject: [PATCH 10/38] fix: refs #7936 redirection

---
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue | 16 ++++++++--------
 src/pages/InvoiceIn/locale/en.yml                |  2 ++
 src/pages/InvoiceIn/locale/es.yml                |  2 ++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 10575eb69..40a507722 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -91,7 +91,7 @@ const routes = reactive({
         return {
             name: 'InvoiceInList',
             query: {
-                params: JSON.stringify({ supplierFk: id }),
+                table: JSON.stringify({ supplierFk: id }),
             },
         };
     },
@@ -100,7 +100,7 @@ const routes = reactive({
             return {
                 name: 'InvoiceInList',
                 query: {
-                    params: JSON.stringify({ correctedFk: entityId.value }),
+                    table: JSON.stringify({ correctedFk: entityId.value }),
                 },
             };
         }
@@ -355,13 +355,13 @@ const createInvoiceInCorrection = async () => {
             </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('Invoicein.list.issued')" :value="toDate(entity.issued)" />
+            <VnLv :label="t('InvoiceIn.list.issued')" :value="toDate(entity.issued)" />
             <VnLv
-                :label="t('Invoicein.summary.bookedDate')"
+                :label="t('InvoiceIn.summary.bookedDate')"
                 :value="toDate(entity.booked)"
             />
-            <VnLv :label="t('Invoicein.list.amount')" :value="toCurrency(totalAmount)" />
-            <VnLv :label="t('Invoicein.list.supplier')">
+            <VnLv :label="t('InvoiceIn.list.amount')" :value="toCurrency(totalAmount)" />
+            <VnLv :label="t('InvoiceIn.list.supplier')">
                 <template #value>
                     <span class="link">
                         {{ entity?.supplier?.nickname }}
@@ -378,7 +378,7 @@ const createInvoiceInCorrection = async () => {
                     color="primary"
                     :to="routes.getSupplier(entity.supplierFk)"
                 >
-                    <QTooltip>{{ t('Invoicein.list.supplier') }}</QTooltip>
+                    <QTooltip>{{ t('InvoiceIn.list.supplier') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -394,7 +394,7 @@ const createInvoiceInCorrection = async () => {
                     color="primary"
                     :to="routes.getTickets(entity.supplierFk)"
                 >
-                    <QTooltip>{{ t('invoiceOut.card.ticketList') }}</QTooltip>
+                    <QTooltip>{{ t('InvoiceIn.descriptor.ticketList') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     v-if="
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index 91d08c3ca..529569aa0 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -9,6 +9,8 @@ InvoiceIn:
         issued: Issued
         awb: AWB
         amount: Amount
+    descriptor:
+        ticketList: Ticket list
     card:
         client: Client
         company: Company
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index 80ab9866b..2192442cd 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -10,6 +10,8 @@ InvoiceIn:
         issued: Fecha emisión
         awb: AWB
         amount: Importe
+    descriptor:
+        ticketList: Listado de tickets
     card:
         client: Cliente
         company: Empresa
-- 
2.40.1


From 8324c0587d0613606ec879dded86c2ecdbc13b7c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 27 Nov 2024 13:26:54 +0100
Subject: [PATCH 11/38] fix: refs #7936 descriptor & dueday

---
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue |  4 ++--
 src/pages/InvoiceIn/Card/InvoiceInDueDay.vue     | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 40a507722..bf566c0be 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -126,14 +126,14 @@ const isNotFilled = computed(() => Object.values(correctionFormData).includes(nu
 onBeforeMount(async () => {
     await setInvoiceCorrection(entityId.value);
     const { data } = await axios.get(`InvoiceIns/${entityId.value}/getTotals`);
-    totalAmount.value = data.totalDueDay;
+    totalAmount.value = data.totalTaxableBase;
 });
 
 onBeforeRouteUpdate(async (to, from) => {
     if (to.params.id !== from.params.id) {
         await setInvoiceCorrection(to.params.id);
         const { data } = await axios.get(`InvoiceIns/${to.params.id}/getTotals`);
-        totalAmount.value = data.totalDueDay;
+        totalAmount.value = data.totalTaxableBase;
     }
 });
 
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index e8f73848b..75f9a67a4 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -25,6 +25,7 @@ const banks = ref([]);
 const invoiceInFormRef = ref();
 const invoiceId = +route.params.id;
 const filter = { where: { invoiceInFk: invoiceId } };
+const areRows = ref(false);
 
 const columns = computed(() => [
     {
@@ -230,7 +231,14 @@ async function insert() {
         </template>
     </CrudModel>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn color="primary" icon="add" shortcut="+" size="lg" round @click="insert" />
+        <QBtn
+            color="primary"
+            icon="add"
+            shortcut="+"
+            size="lg"
+            round
+            @click="!areRows ? insert() : invoiceInFormRef.insert()"
+        />
     </QPageSticky>
 </template>
 <style lang="scss" scoped>
-- 
2.40.1


From b5d13904d8be87a84af74935535a6a22e7b1d775 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 27 Nov 2024 17:52:41 +0100
Subject: [PATCH 12/38] refactor: refs #7936 update label capitalization and
 replace invoice type options

---
 .../InvoiceIn/Card/InvoiceInCorrective.vue    | 58 ++++++++++++-------
 .../InvoiceIn/Card/InvoiceInDescriptor.vue    | 33 +++++++----
 2 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue b/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
index 7735747f9..165b3e0df 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
@@ -1,9 +1,8 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, capitalize } from 'vue';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
-import { useCapitalize } from 'src/composables/useCapitalize';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
@@ -31,7 +30,7 @@ const columns = computed(() => [
     },
     {
         name: 'type',
-        label: useCapitalize(t('globals.type')),
+        label: capitalize(t('globals.type')),
         field: (row) => row.cplusRectificationTypeFk,
         options: cplusRectificationTypes.value,
         model: 'cplusRectificationTypeFk',
@@ -43,10 +42,10 @@ const columns = computed(() => [
     },
     {
         name: 'class',
-        label: useCapitalize(t('globals.class')),
-        field: (row) => row.siiTypeInvoiceOutFk,
-        options: siiTypeInvoiceOuts.value,
-        model: 'siiTypeInvoiceOutFk',
+        label: capitalize(t('globals.class')),
+        field: (row) => row.siiTypeInvoiceInFk,
+        options: siiTypeInvoiceIns.value,
+        model: 'siiTypeInvoiceInFk',
         optionValue: 'id',
         optionLabel: 'code',
         sortable: true,
@@ -55,7 +54,7 @@ const columns = computed(() => [
     },
     {
         name: 'reason',
-        label: useCapitalize(t('globals.reason')),
+        label: capitalize(t('globals.reason')),
         field: (row) => row.invoiceCorrectionTypeFk,
         options: invoiceCorrectionTypes.value,
         model: 'invoiceCorrectionTypeFk',
@@ -67,9 +66,8 @@ const columns = computed(() => [
     },
 ]);
 const cplusRectificationTypes = ref([]);
-const siiTypeInvoiceOuts = ref([]);
+const siiTypeInvoiceIns = ref([]);
 const invoiceCorrectionTypes = ref([]);
-const rowsSelected = ref([]);
 
 const requiredFieldRule = (val) => val || t('globals.requiredField');
 
@@ -82,9 +80,9 @@ const onSave = (data) => data.deletes && push(`/invoice-in/${invoiceId}/summary`
         auto-load
     />
     <FetchData
-        url="SiiTypeInvoiceOuts"
+        url="SiiTypeInvoiceIns"
         :where="{ code: { like: 'R%' } }"
-        @on-fetch="(data) => (siiTypeInvoiceOuts = data)"
+        @on-fetch="(data) => (siiTypeInvoiceIns = data)"
         auto-load
     />
     <FetchData
@@ -99,17 +97,15 @@ const onSave = (data) => data.deletes && push(`/invoice-in/${invoiceId}/summary`
         url="InvoiceInCorrections"
         :filter="filter"
         auto-load
-        v-model:selected="rowsSelected"
         primary-key="correctingFk"
         @save-changes="onSave"
+        :default-remove="false"
     >
         <template #body="{ rows }">
             <QTable
-                v-model:selected="rowsSelected"
                 :columns="columns"
                 :rows="rows"
                 row-key="$index"
-                selection="single"
                 :grid="$q.screen.lt.sm"
                 :pagination="{ rowsPerPage: 0 }"
             >
@@ -121,8 +117,17 @@ const onSave = (data) => data.deletes && push(`/invoice-in/${invoiceId}/summary`
                             :options="col.options"
                             :option-value="col.optionValue"
                             :option-label="col.optionLabel"
-                            :readonly="row.invoiceIn.isBooked"
-                        />
+                            :disable="row.invoiceIn.isBooked"
+                            :filter-options="['description']"
+                        >
+                            <template #option="{ opt }">
+                                <QItem>
+                                    <QItemSection>
+                                        <QItemLabel>{{ opt.description }}</QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelect>
                     </QTd>
                 </template>
                 <template #body-cell-class="{ row, col }">
@@ -134,8 +139,20 @@ const onSave = (data) => data.deletes && push(`/invoice-in/${invoiceId}/summary`
                             :option-value="col.optionValue"
                             :option-label="col.optionLabel"
                             :rules="[requiredFieldRule]"
-                            :readonly="row.invoiceIn.isBooked"
-                        />
+                            :filter-options="['code', 'description']"
+                            :disable="row.invoiceIn.isBooked"
+                        >
+                            <template #option="{ opt }">
+                                <QItem>
+                                    <QItemSection>
+                                        <QItemLabel
+                                            >{{ opt.code }} -
+                                            {{ opt.description }}</QItemLabel
+                                        >
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelect>
                     </QTd>
                 </template>
                 <template #body-cell-reason="{ row, col }">
@@ -147,7 +164,7 @@ const onSave = (data) => data.deletes && push(`/invoice-in/${invoiceId}/summary`
                             :option-value="col.optionValue"
                             :option-label="col.optionLabel"
                             :rules="[requiredFieldRule]"
-                            :readonly="row.invoiceIn.isBooked"
+                            :disable="row.invoiceIn.isBooked"
                         />
                     </QTd>
                 </template>
@@ -155,7 +172,6 @@ const onSave = (data) => data.deletes && push(`/invoice-in/${invoiceId}/summary`
         </template>
     </CrudModel>
 </template>
-<style lang="scss" scoped></style>
 <i18n>
 es:
     Original invoice: Factura origen
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index bf566c0be..f2c6f93ef 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, reactive, computed, onBeforeMount } from 'vue';
+import { ref, reactive, computed, onBeforeMount, capitalize } from 'vue';
 import { useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -15,7 +15,6 @@ import FetchData from 'src/components/FetchData.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import { useCapitalize } from 'src/composables/useCapitalize';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import InvoiceInToBook from '../InvoiceInToBook.vue';
 
@@ -37,7 +36,7 @@ const totalAmount = ref();
 const currentAction = ref();
 const config = ref();
 const cplusRectificationTypes = ref([]);
-const siiTypeInvoiceOuts = ref([]);
+const siiTypeInvoiceIns = ref([]);
 const invoiceCorrectionTypes = ref([]);
 const actions = {
     unbook: {
@@ -119,7 +118,7 @@ const routes = reactive({
 const correctionFormData = reactive({
     invoiceReason: 2,
     invoiceType: 2,
-    invoiceClass: 6,
+    invoiceClass: 8,
 });
 const isNotFilled = computed(() => Object.values(correctionFormData).includes(null));
 
@@ -262,9 +261,9 @@ const createInvoiceInCorrection = async () => {
         auto-load
     />
     <FetchData
-        url="SiiTypeInvoiceOuts"
+        url="siiTypeInvoiceIns"
         :where="{ code: { like: 'R%' } }"
-        @on-fetch="(data) => (siiTypeInvoiceOuts = data)"
+        @on-fetch="(data) => (siiTypeInvoiceIns = data)"
         auto-load
     />
     <FetchData
@@ -438,9 +437,9 @@ const createInvoiceInCorrection = async () => {
                             readonly
                         />
                         <VnSelect
-                            :label="`${useCapitalize(t('globals.class'))}`"
+                            :label="`${capitalize(t('globals.class'))}`"
                             v-model="correctionFormData.invoiceClass"
-                            :options="siiTypeInvoiceOuts"
+                            :options="siiTypeInvoiceIns"
                             option-value="id"
                             option-label="code"
                             :required="true"
@@ -448,15 +447,27 @@ const createInvoiceInCorrection = async () => {
                     </QItemSection>
                     <QItemSection>
                         <VnSelect
-                            :label="`${useCapitalize(t('globals.type'))}`"
+                            :label="`${capitalize(t('globals.type'))}`"
                             v-model="correctionFormData.invoiceType"
                             :options="cplusRectificationTypes"
                             option-value="id"
                             option-label="description"
                             :required="true"
-                        />
+                        >
+                            <template #option="{ opt }">
+                                <QItem>
+                                    <QItemSection>
+                                        <QItemLabel
+                                            >{{ opt.code }} -
+                                            {{ opt.description }}</QItemLabel
+                                        >
+                                    </QItemSection>
+                                </QItem>
+                                <div></div>
+                            </template>
+                        </VnSelect>
                         <VnSelect
-                            :label="`${useCapitalize(t('globals.reason'))}`"
+                            :label="`${capitalize(t('globals.reason'))}`"
                             v-model="correctionFormData.invoiceReason"
                             :options="invoiceCorrectionTypes"
                             option-value="id"
-- 
2.40.1


From 011b5814a743867285e2362b68b163c83cfea861 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 28 Nov 2024 11:41:22 +0100
Subject: [PATCH 13/38] fix: refs #7936 improve error handling

---
 src/components/CrudModel.vue                   |  3 ++-
 .../InvoiceIn/Card/InvoiceInCorrective.vue     | 18 +++++++-----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 85bd5457a..7dd5129e9 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -176,7 +176,8 @@ async function saveChanges(data) {
     try {
         await axios.post($props.saveUrl || $props.url + '/crud', changes);
     } catch (e) {
-        return (isLoading.value = false);
+        isLoading.value = false;
+        throw e;
     }
     originalData.value = JSON.parse(JSON.stringify(formData.value));
     if (changes.creates?.length) await vnPaginateRef.value.fetch();
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue b/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
index 165b3e0df..1d0a8d078 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
@@ -1,22 +1,21 @@
 <script setup>
 import { ref, computed, capitalize } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
-const { push, currentRoute } = useRouter();
+const route = useRoute();
 const { t } = useI18n();
 
-const invoiceId = +currentRoute.value.params.id;
 const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
 const invoiceInCorrectionRef = ref();
 const filter = {
     include: { relation: 'invoiceIn' },
-    where: { correctingFk: invoiceId },
+    where: { correctingFk: route.params.id },
 };
 const columns = computed(() => [
     {
@@ -70,8 +69,6 @@ const siiTypeInvoiceIns = ref([]);
 const invoiceCorrectionTypes = ref([]);
 
 const requiredFieldRule = (val) => val || t('globals.requiredField');
-
-const onSave = (data) => data.deletes && push(`/invoice-in/${invoiceId}/summary`);
 </script>
 <template>
     <FetchData
@@ -98,7 +95,6 @@ const onSave = (data) => data.deletes && push(`/invoice-in/${invoiceId}/summary`
         :filter="filter"
         auto-load
         primary-key="correctingFk"
-        @save-changes="onSave"
         :default-remove="false"
     >
         <template #body="{ rows }">
@@ -120,8 +116,8 @@ const onSave = (data) => data.deletes && push(`/invoice-in/${invoiceId}/summary`
                             :disable="row.invoiceIn.isBooked"
                             :filter-options="['description']"
                         >
-                            <template #option="{ opt }">
-                                <QItem>
+                            <template #option="{ opt, itemProps }">
+                                <QItem v-bind="itemProps">
                                     <QItemSection>
                                         <QItemLabel>{{ opt.description }}</QItemLabel>
                                     </QItemSection>
@@ -142,8 +138,8 @@ const onSave = (data) => data.deletes && push(`/invoice-in/${invoiceId}/summary`
                             :filter-options="['code', 'description']"
                             :disable="row.invoiceIn.isBooked"
                         >
-                            <template #option="{ opt }">
-                                <QItem>
+                            <template #option="{ opt, itemProps }">
+                                <QItem v-bind="itemProps">
                                     <QItemSection>
                                         <QItemLabel
                                             >{{ opt.code }} -
-- 
2.40.1


From 4037b31948c454be4b3389f1a46e9f97d28bd39a Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 28 Nov 2024 12:37:30 +0100
Subject: [PATCH 14/38] feat: refs #7936 add row click navigation to
 InvoiceInSerial

---
 src/pages/InvoiceIn/Serial/InvoiceInSerial.vue | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue b/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue
index 4eb9fa69d..a8fb3b0c8 100644
--- a/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue
+++ b/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue
@@ -58,6 +58,14 @@ onBeforeMount(async () => {
         :right-search="false"
         :user-params="{ daysAgo }"
         :disable-option="{ card: true }"
+        :row-click="
+            (row) => {
+                $router.push({
+                    name: 'InvoiceInList',
+                    query: { table: JSON.stringify({ serial: row.serial }) },
+                });
+            }
+        "
         auto-load
     />
 </template>
-- 
2.40.1


From 44cbabfc7ed3e9ae1b5959cbc511c8ae2811603e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 28 Nov 2024 13:27:53 +0100
Subject: [PATCH 15/38] feat: refs #7936 add number validation to VnInputNumber
 & new daysAgo filter in InvoiceInFilter

---
 src/components/common/VnInputNumber.vue |  2 ++
 src/components/common/VnSelect.vue      | 15 ++++++++++-
 src/i18n/locale/en.yml                  |  1 +
 src/i18n/locale/es.yml                  |  1 +
 src/pages/InvoiceIn/InvoiceInFilter.vue | 34 ++++++++++++++++++++++---
 5 files changed, 48 insertions(+), 5 deletions(-)

diff --git a/src/components/common/VnInputNumber.vue b/src/components/common/VnInputNumber.vue
index 460b39d63..165cfae3d 100644
--- a/src/components/common/VnInputNumber.vue
+++ b/src/components/common/VnInputNumber.vue
@@ -4,6 +4,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 defineProps({
     step: { type: Number, default: 0.01 },
     decimalPlaces: { type: Number, default: 2 },
+    positive: { type: Boolean, default: true },
 });
 
 const model = defineModel({ type: [Number, String] });
@@ -17,6 +18,7 @@ const model = defineModel({ type: [Number, String] });
         @input="
             (evt) => {
                 const val = evt.target.value;
+                if (positive && val < 0) return (model = 0);
                 const [, decimal] = val.split('.');
                 if (val && decimal?.length > decimalPlaces)
                     model = parseFloat(val).toFixed(decimalPlaces);
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 7b12b2852..f62505d33 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -94,6 +94,10 @@ const $props = defineProps({
         type: String,
         default: null,
     },
+    isOutlined: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
@@ -108,6 +112,15 @@ const noOneOpt = ref({
     [optionValue.value]: false,
     [optionLabel.value]: noOneText,
 });
+const styleAttrs = computed(() => {
+    return $props.isOutlined
+        ? {
+              dense: true,
+              outlined: true,
+              rounded: true,
+          }
+        : {};
+});
 const isLoading = ref(false);
 const useURL = computed(() => $props.url);
 const value = computed({
@@ -267,7 +280,7 @@ defineExpose({ opts: myOptions });
         :options="myOptions"
         :option-label="optionLabel"
         :option-value="optionValue"
-        v-bind="$attrs"
+        v-bind="{ ...$attrs, ...styleAttrs }"
         @filter="filterHandler"
         :emit-value="nullishToTrue($attrs['emit-value'])"
         :map-options="nullishToTrue($attrs['map-options'])"
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index fab1d0569..719a23217 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -341,6 +341,7 @@ globals:
         awbCode: AWB
         correctedFk: Rectified
         correctingFk: Rectificative
+        daysOnward: Days onward
     changePass: Change password
     deleteConfirmTitle: Delete selected elements
     changeState: Change state
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index e1080421d..40b9e4233 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -343,6 +343,7 @@ globals:
         serial: Serie
         amount: Importe
         awbCode: AWB
+        daysOnward: Días adelante
     changePass: Cambiar contraseña
     deleteConfirmTitle: Eliminar los elementos seleccionados
     changeState: Cambiar estado
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 8f69bf262..653692026 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -4,12 +4,28 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import { dateRange } from 'src/filters';
+import { date } from 'quasar';
 
 defineProps({ dataKey: { type: String, required: true } });
+const dateFormat = 'YYYY-MM-DDTHH:mm:ss.SSSZ';
+
+function handleDaysAgo(params, daysAgo) {
+    const [from, to] = dateRange(Date.vnNew());
+    if (!daysAgo && daysAgo !== 0) {
+        Object.assign(params, { from: undefined, to: undefined });
+    } else {
+        from.setDate(from.getDate() - daysAgo);
+        Object.assign(params, {
+            from: date.formatDate(from, dateFormat),
+            to: date.formatDate(to, dateFormat),
+        });
+    }
+}
 </script>
 
 <template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true">
+    <VnFilterPanel :data-key="dataKey" :search-button="true" :hidden-tags="['daysAgo']">
         <template #tags="{ tag, formatFn, getLocale }">
             <div class="q-gutter-x-xs">
                 <strong>{{ getLocale(tag.label) }}: </strong>
@@ -35,6 +51,18 @@ defineProps({ dataKey: { type: String, required: true } });
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputNumber
+                        :label="$t('globals.daysAgo')"
+                        v-model="params.daysAgo"
+                        is-outlined
+                        :step="0"
+                        @update:model-value="(val) => handleDaysAgo(params, val)"
+                        @remove="(val) => handleDaysAgo(params, val)"
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
@@ -116,9 +144,7 @@ defineProps({ dataKey: { type: String, required: true } });
                         url="Companies"
                         option-label="code"
                         :fields="['id', 'code']"
-                        dense
-                        outlined
-                        rounded
+                        is-outlined
                     />
                 </QItemSection>
             </QItem>
-- 
2.40.1


From 8e3d9b2bf356033b94d109498d559265fc70fca5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 28 Nov 2024 14:52:39 +0100
Subject: [PATCH 16/38] feat: refs #7936 calculate exchange & update taxable
 base

---
 src/composables/getExchange.js                | 16 ++++++++++++++++
 .../InvoiceIn/Card/InvoiceInBasicData.vue     |  1 +
 src/pages/InvoiceIn/Card/InvoiceInVat.vue     | 19 +++++++++++++++----
 3 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 src/composables/getExchange.js

diff --git a/src/composables/getExchange.js b/src/composables/getExchange.js
new file mode 100644
index 000000000..e81e9e895
--- /dev/null
+++ b/src/composables/getExchange.js
@@ -0,0 +1,16 @@
+import axios from 'axios';
+export async function getExchange(amount, currencyFk, dated, decimalPlaces = 2) {
+    try {
+        const { data } = await axios.get('ReferenceRates/findOne', {
+            params: {
+                filter: {
+                    fields: ['value'],
+                    where: { currencyFk, dated },
+                },
+            },
+        });
+        return (amount / data.value).toFixed(decimalPlaces);
+    } catch (e) {
+        return null;
+    }
+}
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index d22ee5b16..fd5ea0931 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -249,6 +249,7 @@ function deleteFile(dmsFk) {
                     :options="currencies"
                     option-value="id"
                     option-label="code"
+                    sort-by="id"
                 />
 
                 <VnSelect
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 100eecda6..977d628b4 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -11,12 +11,13 @@ import CrudModel from 'src/components/CrudModel.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CreateNewExpenseForm from 'src/components/CreateNewExpenseForm.vue';
+import { getExchange } from 'src/composables/getExchange';
 
 const { t } = useI18n();
 
 const arrayData = useArrayData();
+const route = useRoute();
 const invoiceIn = computed(() => arrayData.store.data);
-const invoiceId = +useRoute().params.id;
 const currency = computed(() => invoiceIn.value?.currency?.code);
 const expenses = ref([]);
 const sageTaxTypes = ref([]);
@@ -106,7 +107,7 @@ const filter = {
         'transactionTypeSageFk',
     ],
     where: {
-        invoiceInFk: invoiceId,
+        invoiceInFk: route.params.id,
     },
 };
 
@@ -148,10 +149,10 @@ const formatOpt = (row, { model, options }, prop) => {
         data-key="InvoiceInTaxes"
         url="InvoiceInTaxes"
         :filter="filter"
-        :data-required="{ invoiceInFk: invoiceId }"
+        :data-required="{ invoiceInFk: $route.params.id }"
         auto-load
         v-model:selected="rowsSelected"
-        :go-to="`/invoice-in/${invoiceId}/due-day`"
+        :go-to="`/invoice-in/${$route.params.id}/due-day`"
     >
         <template #body="{ rows }">
             <QTable
@@ -253,6 +254,16 @@ const formatOpt = (row, { model, options }, prop) => {
                             }"
                             :disable="!isNotEuro(currency)"
                             v-model="row.foreignValue"
+                            @update:model-value="
+                                async (val) => {
+                                    const exchange = await getExchange(
+                                        val,
+                                        row.currencyFk,
+                                        invoiceIn.issued
+                                    );
+                                    row.taxableBase = exchange;
+                                }
+                            "
                         />
                     </QTd>
                 </template>
-- 
2.40.1


From 50dab045f02139f1757bbb2676e63ec6454558c5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 28 Nov 2024 15:00:29 +0100
Subject: [PATCH 17/38] feat: refs #7936 add currency check before fetching

---
 src/pages/InvoiceIn/Card/InvoiceInVat.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 977d628b4..06219aa77 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -256,12 +256,12 @@ const formatOpt = (row, { model, options }, prop) => {
                             v-model="row.foreignValue"
                             @update:model-value="
                                 async (val) => {
-                                    const exchange = await getExchange(
+                                    if (!isNotEuro(currency)) return;
+                                    row.taxableBase = await getExchange(
                                         val,
                                         row.currencyFk,
                                         invoiceIn.issued
                                     );
-                                    row.taxableBase = exchange;
                                 }
                             "
                         />
-- 
2.40.1


From e2ddc079ec9b78d11a1c020a3d9d1bae3f5ae566 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 29 Nov 2024 12:42:03 +0100
Subject: [PATCH 18/38] fix: refs #7936 format tax calculation to two decimal
 places

---
 src/pages/InvoiceIn/Card/InvoiceInVat.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 06219aa77..13b775c77 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -121,7 +121,7 @@ function taxRate(invoiceInTax) {
     const taxTypeSage = taxRateSelection?.rate ?? 0;
     const taxableBase = invoiceInTax?.taxableBase ?? 0;
 
-    return (taxTypeSage / 100) * taxableBase;
+    return ((taxTypeSage / 100) * taxableBase).toFixed(2);
 }
 
 const formatOpt = (row, { model, options }, prop) => {
-- 
2.40.1


From 2ab6380f97a19f6862b742e2469afbffc1149bf1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 4 Dec 2024 13:46:42 +0100
Subject: [PATCH 19/38] feat: refs #7936 use default invoice data

---
 src/pages/InvoiceIn/InvoiceInList.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 82e550aca..e9255398b 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -2,6 +2,7 @@
 import { ref, computed, onMounted, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
+import { useState } from 'src/composables/useState';
 import { downloadFile } from 'src/composables/downloadFile';
 import { toDate, toCurrency } from 'src/filters/index';
 import InvoiceInFilter from './InvoiceInFilter.vue';
@@ -17,6 +18,7 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 import FetchData from 'src/components/FetchData.vue';
 
 const stateStore = useStateStore();
+const user = useState().getUser();
 const { viewSummary } = useSummaryDialog();
 const { t } = useI18n();
 
@@ -132,7 +134,7 @@ const cols = computed(() => [
             urlCreate: 'InvoiceIns',
             title: t('globals.createInvoiceIn'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {},
+            formInitialData: { companyFk: user.companyFk, issued: Date.vnNew() },
         }"
         redirect="invoice-in"
         :columns="cols"
-- 
2.40.1


From 482505b8007148427be0a41bcd1a6802b9503664 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 4 Dec 2024 17:40:29 +0100
Subject: [PATCH 20/38] feat: refs #7936 add useAccountShortToStandard
 composable

---
 src/composables/useAccountShortToStandard.js | 4 ++++
 src/pages/InvoiceIn/Card/InvoiceInVat.vue    | 8 ++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 src/composables/useAccountShortToStandard.js

diff --git a/src/composables/useAccountShortToStandard.js b/src/composables/useAccountShortToStandard.js
new file mode 100644
index 000000000..ca221433e
--- /dev/null
+++ b/src/composables/useAccountShortToStandard.js
@@ -0,0 +1,4 @@
+export function useAccountShortToStandard(val) {
+    if (!val || !/^\d+(\.\d*)$/.test(val)) return;
+    return val?.replace('.', '0'.repeat(11 - val.length));
+}
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 13b775c77..c52136bea 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -12,6 +12,7 @@ import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CreateNewExpenseForm from 'src/components/CreateNewExpenseForm.vue';
 import { getExchange } from 'src/composables/getExchange';
+import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
 
 const { t } = useI18n();
 
@@ -172,6 +173,13 @@ const formatOpt = (row, { model, options }, prop) => {
                             :option-label="col.optionLabel"
                             :filter-options="['id', 'name']"
                             :tooltip="t('Create a new expense')"
+                            :hide-selected="false"
+                            :display-value="formatOpt(row, col, 'name')"
+                            @keydown.tab="
+                                row[col.model] = useAccountShortToStandard(
+                                    $event.target.value
+                                )
+                            "
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
-- 
2.40.1


From d916b47f4c8e9b385a2e4a839680471137cad16a Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 5 Dec 2024 10:40:50 +0100
Subject: [PATCH 21/38] feat: refs #7936 enhance getTotal fn & add unit tests

---
 src/composables/getTotal.js                   |  5 +-
 .../InvoiceIn/Card/InvoiceInIntrastat.vue     |  2 +-
 .../__tests__/composables/getTotal.spec.js    | 55 +++++++++++++++++++
 .../InvoiceIn/InvoiceInIntrastat.spec.js      | 34 ------------
 .../pages/InvoiceIn/InvoiceInVat.spec.js      | 38 -------------
 5 files changed, 59 insertions(+), 75 deletions(-)
 create mode 100644 test/vitest/__tests__/composables/getTotal.spec.js
 delete mode 100644 test/vitest/__tests__/pages/InvoiceIn/InvoiceInIntrastat.spec.js
 delete mode 100644 test/vitest/__tests__/pages/InvoiceIn/InvoiceInVat.spec.js

diff --git a/src/composables/getTotal.js b/src/composables/getTotal.js
index 24ac3aa27..91b884bda 100644
--- a/src/composables/getTotal.js
+++ b/src/composables/getTotal.js
@@ -1,10 +1,11 @@
 import { toCurrency } from 'src/filters';
 
 export function getTotal(rows, key, opts = {}) {
-    const { currency, cb, decimalPlaces } = opts;
+    const { currency, cb, decimalPlaces, int } = opts;
     const total = rows.reduce((acc, row) => acc + +(cb ? cb(row) : row[key] || 0), 0);
+    const decimals = int ? 0 : decimalPlaces ?? 2;
 
     return currency
         ? toCurrency(total, currency == 'default' ? undefined : currency)
-        : parseFloat(total).toFixed(decimalPlaces ?? 2);
+        : parseFloat(total).toFixed(decimals);
 }
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 08ce0755d..b821025c2 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -154,7 +154,7 @@ const formatOpt = (row, { model, options }, prop) => {
                                 {{ getTotal(rows, 'net') }}
                             </QTd>
                             <QTd>
-                                {{ getTotal(rows, 'stems') }}
+                                {{ getTotal(rows, 'stems', { int: true }) }}
                             </QTd>
                             <QTd />
                         </QTr>
diff --git a/test/vitest/__tests__/composables/getTotal.spec.js b/test/vitest/__tests__/composables/getTotal.spec.js
new file mode 100644
index 000000000..7081c4334
--- /dev/null
+++ b/test/vitest/__tests__/composables/getTotal.spec.js
@@ -0,0 +1,55 @@
+import { vi, describe, expect, it } from 'vitest';
+import { getTotal } from 'src/composables/getTotal';
+
+vi.mock('src/filters', () => ({
+    toCurrency: vi.fn((value, currency) => `${currency} ${value.toFixed(2)}`),
+}));
+
+describe('getTotal()', () => {
+    const rows = [
+        { amount: 10.5, tax: 2.1 },
+        { amount: 20.75, tax: 3.25 },
+        { amount: 30.25, tax: 4.75 },
+    ];
+
+    it('should calculate the total for a given key', () => {
+        const total = getTotal(rows, 'amount');
+        expect(total).toBe('61.50');
+    });
+
+    it('should calculate the total with a callback function', () => {
+        const total = getTotal(rows, null, { cb: (row) => row.amount + row.tax });
+        expect(total).toBe('71.60');
+    });
+
+    it('should format the total as currency', () => {
+        const total = getTotal(rows, 'amount', { currency: 'USD' });
+        expect(total).toBe('USD 61.50');
+    });
+
+    it('should format the total as currency with default currency', () => {
+        const total = getTotal(rows, 'amount', { currency: 'default' });
+        expect(total).toBe('undefined 61.50');
+    });
+
+    it('should calculate the total with integer formatting', () => {
+        const total = getTotal(rows, 'amount', { int: true });
+        expect(total).toBe('62');
+    });
+
+    it('should calculate the total with custom decimal places', () => {
+        const total = getTotal(rows, 'amount', { decimalPlaces: 1 });
+        expect(total).toBe('61.5');
+    });
+
+    it('should handle rows with missing keys', () => {
+        const rowsWithMissingKeys = [{ amount: 10.5 }, { amount: 20.75 }, {}];
+        const total = getTotal(rowsWithMissingKeys, 'amount');
+        expect(total).toBe('31.25');
+    });
+
+    it('should handle empty rows', () => {
+        const total = getTotal([], 'amount');
+        expect(total).toBe('0.00');
+    });
+});
diff --git a/test/vitest/__tests__/pages/InvoiceIn/InvoiceInIntrastat.spec.js b/test/vitest/__tests__/pages/InvoiceIn/InvoiceInIntrastat.spec.js
deleted file mode 100644
index adfb054c6..000000000
--- a/test/vitest/__tests__/pages/InvoiceIn/InvoiceInIntrastat.spec.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import { vi, describe, expect, it, beforeAll } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
-import InvoiceInIntrastat from 'src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue';
-
-describe('InvoiceInIntrastat', () => {
-    let vm;
-
-    beforeAll(() => {
-        vm = createWrapper(InvoiceInIntrastat, {
-            global: {
-                stubs: ['vnPaginate'],
-                mocks: {
-                    fetch: vi.fn(),
-                },
-            },
-        }).vm;
-        vi.spyOn(axios, 'get').mockResolvedValue({ data: [{}] });
-    });
-
-    describe('getTotal()', () => {
-        it('should correctly handle the sum', () => {
-            const invoceInIntrastat = [
-                { amount: 10, stems: 162 },
-                { amount: 20, stems: 21 },
-            ];
-
-            const totalAmount = vm.getTotal(invoceInIntrastat, 'amount');
-            const totalStems = vm.getTotal(invoceInIntrastat, 'stems');
-
-            expect(totalAmount).toBe(10 + 20);
-            expect(totalStems).toBe(162 + 21);
-        });
-    });
-});
diff --git a/test/vitest/__tests__/pages/InvoiceIn/InvoiceInVat.spec.js b/test/vitest/__tests__/pages/InvoiceIn/InvoiceInVat.spec.js
deleted file mode 100644
index 76453f65a..000000000
--- a/test/vitest/__tests__/pages/InvoiceIn/InvoiceInVat.spec.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import { vi, describe, expect, it, beforeAll } from 'vitest';
-import { createWrapper } from 'app/test/vitest/helper';
-import InvoiceInVat from 'src/pages/InvoiceIn/Card/InvoiceInVat.vue';
-
-describe('InvoiceInVat', () => {
-    let vm;
-
-    beforeAll(() => {
-        vm = createWrapper(InvoiceInVat, {
-            global: {
-                stubs: [],
-                mocks: {
-                    fetch: vi.fn(),
-                },
-            },
-        }).vm;
-    });
-
-    describe('taxRate()', () => {
-        it('should correctly compute the tax rate', () => {
-            const invoiceInTax = { taxableBase: 100, taxTypeSageFk: 1 };
-            vm.sageTaxTypes = [
-                { id: 1, rate: 10 },
-                { id: 2, rate: 20 },
-            ];
-            const result = vm.taxRate(invoiceInTax);
-            expect(result).toBe((10 / 100) * 100);
-        });
-
-        it('should return 0 if there is not tax rate', () => {
-            const invoiceInTax = { taxableBase: 100, taxTypeSageFk: 1 };
-            vm.sageTaxTypes = [];
-
-            const result = vm.taxRate(invoiceInTax);
-            expect(result).toBe(0);
-        });
-    });
-});
-- 
2.40.1


From 6a7cf5e8e858aee10a00e82319e32c300de65747 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 5 Dec 2024 12:34:29 +0100
Subject: [PATCH 22/38] feat: refs #7936 add unit tests

---
 src/components/LeftMenu.vue                   |  1 +
 .../__tests__/composables/getExchange.spec.js | 45 +++++++++++++++++++
 .../useAccountShortToStandard.spec.js         |  9 ++++
 3 files changed, 55 insertions(+)
 create mode 100644 test/vitest/__tests__/composables/getExchange.spec.js
 create mode 100644 test/vitest/__tests__/composables/useAccountShortToStandard.spec.js

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index ab2931dfd..31ad9ebed 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -177,6 +177,7 @@ function normalize(text) {
                         class="full-width"
                         filled
                         dense
+                        autofocus
                     />
                 </QItem>
                 <QSeparator />
diff --git a/test/vitest/__tests__/composables/getExchange.spec.js b/test/vitest/__tests__/composables/getExchange.spec.js
new file mode 100644
index 000000000..dba31458e
--- /dev/null
+++ b/test/vitest/__tests__/composables/getExchange.spec.js
@@ -0,0 +1,45 @@
+import { describe, expect, it, vi } from 'vitest';
+import axios from 'axios';
+import { getExchange } from 'src/composables/getExchange';
+
+vi.mock('axios');
+
+describe('getExchange()', () => {
+    it('should return the correct exchange rate', async () => {
+        axios.get.mockResolvedValue({
+            data: { value: 1.2 },
+        });
+
+        const amount = 100;
+        const currencyFk = 1;
+        const dated = '2023-01-01';
+        const result = await getExchange(amount, currencyFk, dated);
+
+        expect(result).toBe('83.33');
+    });
+
+    it('should return the correct exchange rate with custom decimal places', async () => {
+        axios.get.mockResolvedValue({
+            data: { value: 1.2 },
+        });
+
+        const amount = 100;
+        const currencyFk = 1;
+        const dated = '2023-01-01';
+        const decimalPlaces = 3;
+        const result = await getExchange(amount, currencyFk, dated, decimalPlaces);
+
+        expect(result).toBe('83.333');
+    });
+
+    it('should return null if the API call fails', async () => {
+        axios.get.mockRejectedValue(new Error('Network error'));
+
+        const amount = 100;
+        const currencyFk = 1;
+        const dated = '2023-01-01';
+        const result = await getExchange(amount, currencyFk, dated);
+
+        expect(result).toBeNull();
+    });
+});
diff --git a/test/vitest/__tests__/composables/useAccountShortToStandard.spec.js b/test/vitest/__tests__/composables/useAccountShortToStandard.spec.js
new file mode 100644
index 000000000..d24585812
--- /dev/null
+++ b/test/vitest/__tests__/composables/useAccountShortToStandard.spec.js
@@ -0,0 +1,9 @@
+import { describe, expect, it } from 'vitest';
+import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
+
+describe('useAccountShortToStandard()', () => {
+    it('should pad the decimal part with zeros for short numbers', () => {
+        expect(useAccountShortToStandard('123.45')).toBe('1230000045');
+        expect(useAccountShortToStandard('123.')).toBe('1230000000');
+    });
+});
-- 
2.40.1


From bd12c3bc663f0be5a1d781f01b981dffc0c165ab Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 5 Dec 2024 15:55:40 +0100
Subject: [PATCH 23/38] feat: refs #7936 update option labels in InvoiceIn
 components for better clarity

---
 .../InvoiceIn/Card/InvoiceInIntrastat.vue     | 24 ++++-----------
 src/pages/InvoiceIn/Card/InvoiceInVat.vue     | 30 ++-----------------
 2 files changed, 8 insertions(+), 46 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index b821025c2..be9e3bf44 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -26,7 +26,7 @@ const columns = computed(() => [
         options: intrastats.value,
         model: 'intrastatFk',
         optionValue: 'id',
-        optionLabel: 'description',
+        optionLabel: (row) => `${row.id}: ${row.description}`,
         sortable: true,
         tabIndex: 1,
         align: 'left',
@@ -68,12 +68,6 @@ const columns = computed(() => [
         align: 'left',
     },
 ]);
-
-const formatOpt = (row, { model, options }, prop) => {
-    const obj = row[model];
-    const option = options.find(({ id }) => id == obj);
-    return option ? `${obj}:${option[prop]}` : '';
-};
 </script>
 <template>
     <FetchData
@@ -118,12 +112,9 @@ const formatOpt = (row, { model, options }, prop) => {
                             <VnSelect
                                 v-model="row[col.model]"
                                 :options="col.options"
-                                option-value="id"
-                                option-label="description"
+                                :option-value="col.optionValue"
+                                :option-label="col.optionLabel"
                                 :filter-options="['id', 'description']"
-                                :hide-selected="false"
-                                :fill-input="false"
-                                :display-value="formatOpt(row, col, 'description')"
                             >
                                 <template #option="scope">
                                     <QItem v-bind="scope.itemProps">
@@ -138,8 +129,8 @@ const formatOpt = (row, { model, options }, prop) => {
                             <VnSelect
                                 v-model="row[col.model]"
                                 :options="col.options"
-                                option-value="id"
-                                option-label="code"
+                                :option-value="col.optionValue"
+                                :option-label="col.optionLabel"
                             />
                         </QTd>
                     </template>
@@ -248,11 +239,6 @@ const formatOpt = (row, { model, options }, prop) => {
     }
 }
 </style>
-<style lang="scss" scoped>
-:deep(.q-table tr .q-td:nth-child(2) input) {
-    display: none;
-}
-</style>
 <i18n>
     en:
         amount: Amount
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index c52136bea..dcca997e8 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -41,9 +41,8 @@ const columns = computed(() => [
         options: expenses.value,
         model: 'expenseFk',
         optionValue: 'id',
-        optionLabel: 'id',
+        optionLabel: (row) => `${row.id}: ${row.name}`,
         sortable: true,
-        tabIndex: 1,
         align: 'left',
     },
     {
@@ -52,7 +51,6 @@ const columns = computed(() => [
         field: (row) => row.taxableBase,
         model: 'taxableBase',
         sortable: true,
-        tabIndex: 2,
         align: 'left',
     },
     {
@@ -62,9 +60,8 @@ const columns = computed(() => [
         options: sageTaxTypes.value,
         model: 'taxTypeSageFk',
         optionValue: 'id',
-        optionLabel: 'id',
+        optionLabel: (row) => `${row.id}: ${row.vat}`,
         sortable: true,
-        tabindex: 3,
         align: 'left',
     },
     {
@@ -74,16 +71,14 @@ const columns = computed(() => [
         options: sageTransactionTypes.value,
         model: 'transactionTypeSageFk',
         optionValue: 'id',
-        optionLabel: 'id',
+        optionLabel: (row) => `${row.id}: ${row.transaction}`,
         sortable: true,
-        tabIndex: 4,
         align: 'left',
     },
     {
         name: 'rate',
         label: t('Rate'),
         sortable: true,
-        tabIndex: 5,
         field: (row) => taxRate(row, row.taxTypeSageFk),
         align: 'left',
     },
@@ -91,7 +86,6 @@ const columns = computed(() => [
         name: 'foreignvalue',
         label: t('Foreign value'),
         sortable: true,
-        tabIndex: 6,
         field: (row) => row.foreignValue,
         align: 'left',
     },
@@ -124,12 +118,6 @@ function taxRate(invoiceInTax) {
 
     return ((taxTypeSage / 100) * taxableBase).toFixed(2);
 }
-
-const formatOpt = (row, { model, options }, prop) => {
-    const obj = row[model];
-    const option = options.find(({ id }) => id == obj);
-    return option ? `${obj}:${option[prop]}` : '';
-};
 </script>
 <template>
     <FetchData
@@ -173,8 +161,6 @@ const formatOpt = (row, { model, options }, prop) => {
                             :option-label="col.optionLabel"
                             :filter-options="['id', 'name']"
                             :tooltip="t('Create a new expense')"
-                            :hide-selected="false"
-                            :display-value="formatOpt(row, col, 'name')"
                             @keydown.tab="
                                 row[col.model] = useAccountShortToStandard(
                                     $event.target.value
@@ -211,8 +197,6 @@ const formatOpt = (row, { model, options }, prop) => {
                             :option-value="col.optionValue"
                             :option-label="col.optionLabel"
                             :filter-options="['id', 'vat']"
-                            :hide-selected="false"
-                            :display-value="formatOpt(row, col, 'vat')"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
@@ -235,9 +219,6 @@ const formatOpt = (row, { model, options }, prop) => {
                             :option-value="col.optionValue"
                             :option-label="col.optionLabel"
                             :filter-options="['id', 'transaction']"
-                            :autofocus="col.tabIndex == 1"
-                            :hide-selected="false"
-                            :display-value="formatOpt(row, col, 'transaction')"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
@@ -428,11 +409,6 @@ const formatOpt = (row, { model, options }, prop) => {
 .bg {
     background-color: var(--vn-light-gray);
 }
-
-:deep(.q-table tr td:nth-child(n + 4):nth-child(-n + 5) input) {
-    display: none;
-}
-
 @media (max-width: $breakpoint-xs) {
     .q-dialog {
         .q-card {
-- 
2.40.1


From fdd947fbbbd5f7dafbc7eb2531f1786cc8bdef52 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 5 Dec 2024 15:59:56 +0100
Subject: [PATCH 24/38] feat: refs #7936 improve optionLabel logic in
 InvoiceInVat component for better handling of numeric values

---
 src/pages/InvoiceIn/Card/InvoiceInVat.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index dcca997e8..2b3c42e0d 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -41,7 +41,11 @@ const columns = computed(() => [
         options: expenses.value,
         model: 'expenseFk',
         optionValue: 'id',
-        optionLabel: (row) => `${row.id}: ${row.name}`,
+        optionLabel: (row) => {
+            if (isNaN(row)) return `${row.id}: ${row.name}`;
+            let label = expenses.value.find((expense) => expense.id == row);
+            return `${label.id}: ${label.name}`;
+        },
         sortable: true,
         align: 'left',
     },
-- 
2.40.1


From fb1928db7ea8d3909bceca29a44c2d1bdaefdbde Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 5 Dec 2024 16:41:32 +0100
Subject: [PATCH 25/38] feat: refs #7936 simplify optionLabel wip

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

diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 2b3c42e0d..dcca997e8 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -41,11 +41,7 @@ const columns = computed(() => [
         options: expenses.value,
         model: 'expenseFk',
         optionValue: 'id',
-        optionLabel: (row) => {
-            if (isNaN(row)) return `${row.id}: ${row.name}`;
-            let label = expenses.value.find((expense) => expense.id == row);
-            return `${label.id}: ${label.name}`;
-        },
+        optionLabel: (row) => `${row.id}: ${row.name}`,
         sortable: true,
         align: 'left',
     },
-- 
2.40.1


From 799c78cdff9d512ad544b24a3d6c6881524acdc4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Dec 2024 17:07:12 +0100
Subject: [PATCH 26/38] feat: refs #7936 show id & value

---
 src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue |  4 +++-
 src/pages/InvoiceIn/Card/InvoiceInVat.vue       | 10 +++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index be9e3bf44..f16a7b17b 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -165,7 +165,9 @@ const columns = computed(() => [
                                             v-model="props.row['intrastatFk']"
                                             :options="intrastats"
                                             option-value="id"
-                                            option-label="description"
+                                            :option-label="
+                                                (row) => `${row.id}:${row.description}`
+                                            "
                                             :filter-options="['id', 'description']"
                                         >
                                             <template #option="scope">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index dcca997e8..e8087001c 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -118,6 +118,8 @@ function taxRate(invoiceInTax) {
 
     return ((taxTypeSage / 100) * taxableBase).toFixed(2);
 }
+
+const formatLabel = (row, prop) => `${row.id}: ${row[prop]}`;
 </script>
 <template>
     <FetchData
@@ -296,7 +298,7 @@ function taxRate(invoiceInTax) {
                                         v-model="props.row['expenseFk']"
                                         :options="expenses"
                                         option-value="id"
-                                        option-label="name"
+                                        :option-label="(row) => `${row.id}:${row.name}`"
                                         :filter-options="['id', 'name']"
                                         :tooltip="t('Create a new expense')"
                                     >
@@ -330,7 +332,7 @@ function taxRate(invoiceInTax) {
                                         v-model="props.row['taxTypeSageFk']"
                                         :options="sageTaxTypes"
                                         option-value="id"
-                                        option-label="vat"
+                                        :option-label="(row) => `${row.id}:${row.vat}`"
                                         :filter-options="['id', 'vat']"
                                     >
                                         <template #option="scope">
@@ -353,7 +355,9 @@ function taxRate(invoiceInTax) {
                                         v-model="props.row['transactionTypeSageFk']"
                                         :options="sageTransactionTypes"
                                         option-value="id"
-                                        option-label="transaction"
+                                        :option-label="
+                                            (row) => `${row.id}:${row.transaction}`
+                                        "
                                         :filter-options="['id', 'transaction']"
                                     >
                                         <template #option="scope">
-- 
2.40.1


From 43629a3bc3e2b12ab3fe77d87bbe0cf205e5cd86 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 9 Dec 2024 17:27:30 +0100
Subject: [PATCH 27/38] fix: refs #7936 test

---
 src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue       |  1 +
 src/pages/InvoiceIn/Card/InvoiceInVat.vue             |  1 +
 .../integration/invoiceIn/invoiceInIntrastat.spec.js  | 11 +++++------
 .../integration/invoiceIn/invoiceInVat.spec.js        |  5 +++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index f16a7b17b..fee65daaa 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -115,6 +115,7 @@ const columns = computed(() => [
                                 :option-value="col.optionValue"
                                 :option-label="col.optionLabel"
                                 :filter-options="['id', 'description']"
+                                data-cy="intrastat-code"
                             >
                                 <template #option="scope">
                                     <QItem v-bind="scope.itemProps">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index e8087001c..d9eacf686 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -199,6 +199,7 @@ const formatLabel = (row, prop) => `${row.id}: ${row[prop]}`;
                             :option-value="col.optionValue"
                             :option-label="col.optionLabel"
                             :filter-options="['id', 'vat']"
+                            data-cy="vat-sageiva"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
diff --git a/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js b/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js
index f6dac4c73..4c2550548 100644
--- a/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js
@@ -2,7 +2,7 @@
 describe('InvoiceInIntrastat', () => {
     const firstRow = 'tbody > :nth-child(1)';
     const thirdRow = 'tbody > :nth-child(3)';
-    const firstRowCode = `${firstRow} > :nth-child(2)`;
+    const codes = `[data-cy="intrastat-code"]`;
     const firstRowAmount = `${firstRow} > :nth-child(3)`;
 
     beforeEach(() => {
@@ -11,13 +11,12 @@ describe('InvoiceInIntrastat', () => {
     });
 
     it('should edit the first line', () => {
-        cy.selectOption(firstRowCode, 'Plantas vivas: Esqueje/injerto, Vid');
+        cy.selectOption(`${firstRow} ${codes}`, 'Plantas vivas: Esqueje/injerto, Vid');
         cy.get(firstRowAmount).clear();
         cy.saveCard();
-        cy.get(`${firstRowCode} span`).should(
-            'have.text',
-            '6021010:Plantas vivas: Esqueje/injerto, Vid'
-        );
+        cy.get(codes)
+            .eq(0)
+            .should('have.value', '6021010: Plantas vivas: Esqueje/injerto, Vid');
     });
 
     it('should add a new row', () => {
diff --git a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
index b84d743d1..f8b403a45 100644
--- a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
@@ -2,6 +2,7 @@
 describe('InvoiceInVat', () => {
     const thirdRow = 'tbody > :nth-child(3)';
     const firstLineVat = 'tbody > :nth-child(1) > :nth-child(4)';
+    const vats = '[data-cy="vat-sageiva"]';
     const dialogInputs = '.q-dialog label input';
     const addBtn = 'tbody tr:nth-child(1) td:nth-child(2) .--add-icon';
     const randomInt = Math.floor(Math.random() * 100);
@@ -14,9 +15,9 @@ describe('InvoiceInVat', () => {
     });
 
     it('should edit the sage iva', () => {
-        cy.selectOption(firstLineVat, 'H.P. IVA 21% CEE');
+        cy.selectOption(`${firstLineVat} ${vats}`, 'H.P. IVA 21% CEE');
         cy.saveCard();
-        cy.get(`${firstLineVat} span`).should('have.text', '8:H.P. IVA 21% CEE');
+        cy.get(vats).eq(0).should('have.value', '8: H.P. IVA 21% CEE');
     });
 
     it('should add a new row', () => {
-- 
2.40.1


From 2939ddcfb7606f2bc15b087d110999fe990a88d3 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 10 Dec 2024 10:35:05 +0100
Subject: [PATCH 28/38] fix: refs #7936 rollback

---
 src/components/common/VnSelect.vue | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index d39d1143f..1082df4f9 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -279,6 +279,28 @@ async function onScroll({ to, direction, from, index }) {
 }
 
 defineExpose({ opts: myOptions });
+
+function handleKeyDown(event) {
+    if (event.key === 'Tab') {
+        event.preventDefault();
+
+        const inputValue = vnSelectRef.value?.inputValue;
+
+        if (inputValue) {
+            const matchingOption = myOptions.value.find(
+                (option) =>
+                    option[optionLabel.value].toLowerCase() === inputValue.toLowerCase()
+            );
+
+            if (matchingOption) {
+                emit('update:modelValue', matchingOption[optionValue.value]);
+            } else {
+                emit('update:modelValue', inputValue);
+            }
+            vnSelectRef.value?.hidePopup();
+        }
+    }
+}
 </script>
 
 <template>
@@ -303,6 +325,7 @@ defineExpose({ opts: myOptions });
         :input-debounce="useURL ? '300' : '0'"
         :loading="isLoading"
         @virtual-scroll="onScroll"
+        @keydown="handleKeyDown"
         :data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
     >
         <template #append>
-- 
2.40.1


From cc7432b2534aa1c98b51eb5b311dbaa9088a2214 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 10 Dec 2024 10:38:43 +0100
Subject: [PATCH 29/38] refactor: refs #7936 simplify getTotal fn

---
 src/composables/getTotal.js                        | 5 ++---
 src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue    | 2 +-
 test/vitest/__tests__/composables/getTotal.spec.js | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/composables/getTotal.js b/src/composables/getTotal.js
index 91b884bda..24ac3aa27 100644
--- a/src/composables/getTotal.js
+++ b/src/composables/getTotal.js
@@ -1,11 +1,10 @@
 import { toCurrency } from 'src/filters';
 
 export function getTotal(rows, key, opts = {}) {
-    const { currency, cb, decimalPlaces, int } = opts;
+    const { currency, cb, decimalPlaces } = opts;
     const total = rows.reduce((acc, row) => acc + +(cb ? cb(row) : row[key] || 0), 0);
-    const decimals = int ? 0 : decimalPlaces ?? 2;
 
     return currency
         ? toCurrency(total, currency == 'default' ? undefined : currency)
-        : parseFloat(total).toFixed(decimals);
+        : parseFloat(total).toFixed(decimalPlaces ?? 2);
 }
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index fee65daaa..1c4091169 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -146,7 +146,7 @@ const columns = computed(() => [
                                 {{ getTotal(rows, 'net') }}
                             </QTd>
                             <QTd>
-                                {{ getTotal(rows, 'stems', { int: true }) }}
+                                {{ getTotal(rows, 'stems', { decimalPlaces: 0 }) }}
                             </QTd>
                             <QTd />
                         </QTr>
diff --git a/test/vitest/__tests__/composables/getTotal.spec.js b/test/vitest/__tests__/composables/getTotal.spec.js
index 7081c4334..789e3fbcf 100644
--- a/test/vitest/__tests__/composables/getTotal.spec.js
+++ b/test/vitest/__tests__/composables/getTotal.spec.js
@@ -33,7 +33,7 @@ describe('getTotal()', () => {
     });
 
     it('should calculate the total with integer formatting', () => {
-        const total = getTotal(rows, 'amount', { int: true });
+        const total = getTotal(rows, 'amount', { decimalPlaces: 0 });
         expect(total).toBe('62');
     });
 
-- 
2.40.1


From 8a1cda6914dcb4f0055abda075ec7c7af1c6d802 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Dec 2024 10:10:59 +0100
Subject: [PATCH 30/38] feat: refs #7936 add autocomplete on tab fn

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

diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index d9eacf686..f7ef7d525 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -119,7 +119,17 @@ function taxRate(invoiceInTax) {
     return ((taxTypeSage / 100) * taxableBase).toFixed(2);
 }
 
-const formatLabel = (row, prop) => `${row.id}: ${row[prop]}`;
+function autocompleteExpense(evt, row, col) {
+    const val = evt.target.value;
+    if (!val) return;
+
+    const param = isNaN(val) ? row[col.model] : val;
+    const lookup = expenses.value.find(
+        ({ id }) => id == useAccountShortToStandard(param)
+    );
+
+    if (lookup) row[col.model] = lookup;
+}
 </script>
 <template>
     <FetchData
@@ -163,11 +173,7 @@ const formatLabel = (row, prop) => `${row.id}: ${row[prop]}`;
                             :option-label="col.optionLabel"
                             :filter-options="['id', 'name']"
                             :tooltip="t('Create a new expense')"
-                            @keydown.tab="
-                                row[col.model] = useAccountShortToStandard(
-                                    $event.target.value
-                                )
-                            "
+                            @keydown.tab="autocompleteExpense($event, row, col)"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
-- 
2.40.1


From e075e1307663028b675e580251b4462859348afc Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Dec 2024 17:42:31 +0100
Subject: [PATCH 31/38] feat: refs #7936 add dueDated field

---
 src/pages/InvoiceIn/InvoiceInList.vue | 16 +++++++++++++---
 src/pages/InvoiceIn/locale/en.yml     |  1 +
 src/pages/InvoiceIn/locale/es.yml     |  4 ++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index e9255398b..6469f446d 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -28,6 +28,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 const tableRef = ref();
 const companies = ref([]);
 const cols = computed(() => [
+    {
+        align: 'left',
+        name: 'isBooked',
+        label: t('InvoiceIn.isBooked'),
+        columnFilter: false,
+    },
     {
         align: 'left',
         name: 'id',
@@ -68,9 +74,13 @@ const cols = computed(() => [
     },
     {
         align: 'left',
-        name: 'isBooked',
-        label: t('InvoiceIn.isBooked'),
-        columnFilter: false,
+        label: t('InvoiceIn.list.dueDated'),
+        name: 'dueDated',
+        component: null,
+        columnFilter: {
+            component: 'date',
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.dueDated)),
     },
     {
         align: 'left',
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index 529569aa0..ef7e31ac3 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -7,6 +7,7 @@ InvoiceIn:
         supplierRef: Supplier ref.
         file: File
         issued: Issued
+        dueDated: Due dated
         awb: AWB
         amount: Amount
     descriptor:
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index 2192442cd..ed5943489 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -5,9 +5,9 @@ InvoiceIn:
         ref: Referencia
         supplier: Proveedor
         supplierRef: Ref. proveedor
-        shortIssued: F. emisión
+        issued: F. emisión
+        dueDated: F. vencimiento
         file: Fichero
-        issued: Fecha emisión
         awb: AWB
         amount: Importe
     descriptor:
-- 
2.40.1


From c5f4e8decd2d4008df70f4ffa118db0b3deb3a1f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 12 Dec 2024 10:56:42 +0100
Subject: [PATCH 32/38] fix: refs #7936 exclude disabled els on tab

---
 src/components/common/VnSelect.vue           | 2 +-
 src/pages/InvoiceIn/Card/InvoiceInDueDay.vue | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 5b905efc7..dc8fd582e 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -301,7 +301,7 @@ function handleKeyDown(event) {
         }
 
         const focusableElements = document.querySelectorAll(
-            'a, button, input, textarea, select, details, [tabindex]:not([tabindex="-1"])'
+            'a:not([disabled]), button:not([disabled]), input:not([disabled]), textarea:not([disabled]), select:not([disabled]), details:not([disabled]), [tabindex]:not([tabindex="-1"]):not([disabled])'
         );
         const currentIndex = Array.prototype.indexOf.call(
             focusableElements,
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index 75f9a67a4..d2c6d0a2d 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -144,8 +144,6 @@ async function insert() {
                             }"
                             :disable="!isNotEuro(currency)"
                             v-model="row.foreignValue"
-                            clearable
-                            clear-icon="close"
                         />
                     </QTd>
                 </template>
-- 
2.40.1


From aeee8611474369b8fd7c844318b9753ccef27095 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 12 Dec 2024 11:20:54 +0100
Subject: [PATCH 33/38] feat: refs #7936 show country code & isVies fields

---
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 06e6d790f..5ad4959f6 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -229,6 +229,10 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     :value="entity.currency?.code"
                 />
                 <VnLv :label="t('InvoiceIn.serial')" :value="`${entity.serial}`" />
+                <VnLv
+                    :label="t('globals.country')"
+                    :value="entity.supplier?.country?.code"
+                />
             </QCard>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
@@ -254,6 +258,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     :label="t('InvoiceIn.summary.bookedDate')"
                     :value="toDate(entity.booked)"
                 />
+                <VnLv label="Is vies" :value="entity.supplier?.isVies" />
             </QCard>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
-- 
2.40.1


From 965f5fbead6e96ac9aaf927ba962218942471d70 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 12 Dec 2024 12:09:23 +0100
Subject: [PATCH 34/38] fix: refs #7936 test

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

diff --git a/test/cypress/integration/invoiceIn/invoiceInList.spec.js b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
index fa0d1c5e4..d9ab3f7e7 100644
--- a/test/cypress/integration/invoiceIn/invoiceInList.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
@@ -1,7 +1,7 @@
 /// <reference types="cypress" />
 describe('InvoiceInList', () => {
     const firstRow = 'tbody.q-virtual-scroll__content tr:nth-child(1)';
-    const firstId = `${firstRow} > td:nth-child(1) span`;
+    const firstId = `${firstRow} > td:nth-child(2) span`;
     const firstDetailBtn = `${firstRow} .q-btn:nth-child(1)`;
     const summaryHeaders = '.summaryBody .header-link';
 
-- 
2.40.1


From f95a1f97399e64ee47f502eb8f4116d461387bf7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 12 Dec 2024 12:50:57 +0100
Subject: [PATCH 35/38] feat: refs #7936 update 'isVies' label to use global
 translation key

---
 src/i18n/locale/en.yml                         | 2 +-
 src/i18n/locale/es.yml                         | 2 +-
 src/pages/Customer/Card/CustomerFiscalData.vue | 3 +--
 src/pages/Customer/Card/CustomerSummary.vue    | 2 +-
 src/pages/Customer/CustomerList.vue            | 2 +-
 src/pages/Customer/locale/en.yml               | 1 -
 src/pages/Customer/locale/es.yml               | 1 -
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue  | 2 +-
 src/pages/Supplier/Card/SupplierFiscalData.vue | 5 +----
 9 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 93ed345b9..3481fe4a9 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -348,6 +348,7 @@ globals:
     deleteConfirmTitle: Delete selected elements
     changeState: Change state
     raid: 'Raid {daysInForward} days'
+    isVies: Vies
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -741,7 +742,6 @@ supplier:
         sageTransactionTypeFk: Sage transaction type
         supplierActivityFk: Supplier activity
         isTrucker: Trucker
-        isVies: Vies
     billingData:
         payMethodFk: Billing data
         payDemFk: Payment deadline
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 9e189431d..8807a1adc 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -350,6 +350,7 @@ globals:
     deleteConfirmTitle: Eliminar los elementos seleccionados
     changeState: Cambiar estado
     raid: 'Redada {daysInForward} días'
+    isVies: Vies
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -734,7 +735,6 @@ supplier:
         sageTransactionTypeFk: Tipo de transacción sage
         supplierActivityFk: Actividad proveedor
         isTrucker: Transportista
-        isVies: Vies
     billingData:
         payMethodFk: Forma de pago
         payDemFk: Plazo de pago
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 673c7dda9..aff7deda4 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -110,7 +110,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <QCheckbox :label="t('Has to invoice')" v-model="data.hasToInvoice" />
                 <div>
-                    <QCheckbox :label="t('Vies')" v-model="data.isVies" />
+                    <QCheckbox :label="t('globals.isVies')" v-model="data.isVies" />
                     <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
                         <QTooltip>
                             {{ t('whenActivatingIt') }}
@@ -169,7 +169,6 @@ es:
     Active: Activo
     Frozen: Congelado
     Has to invoice: Factura
-    Vies: Vies
     Notify by email: Notificar vía e-mail
     Invoice by address: Facturar por consignatario
     Is equalizated: Recargo de equivalencia
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index ae4c7f3ab..6650ea395 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -173,7 +173,7 @@ const sumRisk = ({ clientRisks }) => {
                         :label="t('customer.summary.notifyByEmail')"
                         :value="entity.isToBeMailed"
                     />
-                    <VnLv :label="t('customer.summary.vies')" :value="entity.isVies" />
+                    <VnLv :label="t('globals.isVies')" :value="entity.isVies" />
                 </VnRow>
             </QCard>
             <QCard class="vn-one">
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index e86e35966..69122f200 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -263,7 +263,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isVies'),
+        label: t('globals.isVies'),
         name: 'isVies',
         columnFilter: {
             inWhere: true,
diff --git a/src/pages/Customer/locale/en.yml b/src/pages/Customer/locale/en.yml
index 07ec53964..18cee7309 100644
--- a/src/pages/Customer/locale/en.yml
+++ b/src/pages/Customer/locale/en.yml
@@ -88,7 +88,6 @@ customer:
             businessTypeFk: Business type
             sageTaxTypeFk: Sage tax type
             sageTransactionTypeFk: Sage tr. type
-            isVies: Vies
             isTaxDataChecked: Verified data
             isFreezed: Freezed
             hasToInvoice: Invoice
diff --git a/src/pages/Customer/locale/es.yml b/src/pages/Customer/locale/es.yml
index 36a266497..b544f8ad7 100644
--- a/src/pages/Customer/locale/es.yml
+++ b/src/pages/Customer/locale/es.yml
@@ -90,7 +90,6 @@ customer:
             businessTypeFk: Tipo de negocio
             sageTaxTypeFk: Tipo de impuesto Sage
             sageTransactionTypeFk: Tipo tr. sage
-            isVies: Vies
             isTaxDataChecked: Datos comprobados
             isFreezed: Congelado
             hasToInvoice: Factura
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 5ad4959f6..115a33208 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -258,7 +258,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     :label="t('InvoiceIn.summary.bookedDate')"
                     :value="toDate(entity.booked)"
                 />
-                <VnLv label="Is vies" :value="entity.supplier?.isVies" />
+                <VnLv :label="t('globals.isVies')" :value="entity.supplier?.isVies" />
             </QCard>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 1a79be8bc..44235717f 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -180,10 +180,7 @@ function handleLocation(data, location) {
                         :label="t('supplier.fiscalData.isTrucker')"
                     />
                     <div class="row items-center">
-                        <QCheckbox
-                            v-model="data.isVies"
-                            :label="t('supplier.fiscalData.isVies')"
-                        />
+                        <QCheckbox v-model="data.isVies" :label="t('globals.isVies')" />
                         <QIcon name="info" size="xs" class="cursor-pointer q-ml-sm">
                             <QTooltip>
                                 {{
-- 
2.40.1


From a33cec4a34091ddc32dcac132104e7dc3b2f63e3 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 17 Dec 2024 11:12:21 +0100
Subject: [PATCH 36/38] feat: refs #7936 add optionCaption

---
 src/components/common/VnSelect.vue | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index dc8fd582e..ed21b089b 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useRequired } from 'src/composables/useRequired';
 import dataByOrder from 'src/utils/dataByOrder';
+import { QItemLabel } from 'quasar';
 
 const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
 const $attrs = useAttrs();
@@ -33,6 +34,10 @@ const $props = defineProps({
         type: String,
         default: 'id',
     },
+    optionCaption: {
+        type: String,
+        default: null,
+    },
     optionFilter: {
         type: String,
         default: null,
@@ -373,13 +378,16 @@ function handleKeyDown(event) {
         </template>
         <template #option="{ opt, itemProps }">
             <QItem v-bind="itemProps">
-                <QItemSection>
-                    <QItemLabel v-if="opt[optionValue] == opt[optionLabel]">{{
-                        opt[optionLabel]
-                    }}</QItemLabel>
-                    <QItemLabel v-else>{{
-                        `#${opt[optionValue]} - ${opt[optionLabel]}`
-                    }}</QItemLabel>
+                <QItemSection v-if="opt[optionValue] == opt[optionLabel]">
+                    <QItemLabel>{{ opt[optionLabel] }}</QItemLabel>
+                </QItemSection>
+                <QItemSection v-else>
+                    <QItemLabel>
+                        {{ opt[optionLabel] }}
+                    </QItemLabel>
+                    <QItemLabel caption v-if="optionCaption !== false">
+                        {{ `#${opt[optionCaption] || opt[optionValue]}` }}
+                    </QItemLabel>
                 </QItemSection>
             </QItem>
         </template>
-- 
2.40.1


From ad9063704c322fd73eed4f4e9382bfe28c466107 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 17 Dec 2024 11:54:12 +0100
Subject: [PATCH 37/38] feat: refs #7936 enhance downloadFile function to
 support opening in a new tab

---
 src/composables/downloadFile.js               | 19 ++++++++++++++-----
 .../InvoiceIn/Card/InvoiceInDescriptor.vue    |  3 ++-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/composables/downloadFile.js b/src/composables/downloadFile.js
index 4588265a2..8c9e21a4f 100644
--- a/src/composables/downloadFile.js
+++ b/src/composables/downloadFile.js
@@ -2,16 +2,25 @@ import { useSession } from 'src/composables/useSession';
 import { getUrl } from './getUrl';
 import axios from 'axios';
 import { exportFile } from 'quasar';
+import useOpenURL from './useOpenURL';
 
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 
-export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
+export async function downloadFile(
+    id,
+    model = 'dms',
+    urlPath = '/downloadFile',
+    url,
+    newTab = true
+) {
     const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
-    const response = await axios.get(
-        url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`,
-        { responseType: 'blob' }
-    );
+    const targetUrl =
+        url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`;
+
+    if (newTab) return useOpenURL(targetUrl);
+
+    const response = await axios.get(targetUrl, { responseType: 'blob' });
 
     const contentDisposition = response.headers['content-disposition'];
     const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index f2c6f93ef..cb8a45833 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -206,7 +206,8 @@ const isAgricultural = () => {
 };
 
 function showPdfInvoice() {
-    if (isAgricultural()) openReport(`InvoiceIns/${entityId.value}/invoice-in-pdf`);
+    if (isAgricultural())
+        openReport(`InvoiceIns/${entityId.value}/invoice-in-pdf`, null, '_blank');
 }
 
 function sendPdfInvoiceConfirmation() {
-- 
2.40.1


From 22daf36c6cd5a2ebea2e4aa28b4953805e023b62 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 17 Dec 2024 11:58:57 +0100
Subject: [PATCH 38/38] fix: refs #7936 rollback

---
 src/composables/downloadFile.js | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/composables/downloadFile.js b/src/composables/downloadFile.js
index 8c9e21a4f..4588265a2 100644
--- a/src/composables/downloadFile.js
+++ b/src/composables/downloadFile.js
@@ -2,25 +2,16 @@ import { useSession } from 'src/composables/useSession';
 import { getUrl } from './getUrl';
 import axios from 'axios';
 import { exportFile } from 'quasar';
-import useOpenURL from './useOpenURL';
 
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 
-export async function downloadFile(
-    id,
-    model = 'dms',
-    urlPath = '/downloadFile',
-    url,
-    newTab = true
-) {
+export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
     const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
-    const targetUrl =
-        url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`;
-
-    if (newTab) return useOpenURL(targetUrl);
-
-    const response = await axios.get(targetUrl, { responseType: 'blob' });
+    const response = await axios.get(
+        url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`,
+        { responseType: 'blob' }
+    );
 
     const contentDisposition = response.headers['content-disposition'];
     const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
-- 
2.40.1