Merge pull request '#8277 createEntryControl' (!1370) from 8277-createEntryControl into dev

Reviewed-on: #1370
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>

src/components/CrudModel.vue

@@ -83,7 +83,7 @@ const isLoading = ref(false);
 const hasChanges = ref(false);
 const originalData = ref();
 const vnPaginateRef = ref();
-const formData = ref([]);
+const formData = ref();
 const saveButtonRef = ref(null);
 const watchChanges = ref();
 const formUrl = computed(() => $props.url);
@@ -298,6 +298,10 @@ watch(formUrl, async () => {
 });
 </script>
 <template>
+    <SkeletonTable
+        v-if="!formData && ($attrs['auto-load'] === '' || $attrs['auto-load'])"
+        :columns="$attrs.columns?.length"
+    />
     <VnPaginate
         :url="url"
         :limit="limit"
@@ -316,10 +320,6 @@ watch(formUrl, async () => {
             ></slot>
         </template>
     </VnPaginate>
-    <SkeletonTable
-        v-if="!formData && $attrs.autoLoad"
-        :columns="$attrs.columns?.length"
-    />
     <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
         <QBtnGroup push style="column-gap: 10px">
             <slot name="moreBeforeActions" />

src/components/common/VnInputDate.vue

@@ -68,19 +68,19 @@ const formatDate = () => {
     if (!value || value === model.value) {
         textColor.value = '';
         return;
-    } 
+    }
     const regex =
         /^([0]?[1-9]|[12][0-9]|3[01])([./-])([0]?[1-9]|1[0-2])([./-](\d{1,4}))?$/;
-    if (!regex.test(value)){
+    if (!regex.test(value)) {
         textColor.value = errColor;
         return;
-    } 
+    }
 
     value = value.replace(/[.-]/g, '/');
     const parts = value.split('/');
     if (parts.length < 2) {
         textColor.value = errColor;
-         return;
+        return;
     }
 
     let [day, month, year] = parts;
@@ -107,13 +107,13 @@ const formatDate = () => {
 
     let isoCandidate = `${year}/${month}/${day}`;
     isoCandidate = date.formatDate(
-                    new Date(isoCandidate).toISOString(),
-                    'YYYY-MM-DDTHH:mm:ss.SSSZ',
-                );
+        new Date(isoCandidate).toISOString(),
+        'YYYY-MM-DDTHH:mm:ss.SSSZ',
+    );
     const [isoYear, isoMonth, isoDay] = isoCandidate.split('-').map((e) => parseInt(e));
     const parsedDate = new Date(isoYear, isoMonth - 1, isoDay);
 
-    const isValidDate = 
+    const isValidDate =
         parsedDate instanceof Date &&
         !isNaN(parsedDate) &&
         parsedDate.getFullYear() === parseInt(year) &&
@@ -158,7 +158,6 @@ const handleEnter = (event) => {
 
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
-        {{ console.log($q) }}
         <QInput
             ref="vnInputDateRef"
             v-model="inputValue"
@@ -168,7 +167,7 @@ const handleEnter = (event) => {
             :class="{ required: isRequired }"
             :rules="mixinRules"
             :clearable="false"
-            :input-style="{color: textColor}"
+            :input-style="{ color: textColor }"
             @click="isPopupOpen = !isPopupOpen"
             @keydown="isPopupOpen = false"
             @blur="formatDate"

src/components/common/VnSelect.vue

@@ -186,6 +186,7 @@ onMounted(() => {
     if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
 });
 
+const someIsLoading = computed(() => isLoading.value || !!arrayData?.isLoading?.value);
 function findKeyInOptions() {
     if (!$props.options) return;
     return filter($props.modelValue, $props.options)?.length;
@@ -366,7 +367,8 @@ function getCaption(opt) {
         virtual-scroll-slice-size="options.length"
         hide-bottom-space
         :input-debounce="useURL ? '300' : '0'"
-        :loading="isLoading"
+        :loading="someIsLoading"
+        :disable="someIsLoading"
         @virtual-scroll="onScroll"
         @keydown="handleKeyDown"
         :data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
@@ -374,7 +376,7 @@ function getCaption(opt) {
     >
         <template #append>
             <QIcon
-                v-show="isClearable && value"
+                v-show="isClearable && value != null && value !== ''"
                 name="close"
                 @click="
                     () => {
@@ -389,7 +391,7 @@ function getCaption(opt) {
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
             <div v-if="slotName == 'append'">
                 <QIcon
-                    v-show="isClearable && value"
+                    v-show="isClearable && value != null && value !== ''"
                     name="close"
                     @click.stop="
                         () => {
@@ -414,7 +416,7 @@ function getCaption(opt) {
                     <QItemLabel>
                         {{ opt[optionLabel] }}
                     </QItemLabel>
-                    <QItemLabel caption v-if="getCaption(opt)">
+                    <QItemLabel caption v-if="getCaption(opt) !== false">
                         {{ `#${getCaption(opt)}` }}
                     </QItemLabel>
                 </QItemSection>

src/components/ui/EntityDescriptor.vue

@@ -44,8 +44,7 @@ onBeforeMount(async () => {
     });
 
     // It enables to load data only once if the module is the same as the dataKey
-    if (!isSameDataKey.value || !route.params.id || $props.id !== route.params.id)
-        await getData();
+    if (!isSameDataKey.value || !route.params.id) await getData();
     watch(
         () => [$props.url, $props.filter],
         async () => {

src/components/ui/VnConfirm.vue

@@ -89,24 +89,26 @@ function cancel() {
                 <slot name="customHTML"></slot>
             </QCardSection>
             <QCardActions align="right">
-                <QBtn
-                    :label="t('globals.cancel')"
-                    color="primary"
-                    :disable="isLoading"
-                    flat
-                    @click="cancel()"
-                    data-cy="VnConfirm_cancel"
-                />
-                <QBtn
-                    :label="t('globals.confirm')"
-                    :title="t('globals.confirm')"
-                    color="primary"
-                    :loading="isLoading"
-                    @click="confirm()"
-                    unelevated
-                    autofocus
-                    data-cy="VnConfirm_confirm"
-                />
+                <slot name="actions" :actions="{ confirm, cancel }">
+                    <QBtn
+                        :label="t('globals.cancel')"
+                        color="primary"
+                        :disable="isLoading"
+                        flat
+                        @click="cancel()"
+                        data-cy="VnConfirm_cancel"
+                    />
+                    <QBtn
+                        :label="t('globals.confirm')"
+                        :title="t('globals.confirm')"
+                        color="primary"
+                        :loading="isLoading"
+                        @click="confirm()"
+                        unelevated
+                        autofocus
+                        data-cy="VnConfirm_confirm"
+                    />
+                </slot>
             </QCardActions>
         </QCard>
     </QDialog>

src/composables/useArrayData.js

@@ -1,4 +1,4 @@
-import { onMounted, computed } from 'vue';
+import { onMounted, computed, ref } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import axios from 'axios';
 import { useArrayDataStore } from 'stores/useArrayDataStore';
@@ -346,7 +346,7 @@ export function useArrayData(key, userOptions) {
     }
 
     const totalRows = computed(() => (store.data && store.data.length) || 0);
-    const isLoading = computed(() => store.isLoading || false);
+    const isLoading = ref(store.isLoading || false);
 
     return {
         fetch,

src/i18n/locale/en.yml

@@ -346,6 +346,7 @@ globals:
         parking: Parking
         vehicleList: Vehicles
         vehicle: Vehicle
+        entryPreAccount: Pre-account
     unsavedPopup:
         title: Unsaved changes will be lost
         subtitle: Are you sure exit without saving?

src/i18n/locale/es.yml

@@ -349,6 +349,7 @@ globals:
         parking: Parking
         vehicleList: Vehículos
         vehicle: Vehículo
+        entryPreAccount: Precontabilizar
     unsavedPopup:
         title: Los cambios que no haya guardado se perderán
         subtitle: ¿Seguro que quiere salir sin guardar?

src/pages/Entry/EntryPreAccount.vue

@@ -0,0 +1,477 @@
+<script setup>
+import { ref, computed, markRaw, useTemplateRef, onBeforeMount, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { toDate, toCurrency } from 'src/filters';
+import { useArrayData } from 'src/composables/useArrayData';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
+import EntryDescriptorProxy from './Card/EntryDescriptorProxy.vue';
+import SupplierDescriptorProxy from '../Supplier/Card/SupplierDescriptorProxy.vue';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify';
+import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import VnDms from 'src/components/common/VnDms.vue';
+import { useState } from 'src/composables/useState';
+import { useQuasar } from 'quasar';
+import InvoiceInDescriptorProxy from '../InvoiceIn/Card/InvoiceInDescriptorProxy.vue';
+import { useStateStore } from 'src/stores/useStateStore';
+import { downloadFile } from 'src/composables/downloadFile';
+
+const { t } = useI18n();
+const quasar = useQuasar();
+const { notify } = useNotify();
+const user = useState().getUser();
+const stateStore = useStateStore();
+const updateDialog = ref();
+const uploadDialog = ref();
+let maxDays;
+let defaultDays;
+const dataKey = 'entryPreaccountingFilter';
+const url = 'Entries/preAccountingFilter';
+const arrayData = useArrayData(dataKey);
+const daysAgo = ref();
+const isBooked = ref();
+const dmsData = ref();
+const table = useTemplateRef('table');
+const companies = ref([]);
+const countries = ref([]);
+const entryTypes = ref([]);
+const supplierFiscalTypes = ref([]);
+const warehouses = ref([]);
+const defaultDmsDescription = ref();
+const dmsTypeId = ref();
+const selectedRows = ref([]);
+const totalAmount = ref();
+const totalSelectedAmount = computed(() => {
+    if (!selectedRows.value.length) return 0;
+    return selectedRows.value.reduce((acc, entry) => acc + entry.amount, 0);
+});
+let supplierRef;
+let dmsFk;
+const columns = computed(() => [
+    {
+        name: 'id',
+        label: t('entry.preAccount.id'),
+        isId: true,
+        chip: {
+            condition: () => true,
+        },
+    },
+    {
+        name: 'invoiceNumber',
+        label: t('entry.preAccount.invoiceNumber'),
+    },
+    {
+        name: 'company',
+        label: t('globals.company'),
+        columnFilter: {
+            component: 'select',
+            name: 'companyFk',
+            optionLabel: 'code',
+            options: companies.value,
+        },
+    },
+    {
+        name: 'warehouse',
+        label: t('globals.warehouse'),
+        columnFilter: {
+            component: 'select',
+            name: 'warehouseInFk',
+            options: warehouses.value,
+        },
+    },
+    {
+        name: 'gestDocFk',
+        label: t('entry.preAccount.gestDocFk'),
+    },
+    {
+        name: 'dmsType',
+        label: t('entry.preAccount.dmsType'),
+        columnFilter: {
+            component: 'select',
+            label: null,
+            name: 'dmsTypeFk',
+            url: 'DmsTypes',
+            fields: ['id', 'name'],
+        },
+    },
+    {
+        name: 'reference',
+        label: t('entry.preAccount.reference'),
+    },
+    {
+        name: 'shipped',
+        label: t('entry.preAccount.shipped'),
+        format: ({ shipped }, dashIfEmpty) => dashIfEmpty(toDate(shipped)),
+        columnFilter: {
+            component: 'date',
+            name: 'shipped',
+        },
+    },
+    {
+        name: 'landed',
+        label: t('entry.preAccount.landed'),
+        format: ({ landed }, dashIfEmpty) => dashIfEmpty(toDate(landed)),
+        columnFilter: {
+            component: 'date',
+            name: 'landed',
+        },
+    },
+    {
+        name: 'invoiceInFk',
+        label: t('entry.preAccount.invoiceInFk'),
+    },
+    {
+        name: 'supplier',
+        label: t('globals.supplier'),
+        format: (row) => row.supplier,
+        columnFilter: {
+            component: markRaw(VnSelectSupplier),
+            label: null,
+            name: 'supplierFk',
+            class: 'fit',
+        },
+    },
+    {
+        name: 'country',
+        label: t('globals.country'),
+        columnFilter: {
+            component: 'select',
+            name: 'countryFk',
+            options: countries.value,
+        },
+    },
+    {
+        name: 'description',
+        label: t('entry.preAccount.entryType'),
+        columnFilter: {
+            component: 'select',
+            label: null,
+            name: 'typeFk',
+            options: entryTypes.value,
+            optionLabel: 'description',
+            optionValue: 'code',
+        },
+    },
+    {
+        name: 'payDem',
+        label: t('entry.preAccount.payDem'),
+        columnFilter: {
+            component: 'number',
+            name: 'payDem',
+        },
+    },
+    {
+        name: 'fiscalCode',
+        label: t('entry.preAccount.fiscalCode'),
+        format: ({ fiscalCode }) => t(fiscalCode),
+        columnFilter: {
+            component: 'select',
+            name: 'fiscalCode',
+            options: supplierFiscalTypes.value,
+            optionLabel: 'locale',
+            optionValue: 'code',
+            sortBy: 'code',
+        },
+    },
+    {
+        name: 'amount',
+        label: t('globals.amount'),
+        format: ({ amount }) => toCurrency(amount),
+        columnFilter: {
+            component: 'number',
+            name: 'amount',
+        },
+    },
+    {
+        name: 'isAgricultural',
+        label: t('entry.preAccount.isAgricultural'),
+        component: 'checkbox',
+        isEditable: false,
+    },
+    {
+        name: 'isBooked',
+        label: t('entry.preAccount.isBooked'),
+        component: 'checkbox',
+    },
+    {
+        name: 'isReceived',
+        label: t('entry.preAccount.isReceived'),
+        component: 'checkbox',
+        isEditable: false,
+    },
+]);
+
+onBeforeMount(async () => {
+    const { data } = await axios.get('EntryConfigs/findOne', {
+        params: { filter: JSON.stringify({ fields: ['maxDays', 'defaultDays'] }) },
+    });
+    maxDays = data.maxDays;
+    defaultDays = data.defaultDays;
+    daysAgo.value = arrayData.store.userParams.daysAgo || defaultDays;
+    isBooked.value = arrayData.store.userParams.isBooked || false;
+    stateStore.leftDrawer = false;
+});
+
+watch(selectedRows, (nVal, oVal) => {
+    const lastRow = nVal.at(-1);
+    if (lastRow?.isBooked) selectedRows.value.pop();
+    if (nVal.length > oVal.length && lastRow.invoiceInFk)
+        quasar.dialog({
+            component: VnConfirm,
+            componentProps: { title: t('entry.preAccount.hasInvoice') },
+        });
+});
+
+function filterByDaysAgo(val) {
+    if (!val) val = defaultDays;
+    else if (val > maxDays) val = maxDays;
+    daysAgo.value = val;
+    arrayData.store.userParams.daysAgo = daysAgo.value;
+    table.value.reload();
+}
+
+async function preAccount() {
+    const entries = selectedRows.value;
+    const { companyFk, isAgricultural, landed } = entries.at(0);
+    try {
+        dmsFk = entries.find(({ gestDocFk }) => gestDocFk)?.gestDocFk;
+        if (isAgricultural) {
+            const year = new Date(landed).getFullYear();
+            supplierRef = (
+                await axios.get('InvoiceIns/getMaxRef', { params: { companyFk, year } })
+            ).data;
+            return createInvoice();
+        } else if (dmsFk) {
+            supplierRef = (
+                await axios.get(`Dms/${dmsFk}`, {
+                    params: { filter: JSON.stringify({ fields: ['reference'] }) },
+                })
+            ).data?.reference;
+            updateDialog.value.show();
+        } else {
+            uploadFile();
+        }
+    } catch (e) {
+        throw e;
+    }
+}
+
+async function updateFile() {
+    await axios.post(`Dms/${dmsFk}/updateFile`, { dmsTypeId: dmsTypeId.value });
+    await createInvoice();
+}
+
+async function uploadFile() {
+    const firstSelectedEntry = selectedRows.value.at(0);
+    const { supplier, companyFk, invoiceNumber } = firstSelectedEntry;
+    dmsData.value = {
+        dmsTypeFk: dmsTypeId.value,
+        warehouseFk: user.value.warehouseFk,
+        companyFk: companyFk,
+        description: supplier + defaultDmsDescription.value + invoiceNumber,
+        hasFile: false,
+    };
+    uploadDialog.value.show();
+}
+
+async function afterUploadFile({ reference }, res) {
+    supplierRef = reference;
+    dmsFk = res.data[0].id;
+    await createInvoice();
+}
+
+async function createInvoice() {
+    try {
+        await axios.post(`Entries/addInvoiceIn`, {
+            ids: selectedRows.value.map((entry) => entry.id),
+            supplierRef,
+            dmsFk,
+        });
+        notify(t('entry.preAccount.success'), 'positive');
+    } catch (e) {
+        throw e;
+    } finally {
+        supplierRef = null;
+        dmsFk = undefined;
+        selectedRows.value.length = 0;
+        table.value.reload();
+    }
+}
+</script>
+<template>
+    <FetchData
+        url="Countries"
+        :filter="{ fields: ['id', 'name'] }"
+        @on-fetch="(data) => (countries = data)"
+        auto-load
+    />
+    <FetchData
+        url="Companies"
+        :filter="{ fields: ['id', 'code'] }"
+        @on-fetch="(data) => (companies = data)"
+        auto-load
+    />
+    <FetchData
+        url="Warehouses"
+        :filter="{ fields: ['id', 'name'] }"
+        @on-fetch="(data) => (warehouses = data)"
+        auto-load
+    />
+    <FetchData
+        url="EntryTypes"
+        :filter="{ fields: ['code', 'description'] }"
+        @on-fetch="(data) => (entryTypes = data)"
+        auto-load
+    />
+    <FetchData
+        url="supplierFiscalTypes"
+        :filter="{ fields: ['code'] }"
+        @on-fetch="
+            (data) =>
+                (supplierFiscalTypes = data.map((x) => ({ locale: t(x.code), ...x })))
+        "
+        auto-load
+    />
+    <FetchData
+        url="InvoiceInConfigs/findOne"
+        :filter="{ fields: ['defaultDmsDescription'] }"
+        @on-fetch="(data) => (defaultDmsDescription = data?.defaultDmsDescription)"
+        auto-load
+    />
+    <FetchData
+        url="DmsTypes/findOne"
+        :filter="{ fields: ['id'] }"
+        :where="{ code: 'invoiceIn' }"
+        @on-fetch="(data) => (dmsTypeId = data?.id)"
+        auto-load
+    />
+    <VnSearchbar
+        :data-key
+        :url
+        :label="t('entry.preAccount.search')"
+        :info="t('entry.preAccount.searchInfo')"
+        :search-remove-params="false"
+    />
+    <VnTable
+        v-model:selected="selectedRows"
+        :data-key
+        :columns
+        :url
+        :search-url="dataKey"
+        ref="table"
+        :disable-option="{ card: true }"
+        redirect="Entry"
+        :order="['landed DESC']"
+        :right-search="false"
+        :user-params="{ daysAgo, isBooked }"
+        :row-click="false"
+        :table="{ selection: 'multiple' }"
+        :limit="0"
+        :footer="true"
+        @on-fetch="
+            (data) => (totalAmount = data?.reduce((acc, entry) => acc + entry.amount, 0))
+        "
+        auto-load
+    >
+        <template #top-left>
+            <QBtn
+                data-cy="preAccount_btn"
+                icon="account_balance"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows.length"
+                @click="preAccount"
+            >
+                <QTooltip>{{ t('entry.preAccount.btn') }}</QTooltip>
+            </QBtn>
+            <VnInputNumber
+                v-model="daysAgo"
+                :label="$t('globals.daysAgo')"
+                dense
+                :step="1"
+                :decimal-places="0"
+                @update:model-value="filterByDaysAgo"
+                debounce="500"
+                :title="t('entry.preAccount.daysAgo')"
+            />
+        </template>
+        <template #column-id="{ row }">
+            <span class="link" @click.stop>
+                {{ row.id }}
+                <EntryDescriptorProxy :id="row.id" />
+            </span>
+        </template>
+        <template #column-company="{ row }">
+            <QBadge :color="row.color ?? 'transparent'" :label="row.company" />
+        </template>
+        <template #column-gestDocFk="{ row }">
+            <span class="link" @click.stop="downloadFile(row.gestDocFk)">
+                {{ row.gestDocFk }}
+            </span>
+        </template>
+        <template #column-supplier="{ row }">
+            <span class="link" @click.stop>
+                {{ row.supplier }}
+                <SupplierDescriptorProxy :id="row.supplierFk" />
+            </span>
+        </template>
+        <template #column-invoiceInFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.invoiceInFk }}
+                <InvoiceInDescriptorProxy :id="row.invoiceInFk" />
+            </span>
+        </template>
+        <template #column-footer-amount>
+            <div v-text="toCurrency(totalSelectedAmount)" />
+            <div v-text="toCurrency(totalAmount)" />
+        </template>
+    </VnTable>
+    <VnConfirm
+        ref="updateDialog"
+        :title="t('entry.preAccount.dialog.title')"
+        :message="t('entry.preAccount.dialog.message')"
+    >
+        <template #actions>
+            <QBtn
+                data-cy="updateFileYes"
+                :label="t('globals.yes')"
+                color="primary"
+                @click="updateFile"
+                autofocus
+                v-close-popup
+            />
+            <QBtn
+                data-cy="updateFileNo"
+                :label="t('globals.no')"
+                color="primary"
+                flat
+                @click="uploadFile"
+                v-close-popup
+            />
+            <QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
+        </template>
+    </VnConfirm>
+    <QDialog ref="uploadDialog">
+        <VnDms
+            model="dms"
+            :form-initial-data="dmsData"
+            url="Dms/uploadFile"
+            @on-data-saved="afterUploadFile"
+        />
+    </QDialog>
+</template>
+<i18n>
+en:
+    IntraCommunity: Intra-community
+    NonCommunity: Non-community
+    CanaryIslands: Canary Islands
+es:
+    IntraCommunity: Intracomunitaria
+    NonCommunity: Extracomunitaria
+    CanaryIsland: Islas Canarias
+    National: Nacional
+</i18n>

src/pages/Entry/__tests__/EntryPreAccount.spec.js

@@ -0,0 +1,63 @@
+import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import EntryPreAccount from '../EntryPreAccount.vue';
+import axios from 'axios';
+
+describe('EntryPreAccount', () => {
+    let wrapper;
+    let vm;
+
+    beforeAll(() => {
+        vi.spyOn(axios, 'get').mockImplementation((url) => {
+            if (url == 'EntryConfigs/findOne')
+                return { data: { maxDays: 90, defaultDays: 30 } };
+            return { data: [] };
+        });
+        wrapper = createWrapper(EntryPreAccount);
+        vm = wrapper.vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('filterByDaysAgo()', () => {
+        it('should set daysAgo to defaultDays if no value is provided', () => {
+            vm.filterByDaysAgo();
+            expect(vm.daysAgo).toBe(vm.defaultDays);
+            expect(vm.arrayData.store.userParams.daysAgo).toBe(vm.defaultDays);
+        });
+
+        it('should set daysAgo to maxDays if the value exceeds maxDays', () => {
+            vm.filterByDaysAgo(500);
+            expect(vm.daysAgo).toBe(vm.maxDays);
+            expect(vm.arrayData.store.userParams.daysAgo).toBe(vm.maxDays);
+        });
+
+        it('should set daysAgo to the provided value if it is valid', () => {
+            vm.filterByDaysAgo(30);
+            expect(vm.daysAgo).toBe(30);
+            expect(vm.arrayData.store.userParams.daysAgo).toBe(30);
+        });
+    });
+
+    describe('Dialog behavior when adding a new row', () => {
+        it('should open the dialog if the new row has invoiceInFk', async () => {
+            const dialogSpy = vi.spyOn(vm.quasar, 'dialog');
+            const selectedRows = [{ id: 1, invoiceInFk: 123 }];
+            vm.selectedRows = selectedRows;
+            await vm.$nextTick();
+            expect(dialogSpy).toHaveBeenCalledWith({
+                component: vm.VnConfirm,
+                componentProps: { title: vm.t('entry.preAccount.hasInvoice') },
+            });
+        });
+
+        it('should not open the dialog if the new row does not have invoiceInFk', async () => {
+            const dialogSpy = vi.spyOn(vm.quasar, 'dialog');
+            vm.selectedRows = [{ id: 1, invoiceInFk: null }];
+            await vm.$nextTick();
+            expect(dialogSpy).not.toHaveBeenCalled();
+        });
+    });
+});

src/pages/Entry/locale/en.yml

@@ -118,6 +118,33 @@ entry:
     searchInfo: You can search by entry reference
     descriptorMenu:
         showEntryReport: Show entry report
+    preAccount:
+        gestDocFk: Gestdoc
+        dmsType: Gestdoc type
+        invoiceNumber: Entry ref.
+        reference: Gestdoc ref.
+        shipped: Shipped
+        landed: Landed
+        id: Entry
+        invoiceInFk: Invoice in
+        supplierFk: Supplier
+        country: Country
+        description: Entry type
+        payDem: Payment term
+        isBooked: B
+        isReceived: R
+        entryType: Entry type
+        isAgricultural: Agricultural
+        fiscalCode: Account type
+        daysAgo: Max 365 days
+        search: Search
+        searchInfo: You can search by supplier name or nickname
+        btn: Pre-account
+        hasInvoice: This entry has already an invoice in
+        success: It has been successfully pre-accounted
+        dialog:
+            title: Pre-account entries
+            message: Do you want the invoice to inherit the entry document?
 entryFilter:
     params:
         isExcludedFromAvailable: Excluded from available

src/pages/Entry/locale/es.yml

@@ -69,6 +69,33 @@ entry:
         observationType: Tipo de observación
     search: Buscar entradas
     searchInfo: Puedes buscar por referencia de entrada
+    preAccount:
+        gestDocFk: Gestdoc
+        dmsType: Tipo gestdoc
+        invoiceNumber: Ref. Entrada
+        reference: Ref. GestDoc
+        shipped: F. envío
+        landed: F. llegada
+        id: Entrada
+        invoiceInFk: Recibida
+        supplierFk: Proveedor
+        country: País
+        description: Tipo de Entrada
+        payDem: Plazo de pago
+        isBooked: C
+        isReceived: R
+        entryType: Tipo de entrada
+        isAgricultural: Agricultural
+        fiscalCode: Tipo de cuenta
+        daysAgo: Máximo 365 días
+        search: Buscar
+        searchInfo: Puedes buscar por nombre o alias de proveedor
+        btn: Precontabilizar
+        hasInvoice: Esta entrada ya tiene una f. recibida
+        success: Se ha precontabilizado correctamente
+        dialog:
+            title: Precontabilizar entradas
+            message: ¿Desea que la factura herede el documento de la entrada?
     params:
         entryFk: Entrada
         observationTypeFk: Tipo de observación

src/pages/Item/Card/ItemTags.vue

@@ -89,7 +89,6 @@ const insertTag = (rows) => {
                 :default-remove="false"
                 :user-filter="{
                     fields: ['id', 'itemFk', 'tagFk', 'value', 'priority'],
-                    where: { itemFk: route.params.id },
                     include: {
                         relation: 'tag',
                         scope: {
@@ -97,6 +96,7 @@ const insertTag = (rows) => {
                         },
                     },
                 }"
+                :filter="{ where: { itemFk: route.params.id } }"
                 order="priority"
                 auto-load
                 @on-fetch="onItemTagsFetched"

src/pages/Item/composables/cloneItem.js

@@ -11,26 +11,19 @@ export function cloneItem() {
     const router = useRouter();
     const cloneItem = async (entityId) => {
         const { id } = entityId;
-        try {
-            const { data } = await axios.post(`Items/${id ?? entityId}/clone`);
-            router.push({ name: 'ItemTags', params: { id: data.id } });
-        } catch (err) {
-            console.error('Error cloning item');
-        }
+        const { data } = await axios.post(`Items/${id ?? entityId}/clone`);
+        router.push({ name: 'ItemTags', params: { id: data.id } });
     };
 
     const openCloneDialog = async (entityId) => {
-        quasar
-            .dialog({
-                component: VnConfirm,
-                componentProps: {
-                    title: t('item.descriptor.clone.title'),
-                    message: t('item.descriptor.clone.subTitle'),
-                },
-            })
-            .onOk(async () => {
-                await cloneItem(entityId);
-            });
+        quasar.dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('item.descriptor.clone.title'),
+                message: t('item.descriptor.clone.subTitle'),
+                promise: () => cloneItem(entityId),
+            },
+        });
     };
     return { openCloneDialog };
 }

src/pages/Supplier/Card/SupplierFiscalData.vue

@@ -11,10 +11,10 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import VnAccountNumber from 'src/components/common/VnAccountNumber.vue';
 import VnCheckbox from 'src/components/common/VnCheckbox.vue';
-
+import { useArrayData } from 'src/composables/useArrayData';
 const route = useRoute();
 const { t } = useI18n();
-
+const arrayData = useArrayData('Supplier');
 const sageTaxTypesOptions = ref([]);
 const sageWithholdingsOptions = ref([]);
 const sageTransactionTypesOptions = ref([]);
@@ -89,6 +89,7 @@ function handleLocation(data, location) {
         }"
         auto-load
         :clear-store-on-unmount="false"
+        @on-data-saved="arrayData.fetch({})"
     >
         <template #form="{ data, validate }">
             <VnRow>

src/pages/Ticket/Negative/TicketLackDetail.vue

@@ -33,7 +33,7 @@ onUnmounted(() => {
     stateStore.rightDrawer = true;
 });
 
-const entityId = computed(() => route.params.id);
+const entityId = computed(() => route.params.itemFk);
 const item = ref({});
 
 const itemProposalSelected = ref(null);

src/pages/Ticket/Negative/TicketLackList.vue

@@ -7,7 +7,6 @@ import { onBeforeMount } from 'vue';
 import { dashIfEmpty, toDate, toHour } from 'src/filters';
 import { useRouter } from 'vue-router';
 import { useState } from 'src/composables/useState';
-import { useRole } from 'src/composables/useRole';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketLackFilter from './TicketLackFilter.vue';
@@ -25,10 +24,11 @@ const negativeParams = reactive({
     availabled: Date.getCurrentDateTimeFormatted(),
 });
 const redirectToCreateView = ({ itemFk }) => {
-    router.push({
+    const route = {
         name: 'NegativeDetail',
-        params: { id: itemFk },
-    });
+        params: { itemFk },
+    };
+    router.push(route);
 };
 const columns = computed(() => [
     {

src/pages/Ticket/Negative/TicketLackTable.vue

@@ -38,7 +38,7 @@ const filterLack = ref({
 const selectedRows = ref([]);
 const { t } = useI18n();
 const { notify } = useNotify();
-const entityId = computed(() => route.params.id);
+const entityId = computed(() => route.params.itemFk);
 const item = ref({});
 const route = useRoute();
 const columns = computed(() => [

src/pages/Ticket/TicketFilter.vue

@@ -42,11 +42,7 @@ const groupedStates = ref([]);
         auto-load
     />
     <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :search-button="true"
-        :unremovableParams="['from', 'to']"
-    >
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -188,16 +184,6 @@ const groupedStates = ref([]);
                     />
                 </QItemSection>
             </QItem>
-            <QItem>
-                <QItemSection>
-                    <QCheckbox
-                        v-model="params.problems"
-                        @update:model-value="searchFn()"
-                        :label="t('With problems')"
-                        toggle-indeterminate
-                    />
-                </QItemSection>
-            </QItem>
             <QItem>
                 <QItemSection v-if="!provinces">
                     <QSkeleton type="QInput" class="full-width" />

src/pages/Ticket/TicketList.vue

@@ -128,6 +128,7 @@ const columns = computed(() => [
         columnFilter: false,
         label: t('ticketList.hour'),
         format: (row) => toTimeFormat(row.shipped),
+        orderBy: false,
     },
     {
         align: 'left',
@@ -136,6 +137,7 @@ const columns = computed(() => [
         columnFilter: false,
         label: t('ticketList.closure'),
         format: (row, dashIfEmpty) => dashIfEmpty(toTimeFormat(row.zoneLanding)),
+        orderBy: false,
     },
     {
         align: 'left',
@@ -477,7 +479,7 @@ function setReference(data) {
         prefix="card"
         :array-data-props="{
             url: 'Tickets/filter',
-            order: ['shipped DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id'],
+            order: ['shipped DESC', 'id DESC'],
             exprBuilder,
         }"
     >

src/router/modules/entry.js

@@ -85,6 +85,7 @@ export default {
             'EntryLatestBuys',
             'EntryStockBought',
             'EntryWasteRecalc',
+            'EntryPreAccount',
         ],
     },
     component: RouterView,
@@ -94,6 +95,7 @@ export default {
             name: 'EntryMain',
             path: '',
             component: () => import('src/components/common/VnModule.vue'),
+            props: (route) => ({ leftDrawer: route.name !== 'EntryPreAccount' }),
             redirect: { name: 'EntryIndexMain' },
             children: [
                 {
@@ -150,6 +152,15 @@ export default {
                     },
                     component: () => import('src/pages/Entry/EntryWasteRecalc.vue'),
                 },
+                {
+                    path: 'pre-account',
+                    name: 'EntryPreAccount',
+                    meta: {
+                        title: 'entryPreAccount',
+                        icon: 'account_balance',
+                    },
+                    component: () => import('src/pages/Entry/EntryPreAccount.vue'),
+                },
             ],
         },
     ],

src/router/modules/ticket.js

@@ -251,7 +251,7 @@ export default {
                         },
                         {
                             name: 'NegativeDetail',
-                            path: ':id',
+                            path: ':itemFk',
                             meta: {
                                 title: 'summary',
                                 icon: 'launch',

test/cypress/integration/entry/entryCard/entryDescriptor.spec.js

@@ -1,5 +1,5 @@
 import '../commands.js';
-describe('EntryDescriptor', () => {
+describe.skip('EntryDescriptor', () => {
     beforeEach(() => {
         cy.login('buyer');
         cy.visit(`/#/entry/list`);

test/cypress/integration/entry/entryPreAccount.spec.js

@@ -0,0 +1,48 @@
+/// <reference types="cypress" />
+describe('Entry PreAccount Functionality', () => {
+    beforeEach(() => {
+        cy.login('administrative');
+        cy.visit('/#/entry/pre-account');
+    });
+
+    it("should pre-account without questions if it's agricultural", () => {
+        selectRowsByCol('id', [2]);
+        cy.dataCy('preAccount_btn').click();
+        cy.checkNotification('It has been successfully pre-accounted');
+    });
+
+    it("should ask to upload a doc. if it's not agricultural and doesn't have doc. ", () => {
+        selectRowsByCol('id', [3]);
+        cy.dataCy('preAccount_btn').click();
+        cy.dataCy('Reference_input').type('{selectall}234343fh', { delay: 0 });
+        cy.dataCy('VnDms_inputFile').selectFile('test/cypress/fixtures/image.jpg', {
+            force: true,
+        });
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('It has been successfully pre-accounted');
+    });
+
+    it('should ask to inherit the doc. and open VnDms popup if user choose "no"', () => {
+        selectRowsByCol('id', [101]);
+        cy.dataCy('preAccount_btn').click();
+        cy.dataCy('updateFileNo').click();
+        cy.get('#formModel').should('be.visible');
+    });
+
+    it('should ask to inherit the doc. and open VnDms popup if user choose "yes" and pre-account', () => {
+        selectRowsByCol('id', [101]);
+        cy.dataCy('preAccount_btn').click();
+        cy.dataCy('updateFileYes').click();
+        cy.checkNotification('It has been successfully pre-accounted');
+    });
+});
+
+function selectRowsByCol(col = 'id', vals = []) {
+    for (const val of vals) {
+        const regex = new RegExp(`^\\s*(${val})\\s*$`);
+        cy.contains(`[data-col-field="${col}"]`, regex)
+            .parent()
+            .find('td > .q-checkbox')
+            .click();
+    }
+}

test/cypress/integration/invoiceOut/invoiceOutList.spec.js

@@ -28,7 +28,7 @@ describe('InvoiceOut list', () => {
         cy.dataCy('InvoiceOutDownloadPdfBtn').click();
     });
 
-    it.skip('should open the invoice descriptor from table icon', () => {
+    it('should open the invoice descriptor from table icon', () => {
         cy.get(firstSummaryIcon).click();
         cy.get('.cardSummary').should('be.visible');
         cy.get('.summaryHeader > div').should('include.text', 'V10100001');

test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js

@@ -15,7 +15,7 @@ describe('InvoiceOut summary', () => {
         cy.login('developer');
         cy.visit(`/#/invoice-out/1/summary`);
     });
-    it.skip('open the descriptors', () => {
+    it('open the descriptors', () => {
         cy.get(firstRowDescriptors(1)).click();
         cy.get('.descriptor').should('be.visible');
         cy.get('.q-item > .q-item__label').should('include.text', '1');
@@ -30,7 +30,7 @@ describe('InvoiceOut summary', () => {
         cy.get('.q-item > .q-item__label').should('include.text', '1101');
     });
 
-    it.skip('should open the ticket list', () => {
+    it('should open the ticket list', () => {
         cy.get(toTicketList).click();
         cy.get('[data-col-field="stateFk"]').each(($el) => {
             cy.wrap($el).contains('T1111111');

test/cypress/integration/item/itemTax.spec.js

@@ -6,7 +6,7 @@ describe('Item tax', () => {
     });
 
     it('should modify the tax for Spain', () => {
-        cy.dataCy('Class_select').eq(1).type('General VAT{enter}');
+        cy.dataCy('Class_select').eq(1).type('IVA General{enter}');
         cy.dataCy('crudModelDefaultSaveBtn').click();
         cy.checkNotification('Data saved');
     });

test/cypress/integration/ticket/ticketSale.spec.js

@@ -2,7 +2,7 @@
 const firstRow = 'tbody > :nth-child(1)';
 
 describe('TicketSale', () => {
-    describe.skip('Ticket  #23', () => {
+    describe('Ticket  #23', () => {
         beforeEach(() => {
             cy.login('claimManager');
             cy.viewport(1920, 1080);