diff --git a/cypress.config.js b/cypress.config.js
index d9cdbe728..7458c0b05 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -44,6 +44,7 @@ export default defineConfig({
         supportFile: 'test/cypress/support/index.js',
         videosFolder: 'test/cypress/videos',
         downloadsFolder: 'test/cypress/downloads',
+        tmpUploadFolder: 'test/cypress/storage/tmp/dms',
         video: false,
         specPattern: 'test/cypress/integration/**/*.spec.js',
         experimentalRunAllSpecs: true,
diff --git a/src/boot/__tests__/axios.spec.js b/src/boot/__tests__/axios.spec.js
index 85d578517..45a3cc7f0 100644
--- a/src/boot/__tests__/axios.spec.js
+++ b/src/boot/__tests__/axios.spec.js
@@ -67,7 +67,7 @@ describe('Axios boot', () => {
             };
 
             const result = onResponseError(error);
-            expect(result).rejects.toEqual(expect.objectContaining(error));
+            await expect(result).rejects.toEqual(expect.objectContaining(error));
         });
 
         it('should call to the Notify plugin with a message from the response property', async () => {
@@ -83,7 +83,7 @@ describe('Axios boot', () => {
             };
 
             const result = onResponseError(error);
-            expect(result).rejects.toEqual(expect.objectContaining(error));
+            await expect(result).rejects.toEqual(expect.objectContaining(error));
         });
     });
 });
diff --git a/src/boot/vnDate.js b/src/boot/vnDate.js
index 33d5ac27f..8f18e2400 100644
--- a/src/boot/vnDate.js
+++ b/src/boot/vnDate.js
@@ -1,4 +1,6 @@
 import { boot } from 'quasar/wrappers';
+import { date as quasarDate } from 'quasar';
+const { formatDate } = quasarDate;
 
 export default boot(() => {
     Date.vnUTC = () => {
@@ -25,4 +27,34 @@ export default boot(() => {
         const date = new Date(Date.vnUTC());
         return new Date(date.getFullYear(), date.getMonth() + 1, 0);
     };
+
+    Date.getCurrentDateTimeFormatted = (
+        options = {
+            startOfDay: false,
+            endOfDay: true,
+            iso: true,
+            mask: 'DD-MM-YYYY HH:mm',
+        },
+    ) => {
+        const date = Date.vnUTC();
+        if (options.startOfDay) {
+            date.setHours(0, 0, 0);
+        }
+        if (options.endOfDay) {
+            date.setHours(23, 59, 0);
+        }
+        if (options.iso) {
+            return date.toISOString();
+        }
+        return formatDate(date, options.mask);
+    };
+
+    Date.convertToISODateTime = (dateTimeStr) => {
+        const [datePart, timePart] = dateTimeStr.split(' ');
+        const [day, month, year] = datePart.split('-');
+        const [hours, minutes] = timePart.split(':');
+
+        const isoDate = new Date(year, month - 1, day, hours, minutes);
+        return isoDate.toISOString();
+    };
 });
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index a57e2c01c..f6a606547 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -20,7 +20,6 @@ const postcodeFormData = reactive({
     provinceFk: null,
     townFk: null,
 });
-const townFilter = ref({});
 
 const countriesRef = ref(false);
 const provincesOptions = ref([]);
@@ -33,11 +32,11 @@ function onDataSaved(formData) {
     newPostcode.town = town.value.name;
     newPostcode.townFk = town.value.id;
     const provinceObject = provincesOptions.value.find(
-        ({ id }) => id === formData.provinceFk
+        ({ id }) => id === formData.provinceFk,
     );
     newPostcode.province = provinceObject?.name;
     const countryObject = countriesRef.value.opts.find(
-        ({ id }) => id === formData.countryFk
+        ({ id }) => id === formData.countryFk,
     );
     newPostcode.country = countryObject?.name;
     emit('onDataSaved', newPostcode);
@@ -67,21 +66,11 @@ function setTown(newTown, data) {
 }
 async function onCityCreated(newTown, formData) {
     newTown.province = provincesOptions.value.find(
-        (province) => province.id === newTown.provinceFk
+        (province) => province.id === newTown.provinceFk,
     );
     formData.townFk = newTown;
     setTown(newTown, formData);
 }
-
-async function filterTowns(name) {
-    if (name !== '') {
-        townFilter.value.where = {
-            name: {
-                like: `%${name}%`,
-            },
-        };
-    }
-}
 </script>
 
 <template>
@@ -107,7 +96,6 @@ async function filterTowns(name) {
                 <VnSelectDialog
                     :label="t('City')"
                     @update:model-value="(value) => setTown(value, data)"
-                    @filter="filterTowns"
                     :tooltip="t('Create city')"
                     v-model="data.townFk"
                     url="Towns/location"
diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 243c37c06..6b6d95033 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -65,7 +65,7 @@ const $props = defineProps({
         default: null,
     },
     beforeSaveFn: {
-        type: Function,
+        type: [String, Function],
         default: null,
     },
     goTo: {
@@ -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" />
diff --git a/src/components/EditPictureForm.vue b/src/components/EditPictureForm.vue
index 1f158e785..29377b559 100644
--- a/src/components/EditPictureForm.vue
+++ b/src/components/EditPictureForm.vue
@@ -140,7 +140,7 @@ const updatePhotoPreview = (value) => {
             img.onerror = () => {
                 notify(
                     t("This photo provider doesn't allow remote downloads"),
-                    'negative'
+                    'negative',
                 );
             };
         }
@@ -219,11 +219,7 @@ const makeRequest = async () => {
                         color="primary"
                         class="cursor-pointer"
                         @click="rotateLeft()"
-                    >
-                        <!-- <QTooltip class="no-pointer-events">
-                            {{ t('Rotate left') }}
-                        </QTooltip> -->
-                    </QIcon>
+                    />
                     <div>
                         <div ref="photoContainerRef" />
                     </div>
@@ -233,11 +229,7 @@ const makeRequest = async () => {
                         color="primary"
                         class="cursor-pointer"
                         @click="rotateRight()"
-                    >
-                        <!-- <QTooltip class="no-pointer-events">
-                            {{ t('Rotate right') }}
-                        </QTooltip> -->
-                    </QIcon>
+                    />
                 </div>
 
                 <div class="column">
@@ -265,7 +257,6 @@ const makeRequest = async () => {
                                     class="cursor-pointer q-mr-sm"
                                     @click="openInputFile()"
                                 >
-                                    <!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
                                 </QIcon>
                                 <QIcon name="info" class="cursor-pointer">
                                     <QTooltip>{{
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index af32426dc..9f1b61c3e 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -22,7 +22,6 @@ const { validate, validations } = useValidator();
 const { notify } = useNotify();
 const route = useRoute();
 const myForm = ref(null);
-const attrs = useAttrs();
 const $props = defineProps({
     url: {
         type: String,
@@ -99,8 +98,12 @@ const $props = defineProps({
         type: Function,
         default: () => {},
     },
+    preventSubmit: {
+        type: Boolean,
+        default: true,
+    },
 });
-const emit = defineEmits(['onFetch', 'onDataSaved']);
+const emit = defineEmits(['onFetch', 'onDataSaved', 'submit']);
 const modelValue = computed(
     () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
 ).value;
@@ -301,7 +304,7 @@ function onBeforeSave(formData, originalData) {
     );
 }
 async function onKeyup(evt) {
-    if (evt.key === 'Enter' && !('prevent-submit' in attrs)) {
+    if (evt.key === 'Enter' && !$props.preventSubmit) {
         const input = evt.target;
         if (input.type == 'textarea' && evt.shiftKey) {
             let { selectionStart, selectionEnd } = input;
@@ -330,6 +333,7 @@ defineExpose({
 <template>
     <div class="column items-center full-width">
         <QForm
+            v-on="$attrs"
             ref="myForm"
             v-if="formData"
             @submit.prevent="save"
diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 8e83bf579..4d44501c0 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -181,7 +181,7 @@ const searchModule = () => {
 <template>
     <QList padding class="column-max-width">
         <template v-if="$props.source === 'main'">
-            <template v-if="$route?.matched[1]?.name === 'Dashboard'">
+            <template v-if="route?.matched[1]?.name === 'Dashboard'">
                 <QItem class="q-pb-md">
                     <VnInput
                         v-model="search"
@@ -262,7 +262,7 @@ const searchModule = () => {
             </template>
 
             <template v-for="item in items" :key="item.name">
-                <template v-if="item.name === $route?.matched[1]?.name">
+                <template v-if="item.name === route?.matched[1]?.name">
                     <QItem class="header">
                         <QItemSection avatar v-if="item.icon">
                             <QIcon :name="item.icon" />
diff --git a/src/components/VnTable/VnOrder.vue b/src/components/VnTable/VnOrder.vue
index fe071a57f..7a9e1e634 100644
--- a/src/components/VnTable/VnOrder.vue
+++ b/src/components/VnTable/VnOrder.vue
@@ -16,7 +16,7 @@ const $props = defineProps({
         required: true,
     },
     searchUrl: {
-        type: String,
+        type: [String, Boolean],
         default: 'table',
     },
     vertical: {
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 2f3bbd2bd..7e9ab85cb 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -66,7 +66,7 @@ const $props = defineProps({
         default: null,
     },
     create: {
-        type: Object,
+        type: [Boolean, Object],
         default: null,
     },
     createAsDialog: {
diff --git a/src/components/VnTable/VnTableFilter.vue b/src/components/VnTable/VnTableFilter.vue
index 109e2b77e..a7b2108ed 100644
--- a/src/components/VnTable/VnTableFilter.vue
+++ b/src/components/VnTable/VnTableFilter.vue
@@ -30,6 +30,7 @@ function columnName(col) {
         v-bind="$attrs"
         :search-button="true"
         :disable-submit-event="true"
+        :data-key="$attrs['data-key']"
         :search-url
     >
         <template #body="{ params, orders, searchFn }">
diff --git a/src/components/VnTable/VnVisibleColumn.vue b/src/components/VnTable/VnVisibleColumn.vue
index 6d15c585e..7d7c0dd29 100644
--- a/src/components/VnTable/VnVisibleColumn.vue
+++ b/src/components/VnTable/VnVisibleColumn.vue
@@ -58,7 +58,7 @@ async function getConfig(url, filter) {
     const response = await axios.get(url, {
         params: { filter: filter },
     });
-    return response.data && response.data.length > 0 ? response.data[0] : null;
+    return response?.data && response?.data?.length > 0 ? response.data[0] : null;
 }
 
 async function fetchViewConfigData() {
diff --git a/src/components/VnTable/__tests__/VnTable.spec.js b/src/components/VnTable/__tests__/VnTable.spec.js
index e5e38a63c..a297ac3dc 100644
--- a/src/components/VnTable/__tests__/VnTable.spec.js
+++ b/src/components/VnTable/__tests__/VnTable.spec.js
@@ -11,6 +11,9 @@ describe('VnTable', () => {
             propsData: {
                 columns: [],
             },
+            attrs: {
+                'data-key': 'test',
+            },
         });
         vm = wrapper.vm;
 
diff --git a/src/components/__tests__/CrudModel.spec.js b/src/components/__tests__/CrudModel.spec.js
index c620d29ad..475f56aec 100644
--- a/src/components/__tests__/CrudModel.spec.js
+++ b/src/components/__tests__/CrudModel.spec.js
@@ -11,13 +11,7 @@ describe('CrudModel', () => {
     beforeAll(() => {
         wrapper = createWrapper(CrudModel, {
             global: {
-                stubs: [
-                    'vnPaginate',
-                    'useState',
-                    'arrayData',
-                    'useStateStore',
-                    'vue-i18n',
-                ],
+                stubs: ['vnPaginate', 'vue-i18n'],
                 mocks: {
                     validate: vi.fn(),
                 },
@@ -29,7 +23,7 @@ describe('CrudModel', () => {
                 dataKey: 'crudModelKey',
                 model: 'crudModel',
                 url: 'crudModelUrl',
-                saveFn: '',
+                saveFn: vi.fn(),
             },
         });
         wrapper = wrapper.wrapper;
@@ -231,7 +225,7 @@ describe('CrudModel', () => {
             expect(vm.isLoading).toBe(false);
             expect(vm.hasChanges).toBe(false);
 
-            await wrapper.setProps({ saveFn: '' });
+            await wrapper.setProps({ saveFn: null });
         });
 
         it("should use default url if there's not saveFn", async () => {
diff --git a/src/components/__tests__/Leftmenu.spec.js b/src/components/__tests__/Leftmenu.spec.js
index 22b2b5fb7..5bddc104c 100644
--- a/src/components/__tests__/Leftmenu.spec.js
+++ b/src/components/__tests__/Leftmenu.spec.js
@@ -170,7 +170,7 @@ describe('LeftMenu as card', () => {
         vm = mount('card').vm;
     });
 
-    it('should get routes for card source', async () => {
+    it('should get routes for card source', () => {
         vm.getRoutes();
     });
 });
@@ -251,7 +251,6 @@ describe('LeftMenu as main', () => {
     });
 
     it('should get routes for main source', () => {
-        vm.props.source = 'main';
         vm.getRoutes();
         expect(navigation.getModules).toHaveBeenCalled();
     });
diff --git a/src/components/common/VnAccountNumber.vue b/src/components/common/VnAccountNumber.vue
index 8bff3e261..5bce49459 100644
--- a/src/components/common/VnAccountNumber.vue
+++ b/src/components/common/VnAccountNumber.vue
@@ -8,7 +8,8 @@ const model = defineModel({ prop: 'modelValue' });
     <VnInput
         v-model="model"
         ref="inputRef"
-        @keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
+        @keydown.tab="$refs.inputRef.vnInputRef.blur()"
+        @blur="model = useAccountShortToStandard(model) ?? model"
         @input="model = $event.target.value.replace(/[^\d.]/g, '')"
     />
 </template>
diff --git a/src/components/common/VnDate.vue b/src/components/common/VnDate.vue
index 761ac995e..522078df4 100644
--- a/src/components/common/VnDate.vue
+++ b/src/components/common/VnDate.vue
@@ -1,5 +1,5 @@
 <script setup>
-const model = defineModel({ type: [String, Number], required: true });
+const model = defineModel({ type: [String, Number], default: '' });
 </script>
 <template>
     <QDate v-model="model" :today-btn="true" :options="$attrs.options" />
diff --git a/src/components/common/VnDms.vue b/src/components/common/VnDms.vue
index de22e4857..128cee069 100644
--- a/src/components/common/VnDms.vue
+++ b/src/components/common/VnDms.vue
@@ -4,6 +4,7 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 
+import useNotify from 'src/composables/useNotify.js';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
@@ -12,6 +13,7 @@ import FormModelPopup from 'components/FormModelPopup.vue';
 
 const route = useRoute();
 const { t } = useI18n();
+const { notify } = useNotify();
 const emit = defineEmits(['onDataSaved']);
 
 const $props = defineProps({
@@ -61,8 +63,11 @@ function onFileChange(files) {
 
 function mapperDms(data) {
     const formData = new FormData();
-    const { files } = data;
-    if (files) formData.append(files?.name, files);
+    let files = data.files;
+    if (files) {
+        files = Array.isArray(files) ? files : [files];
+        files.forEach((file) => formData.append(file?.name, file));
+    }
 
     const dms = {
         hasFile: !!data.hasFile,
@@ -83,11 +88,16 @@ function getUrl() {
 }
 
 async function save() {
-    const body = mapperDms(dms.value);
-    const response = await axios.post(getUrl(), body[0], body[1]);
-    emit('onDataSaved', body[1].params, response);
-    delete dms.value.files;
-    return response;
+    try {
+        const body = mapperDms(dms.value);
+        const response = await axios.post(getUrl(), body[0], body[1]);
+        emit('onDataSaved', body[1].params, response);
+        notify(t('globals.dataSaved'), 'positive');
+        delete dms.value.files;
+        return response;
+    } catch (e) {
+        throw e;
+    }
 }
 
 function defaultData() {
@@ -208,7 +218,7 @@ function addDefaultData(data) {
 }
 </style>
 <i18n>
-en:
+en:    
     contentTypesInfo: Allowed file types {allowedContentTypes}
     EntryDmsDescription: Reference {reference}
     WorkersDescription: Working of employee id {reference}
diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index aafa9f4ba..345870aa4 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -13,10 +13,12 @@ import VnDms from 'src/components/common/VnDms.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import { useSession } from 'src/composables/useSession';
+import useNotify from 'src/composables/useNotify.js';
 
 const route = useRoute();
 const quasar = useQuasar();
 const { t } = useI18n();
+const { notify } = useNotify();
 const rows = ref([]);
 const dmsRef = ref();
 const formDialog = ref({});
@@ -88,7 +90,6 @@ const dmsFilter = {
             ],
         },
     },
-    where: { [$props.filter]: route.params.id },
 };
 
 const columns = computed(() => [
@@ -258,9 +259,16 @@ function deleteDms(dmsFk) {
             },
         })
         .onOk(async () => {
-            await axios.post(`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`);
-            const index = rows.value.findIndex((row) => row.id == dmsFk);
-            rows.value.splice(index, 1);
+            try {
+                await axios.post(
+                    `${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`,
+                );
+                const index = rows.value.findIndex((row) => row.id == dmsFk);
+                rows.value.splice(index, 1);
+                notify(t('globals.dataDeleted'), 'positive');
+            } catch (e) {
+                throw e;
+            }
         });
 }
 
@@ -298,7 +306,9 @@ defineExpose({
         :data-key="$props.model"
         :url="$props.model"
         :user-filter="dmsFilter"
+        search-url="dmsFilter"
         :order="['dmsFk DESC']"
+        :filter="{ where: { [$props.filter]: route.params.id } }"
         auto-load
         @on-fetch="setData"
     >
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 343130f1d..0507fddfb 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -1,6 +1,6 @@
 <script setup>
-import { onMounted, watch, computed, ref, useAttrs } from 'vue';
-import { date } from 'quasar';
+import { nextTick, watch, computed, ref, useAttrs } from 'vue';
+import { date, getCssVar } from 'quasar';
 import VnDate from './VnDate.vue';
 import { useRequired } from 'src/composables/useRequired';
 
@@ -20,61 +20,18 @@ const $props = defineProps({
 });
 
 const vnInputDateRef = ref(null);
+const errColor = getCssVar('negative');
+const textColor = ref('');
 
 const dateFormat = 'DD/MM/YYYY';
 const isPopupOpen = ref();
 const hover = ref();
-const mask = ref();
 
 const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 
-const formattedDate = computed({
-    get() {
-        if (!model.value) return model.value;
-        return date.formatDate(new Date(model.value), dateFormat);
-    },
-    set(value) {
-        if (value == model.value) return;
-        let newDate;
-        if (value) {
-            // parse input
-            if (value.includes('/') && value.length >= 10) {
-                if (value.at(2) == '/') value = value.split('/').reverse().join('/');
-                value = date.formatDate(
-                    new Date(value).toISOString(),
-                    'YYYY-MM-DDTHH:mm:ss.SSSZ',
-                );
-            }
-            const [year, month, day] = value.split('-').map((e) => parseInt(e));
-            newDate = new Date(year, month - 1, day);
-            if (model.value) {
-                const orgDate =
-                    model.value instanceof Date ? model.value : new Date(model.value);
-
-                newDate.setHours(
-                    orgDate.getHours(),
-                    orgDate.getMinutes(),
-                    orgDate.getSeconds(),
-                    orgDate.getMilliseconds(),
-                );
-            }
-        }
-        if (!isNaN(newDate)) model.value = newDate.toISOString();
-    },
-});
-
 const popupDate = computed(() =>
     model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value,
 );
-onMounted(() => {
-    // fix quasar bug
-    mask.value = '##/##/####';
-});
-watch(
-    () => model.value,
-    (val) => (formattedDate.value = val),
-    { immediate: true },
-);
 
 const styleAttrs = computed(() => {
     return $props.isOutlined
@@ -86,28 +43,138 @@ const styleAttrs = computed(() => {
         : {};
 });
 
+const inputValue = ref('');
+
+const validateAndCleanInput = (value) => {
+    inputValue.value = value.replace(/[^0-9./-]/g, '');
+};
+
 const manageDate = (date) => {
-    formattedDate.value = date;
+    inputValue.value = date.split('/').reverse().join('/');
     isPopupOpen.value = false;
 };
+
+watch(
+    () => model.value,
+    (nVal) => {
+        if (nVal) inputValue.value = date.formatDate(new Date(model.value), dateFormat);
+        else inputValue.value = '';
+    },
+    { immediate: true },
+);
+
+const formatDate = () => {
+    let value = inputValue.value;
+    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)) {
+        textColor.value = errColor;
+        return;
+    }
+
+    value = value.replace(/[.-]/g, '/');
+    const parts = value.split('/');
+    if (parts.length < 2) {
+        textColor.value = errColor;
+        return;
+    }
+
+    let [day, month, year] = parts;
+    if (day.length === 1) day = '0' + day;
+    if (month.length === 1) month = '0' + month;
+
+    const currentYear = Date.vnNew().getFullYear();
+    if (!year) year = currentYear;
+    const millennium = currentYear.toString().slice(0, 1);
+
+    switch (year.length) {
+        case 1:
+            year = `${millennium}00${year}`;
+            break;
+        case 2:
+            year = `${millennium}0${year}`;
+            break;
+        case 3:
+            year = `${millennium}${year}`;
+            break;
+        case 4:
+            break;
+    }
+
+    let isoCandidate = `${year}/${month}/${day}`;
+    isoCandidate = date.formatDate(
+        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 =
+        parsedDate instanceof Date &&
+        !isNaN(parsedDate) &&
+        parsedDate.getFullYear() === parseInt(year) &&
+        parsedDate.getMonth() === parseInt(month) - 1 &&
+        parsedDate.getDate() === parseInt(day);
+
+    if (!isValidDate) {
+        textColor.value = errColor;
+        return;
+    }
+
+    if (model.value) {
+        const original =
+            model.value instanceof Date ? model.value : new Date(model.value);
+        parsedDate.setHours(
+            original.getHours(),
+            original.getMinutes(),
+            original.getSeconds(),
+            original.getMilliseconds(),
+        );
+    }
+
+    model.value = parsedDate.toISOString();
+
+    textColor.value = '';
+};
+
+const handleEnter = (event) => {
+    formatDate();
+
+    nextTick(() => {
+        const newEvent = new KeyboardEvent('keydown', {
+            key: 'Enter',
+            code: 'Enter',
+            bubbles: true,
+            cancelable: true,
+        });
+        vnInputDateRef.value?.$el?.dispatchEvent(newEvent);
+    });
+};
 </script>
 
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
             ref="vnInputDateRef"
-            v-model="formattedDate"
+            v-model="inputValue"
             class="vn-input-date"
-            :mask="mask"
             placeholder="dd/mm/aaaa"
             v-bind="{ ...$attrs, ...styleAttrs }"
             :class="{ required: isRequired }"
             :rules="mixinRules"
             :clearable="false"
+            :input-style="{ color: textColor }"
             @click="isPopupOpen = !isPopupOpen"
             @keydown="isPopupOpen = false"
+            @blur="formatDate"
+            @keydown.enter.prevent="handleEnter"
             hide-bottom-space
             :data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
+            @update:model-value="validateAndCleanInput"
         >
             <template #append>
                 <QIcon
@@ -116,11 +183,12 @@ const manageDate = (date) => {
                     v-if="
                         ($attrs.clearable == undefined || $attrs.clearable) &&
                         hover &&
-                        model &&
+                        inputValue &&
                         !$attrs.disable
                     "
                     @click="
                         vnInputDateRef.focus();
+                        inputValue = null;
                         model = null;
                         isPopupOpen = false;
                     "
diff --git a/src/components/common/VnInputDateTime.vue b/src/components/common/VnInputDateTime.vue
new file mode 100644
index 000000000..67d1793b1
--- /dev/null
+++ b/src/components/common/VnInputDateTime.vue
@@ -0,0 +1,79 @@
+<script setup>
+import { computed, useAttrs } from 'vue';
+import { date } from 'quasar';
+import VnDate from './VnDate.vue';
+import VnTime from './VnTime.vue';
+
+const $attrs = useAttrs();
+const model = defineModel({ type: [Date, String] });
+
+const $props = defineProps({
+    isOutlined: {
+        type: Boolean,
+        default: false,
+    },
+    showEvent: {
+        type: Boolean,
+        default: true,
+    },
+});
+const styleAttrs = computed(() => {
+    return $props.isOutlined
+        ? {
+              dense: true,
+              outlined: true,
+              rounded: true,
+          }
+        : {};
+});
+const mask = 'DD-MM-YYYY HH:mm';
+const selectedDate = computed({
+    get() {
+        if (!model.value) return JSON.stringify(new Date(model.value));
+        return date.formatDate(new Date(model.value), mask);
+    },
+    set(value) {
+        model.value = Date.convertToISODateTime(value);
+    },
+});
+const manageDate = (date) => {
+    selectedDate.value = date;
+};
+</script>
+
+<template>
+    <div @mouseover="hover = true" @mouseleave="hover = false">
+        <QInput
+            ref="vnInputDateRef"
+            v-model="selectedDate"
+            class="vn-input-date"
+            placeholder="dd/mm/aaaa HH:mm"
+            v-bind="{ ...$attrs, ...styleAttrs }"
+            :clearable="false"
+            @click="isPopupOpen = !isPopupOpen"
+            @keydown="isPopupOpen = false"
+            hide-bottom-space
+            @update:model-value="manageDate"
+            :data-cy="$attrs.dataCy ?? $attrs.label + '_inputDateTime'"
+        >
+            <template #prepend>
+                <QIcon name="today" size="xs">
+                    <QPopupProxy cover transition-show="scale" transition-hide="scale">
+                        <VnDate :mask="mask" v-model="selectedDate" />
+                    </QPopupProxy>
+                </QIcon>
+            </template>
+            <template #append>
+                <QIcon name="access_time" size="xs">
+                    <QPopupProxy cover transition-show="scale" transition-hide="scale">
+                        <VnTime format24h :mask="mask" v-model="selectedDate" />
+                    </QPopupProxy>
+                </QIcon>
+            </template>
+        </QInput>
+    </div>
+</template>
+<i18n>
+    es:
+        Open date: Abrir fecha
+</i18n>
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 32a8db16f..749bdb718 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -54,6 +54,10 @@ const $props = defineProps({
         type: [Array],
         default: () => [],
     },
+    filterFn: {
+        type: Function,
+        default: null,
+    },
     exprBuilder: {
         type: Function,
         default: null,
@@ -62,16 +66,12 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
-    defaultFilter: {
-        type: Boolean,
-        default: true,
-    },
     fields: {
         type: Array,
         default: null,
     },
     include: {
-        type: [Object, Array],
+        type: [Object, Array, String],
         default: null,
     },
     where: {
@@ -79,7 +79,7 @@ const $props = defineProps({
         default: null,
     },
     sortBy: {
-        type: String,
+        type: [String, Array],
         default: null,
     },
     limit: {
@@ -156,6 +156,8 @@ const computedSortBy = computed(() => {
     return $props.sortBy || $props.optionLabel + ' ASC';
 });
 
+const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
+
 watch(options, (newValue) => {
     setOptions(newValue);
 });
@@ -183,7 +185,7 @@ const arrayData = useArrayData(arrayDataKey, {
     searchUrl: false,
     mapKey: $attrs['map-key'],
 });
-
+const someIsLoading = computed(() => isLoading.value || arrayData.isLoading);
 function findKeyInOptions() {
     if (!$props.options) return;
     return filter($props.modelValue, $props.options)?.length;
@@ -252,43 +254,41 @@ async function fetchFilter(val) {
 }
 
 async function filterHandler(val, update) {
-    if (isLoading.value) return update();
-    if (!val && lastVal.value === val) {
-        lastVal.value = val;
-        return update();
-    }
-    lastVal.value = val;
     let newOptions;
 
-    if (!$props.defaultFilter) return update();
-    if (
-        $props.url &&
-        ($props.limit || (!$props.limit && Object.keys(myOptions.value).length === 0))
-    ) {
-        newOptions = await fetchFilter(val);
-    } else newOptions = filter(val, myOptionsOriginal.value);
-    update(
-        () => {
-            if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
-                newOptions.unshift(noOneOpt.value);
+    if ($props.filterFn) update($props.filterFn(val));
+    else if (!val && lastVal.value === val) update();
+    else {
+        const makeRequest =
+            ($props.url && $props.limit) ||
+            (!$props.limit && Object.keys(myOptions.value).length === 0);
+        newOptions = makeRequest
+            ? await fetchFilter(val)
+            : filter(val, myOptionsOriginal.value);
 
-            myOptions.value = newOptions;
-        },
-        (ref) => {
-            if (val !== '' && ref.options.length > 0) {
-                ref.setOptionIndex(-1);
-                ref.moveOptionSelection(1, true);
-            }
-        },
-    );
+        update(
+            () => {
+                if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
+                    newOptions.unshift(noOneOpt.value);
+
+                myOptions.value = newOptions;
+            },
+            (ref) => {
+                if (val !== '' && ref.options.length > 0) {
+                    ref.setOptionIndex(-1);
+                    ref.moveOptionSelection(1, true);
+                }
+            },
+        );
+    }
+
+    lastVal.value = val;
 }
 
 function nullishToTrue(value) {
     return value ?? true;
 }
 
-const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
-
 async function onScroll({ to, direction, from, index }) {
     const lastIndex = myOptions.value.length - 1;
 
@@ -366,7 +366,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'"
diff --git a/src/components/common/__tests__/VnDiscount.spec.js b/src/components/common/__tests__/VnDiscount.spec.js
index 5d5be61ac..34c4ff630 100644
--- a/src/components/common/__tests__/VnDiscount.spec.js
+++ b/src/components/common/__tests__/VnDiscount.spec.js
@@ -4,7 +4,7 @@ import VnDiscount from 'components/common/vnDiscount.vue';
 
 describe('VnDiscount', () => {
     let vm;
-    
+
     beforeAll(() => {
         vm = createWrapper(VnDiscount, {
             props: {
@@ -12,7 +12,9 @@ describe('VnDiscount', () => {
                 price: 100,
                 quantity: 2,
                 discount: 10,
-            }
+                mana: 10,
+                promise: vi.fn(),
+            },
         }).vm;
     });
 
@@ -21,8 +23,8 @@ describe('VnDiscount', () => {
     });
 
     describe('total', () => {
-        it('should calculate total correctly', () => {            
+        it('should calculate total correctly', () => {
             expect(vm.total).toBe(180);
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/components/common/__tests__/VnDms.spec.js b/src/components/common/__tests__/VnDms.spec.js
index 66d946db3..86f12169b 100644
--- a/src/components/common/__tests__/VnDms.spec.js
+++ b/src/components/common/__tests__/VnDms.spec.js
@@ -41,10 +41,12 @@ describe('VnDms', () => {
         companyFk: 2,
         dmsTypeFk: 3,
         description: 'This is a test description',
-        files: {
-            name: 'example.txt',
-            content: new Blob(['file content'], { type: 'text/plain' }),
-        },
+        files: [
+            {
+                name: 'example.txt',
+                content: new Blob(['file content'], { type: 'text/plain' }),
+            },
+        ],
     };
 
     const expectedBody = {
@@ -83,7 +85,7 @@ describe('VnDms', () => {
         it('should map DMS data correctly and add file to FormData', () => {
             const [formData, params] = vm.mapperDms(data);
 
-            expect(formData.get('example.txt')).toBe(data.files);
+            expect([formData.get('example.txt')]).toStrictEqual(data.files);
             expect(expectedBody).toEqual(params.params);
         });
 
diff --git a/src/components/common/__tests__/VnInput.spec.js b/src/components/common/__tests__/VnInput.spec.js
index 13f9ed804..8eb2c50c8 100644
--- a/src/components/common/__tests__/VnInput.spec.js
+++ b/src/components/common/__tests__/VnInput.spec.js
@@ -2,7 +2,6 @@ import { createWrapper } from 'app/test/vitest/helper';
 import { vi, describe, expect, it } from 'vitest';
 import VnInput from 'src/components/common/VnInput.vue';
 
-
 describe('VnInput', () => {
     let vm;
     let wrapper;
@@ -11,26 +10,28 @@ describe('VnInput', () => {
     function generateWrapper(value, isOutlined, emptyToNull, insertable) {
         wrapper = createWrapper(VnInput, {
             props: {
-                modelValue: value,                
-                isOutlined,  emptyToNull,  insertable,
-                maxlength: 101
+                modelValue: value,
+                isOutlined,
+                emptyToNull,
+                insertable,
+                maxlength: 101,
             },
             attrs: {
                 label: 'test',
                 required: true,
                 maxlength: 101,
                 maxLength: 10,
-                'max-length':20
+                'max-length': 20,
             },
         });
         wrapper = wrapper.wrapper;
         vm = wrapper.vm;
         input = wrapper.find('[data-cy="test_input"]');
-    };
+    }
 
     describe('value', () => {
         it('should emit update:modelValue when value changes', async () => {
-            generateWrapper('12345', false, false, true)
+            generateWrapper('12345', false, false, true);
             await input.setValue('123');
             expect(wrapper.emitted('update:modelValue')).toBeTruthy();
             expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
@@ -46,37 +47,36 @@ describe('VnInput', () => {
     describe('styleAttrs', () => {
         it('should return empty styleAttrs when isOutlined is false', async () => {
             generateWrapper('123', false, false, false);
-            expect(vm.styleAttrs).toEqual({}); 
+            expect(vm.styleAttrs).toEqual({});
         });
 
-        it('should set styleAttrs when isOutlined is true', async () => {        
+        it('should set styleAttrs when isOutlined is true', async () => {
             generateWrapper('123', true, false, false);
             expect(vm.styleAttrs.outlined).toBe(true);
         });
     });
 
-    describe('handleKeydown', () => { 
+    describe('handleKeydown', () => {
         it('should do nothing when "Backspace" key is pressed', async () => {
             generateWrapper('12345', false, false, true);
             await input.trigger('keydown', { key: 'Backspace' });
             expect(wrapper.emitted('update:modelValue')).toBeUndefined();
             const spyhandler = vi.spyOn(vm, 'handleInsertMode');
             expect(spyhandler).not.toHaveBeenCalled();
-            
         });
-        
+
         /*
         TODO: #8399 REDMINE
         */
         it.skip('handleKeydown respects insertable behavior', async () => {
             const expectedValue = '12345';
             generateWrapper('1234', false, false, true);
-            vm.focus()
+            vm.focus();
             await input.trigger('keydown', { key: '5' });
             await vm.$nextTick();
             expect(wrapper.emitted('update:modelValue')).toBeTruthy();
-            expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue ]);
-            expect(vm.value).toBe( expectedValue);
+            expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue]);
+            expect(vm.value).toBe(expectedValue);
         });
     });
 
@@ -86,6 +86,6 @@ describe('VnInput', () => {
             const focusSpy = vi.spyOn(input.element, 'focus');
             vm.focus();
             expect(focusSpy).toHaveBeenCalled();
-        }); 
+        });
     });
 });
diff --git a/src/components/common/__tests__/VnInputDate.spec.js b/src/components/common/__tests__/VnInputDate.spec.js
index 21ca91e96..3cb037c63 100644
--- a/src/components/common/__tests__/VnInputDate.spec.js
+++ b/src/components/common/__tests__/VnInputDate.spec.js
@@ -5,52 +5,71 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 let vm;
 let wrapper;
 
-function generateWrapper(date, outlined, required) {
+function generateWrapper(outlined = false, required = false) {
     wrapper = createWrapper(VnInputDate, {
         props: {
-            modelValue: date,
+            modelValue: '2000-12-31T23:00:00.000Z',
+            'onUpdate:modelValue': (e) => wrapper.setProps({ modelValue: e }),
         },
         attrs: {
             isOutlined: outlined,
-            required: required
+            required: required,
         },
     });
     wrapper = wrapper.wrapper;
     vm = wrapper.vm;
-};
+}
 
 describe('VnInputDate', () => {
-
-    describe('formattedDate', () => {     
-        it('formats a valid date correctly', async () => {
-            generateWrapper('2023-12-25', false, false);
+    describe('formattedDate', () => {
+        it('validateAndCleanInput should remove non-numeric characters', async () => {
+            generateWrapper();
+            vm.validateAndCleanInput('10a/1s2/2dd0a23');
             await vm.$nextTick();
-            expect(vm.formattedDate).toBe('25/12/2023');
+            expect(vm.inputValue).toBe('10/12/2023');
         });
 
-        it('updates the model value when a new date is set', async () => {
-            const input = wrapper.find('input');
-            await input.setValue('31/12/2023');
-            expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
-            expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
+        it('manageDate should reverse the date', async () => {
+            generateWrapper();
+            vm.manageDate('10/12/2023');
+            await vm.$nextTick();
+            expect(vm.inputValue).toBe('2023/12/10');
         });
 
-        it('should not update the model value when an invalid date is set', async () => {
+        it('formatDate should format the date correctly when a valid date is entered with full year', async () => {
             const input = wrapper.find('input');
-            await input.setValue('invalid-date');
-            expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
-        }); 
+            await input.setValue('25.12/2002');
+            await vm.$nextTick();
+            await vm.formatDate();
+            expect(vm.model).toBe('2002-12-24T23:00:00.000Z');
+        });
+
+        it('should format the date correctly when a valid date is entered with short year', async () => {
+            const input = wrapper.find('input');
+            await input.setValue('31.12-23');
+            await vm.$nextTick();
+            await vm.formatDate();
+            expect(vm.model).toBe('2023-12-30T23:00:00.000Z');
+        });
+
+        it('should format the date correctly when a valid date is entered without year', async () => {
+            const input = wrapper.find('input');
+            await input.setValue('12.03');
+            await vm.$nextTick();
+            await vm.formatDate();
+            expect(vm.model).toBe('2001-03-11T23:00:00.000Z');
+        });
     });
 
     describe('styleAttrs', () => {
         it('should return empty styleAttrs when isOutlined is false', async () => {
-            generateWrapper('2023-12-25', false, false);
+            generateWrapper();
             await vm.$nextTick();
-            expect(vm.styleAttrs).toEqual({}); 
+            expect(vm.styleAttrs).toEqual({});
         });
 
-        it('should set styleAttrs when isOutlined is true', async () => {        
-            generateWrapper('2023-12-25', true, false);
+        it('should set styleAttrs when isOutlined is true', async () => {
+            generateWrapper(true, false);
             await vm.$nextTick();
             expect(vm.styleAttrs.outlined).toBe(true);
         });
@@ -58,15 +77,15 @@ describe('VnInputDate', () => {
 
     describe('required', () => {
         it('should not applies required class when isRequired is false', async () => {
-            generateWrapper('2023-12-25', false, false);
+            generateWrapper();
             await vm.$nextTick();
             expect(wrapper.find('.vn-input-date').classes()).not.toContain('required');
         });
-        
+
         it('should applies required class when isRequired is true', async () => {
-            generateWrapper('2023-12-25', false, true);
+            generateWrapper(false, true);
             await vm.$nextTick();
             expect(wrapper.find('.vn-input-date').classes()).toContain('required');
         });
     });
-});
\ No newline at end of file
+});
diff --git a/src/components/common/__tests__/VnInputDateTime.spec.js b/src/components/common/__tests__/VnInputDateTime.spec.js
new file mode 100644
index 000000000..adff1dbc4
--- /dev/null
+++ b/src/components/common/__tests__/VnInputDateTime.spec.js
@@ -0,0 +1,81 @@
+import { createWrapper } from 'app/test/vitest/helper.js';
+import { describe, it, expect, beforeAll } from 'vitest';
+import VnInputDateTime from 'components/common/VnInputDateTime.vue';
+import vnDateBoot from 'src/boot/vnDate';
+
+let vm;
+let wrapper;
+
+beforeAll(() => {
+    // Initialize the vnDate boot
+    vnDateBoot();
+});
+function generateWrapper(date, outlined, showEvent) {
+    wrapper = createWrapper(VnInputDateTime, {
+        props: {
+            modelValue: date,
+            isOutlined: outlined,
+            showEvent: showEvent,
+        },
+    });
+    wrapper = wrapper.wrapper;
+    vm = wrapper.vm;
+}
+
+describe('VnInputDateTime', () => {
+    describe('selectedDate', () => {
+        it('formats a valid datetime correctly', async () => {
+            generateWrapper('2023-12-25T10:30:00', false, true);
+            await vm.$nextTick();
+            expect(vm.selectedDate).toBe('25-12-2023 10:30');
+        });
+
+        it('handles null date value', async () => {
+            generateWrapper(null, false, true);
+            await vm.$nextTick();
+            expect(vm.selectedDate).not.toBe(null);
+        });
+
+        it('updates the model value when a new datetime is set', async () => {
+            vm.selectedDate = '31-12-2023 15:45';
+            await vm.$nextTick();
+            expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
+        });
+    });
+
+    describe('styleAttrs', () => {
+        it('should return empty styleAttrs when isOutlined is false', async () => {
+            generateWrapper('2023-12-25T10:30:00', false, true);
+            await vm.$nextTick();
+            expect(vm.styleAttrs).toEqual({});
+        });
+
+        it('should set styleAttrs when isOutlined is true', async () => {
+            generateWrapper('2023-12-25T10:30:00', true, true);
+            await vm.$nextTick();
+            expect(vm.styleAttrs).toEqual({
+                dense: true,
+                outlined: true,
+                rounded: true,
+            });
+        });
+    });
+
+    describe('component rendering', () => {
+        it('should render date and time icons', async () => {
+            generateWrapper('2023-12-25T10:30:00', false, true);
+            await vm.$nextTick();
+            const icons = wrapper.findAllComponents({ name: 'QIcon' });
+            expect(icons.length).toBe(2);
+            expect(icons[0].props('name')).toBe('today');
+            expect(icons[1].props('name')).toBe('access_time');
+        });
+
+        it('should render popup proxies for date and time', async () => {
+            generateWrapper('2023-12-25T10:30:00', false, true);
+            await vm.$nextTick();
+            const popups = wrapper.findAllComponents({ name: 'QPopupProxy' });
+            expect(popups.length).toBe(2);
+        });
+    });
+});
diff --git a/src/components/common/__tests__/VnLog.spec.js b/src/components/common/__tests__/VnLog.spec.js
index fcb516cc5..399b78a1d 100644
--- a/src/components/common/__tests__/VnLog.spec.js
+++ b/src/components/common/__tests__/VnLog.spec.js
@@ -90,8 +90,10 @@ describe('VnLog', () => {
 
         vm = createWrapper(VnLog, {
             global: {
-                stubs: [],
-                mocks: {},
+                stubs: ['FetchData', 'vue-i18n'],
+                mocks: {
+                    fetch: vi.fn(),
+                },
             },
             propsData: {
                 model: 'Claim',
diff --git a/src/components/common/__tests__/VnNotes.spec.js b/src/components/common/__tests__/VnNotes.spec.js
index e0514cc7b..0d256a736 100644
--- a/src/components/common/__tests__/VnNotes.spec.js
+++ b/src/components/common/__tests__/VnNotes.spec.js
@@ -26,7 +26,7 @@ describe('VnNotes', () => {
     ) {
         vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
         wrapper = createWrapper(VnNotes, {
-            propsData: options,
+            propsData: { ...defaultOptions, ...options },
         });
         wrapper = wrapper.wrapper;
         vm = wrapper.vm;
diff --git a/src/components/ui/EntityDescriptor.vue b/src/components/ui/EntityDescriptor.vue
index a5dced551..751a6bd9c 100644
--- a/src/components/ui/EntityDescriptor.vue
+++ b/src/components/ui/EntityDescriptor.vue
@@ -58,7 +58,8 @@ async function getData() {
     store.filter = $props.filter ?? {};
     isLoading.value = true;
     try {
-        const { data } = await arrayData.fetch({ append: false, updateRouter: false });
+        await arrayData.fetch({ append: false, updateRouter: false });
+        const { data } = store;
         state.set($props.dataKey, data);
         emit('onFetch', data);
     } finally {
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 8fbfb067f..b232e6c05 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -2,7 +2,9 @@
 import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
+import { useAttrs } from 'vue';
 
+const attrs = useAttrs();
 const { t } = useI18n();
 
 const props = defineProps({
@@ -67,7 +69,7 @@ const props = defineProps({
         default: null,
     },
     searchUrl: {
-        type: String,
+        type: [String, Boolean],
         default: null,
     },
     disableInfiniteScroll: {
@@ -75,7 +77,7 @@ const props = defineProps({
         default: false,
     },
     mapKey: {
-        type: String,
+        type: [String, Boolean],
         default: '',
     },
     keyData: {
@@ -220,7 +222,7 @@ defineExpose({
 </script>
 
 <template>
-    <div class="full-width">
+    <div class="full-width" v-bind="attrs">
         <div
             v-if="!store.data && !store.data?.length && !isLoading"
             class="info-row q-pa-md text-center"
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 7b82aece8..59bcdf524 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -46,7 +46,7 @@ const props = defineProps({
         default: null,
     },
     order: {
-        type: String,
+        type: [String, Array],
         default: '',
     },
     limit: {
diff --git a/src/components/ui/__tests__/CardSummary.spec.js b/src/components/ui/__tests__/CardSummary.spec.js
index ff6f60697..16b903eba 100644
--- a/src/components/ui/__tests__/CardSummary.spec.js
+++ b/src/components/ui/__tests__/CardSummary.spec.js
@@ -23,10 +23,15 @@ describe('CardSummary', () => {
 
     beforeEach(() => {
         wrapper = createWrapper(CardSummary, {
+            global: {
+                mocks: {
+                    validate: vi.fn(),
+                },
+            },
             propsData: {
                 dataKey: 'cardSummaryKey',
                 url: 'cardSummaryUrl',
-                filter: 'cardFilter',
+                filter: { key: 'cardFilter' },
             },
         });
         vm = wrapper.vm;
@@ -50,7 +55,7 @@ describe('CardSummary', () => {
 
     it('should set correct props to the store', () => {
         expect(vm.store.url).toEqual('cardSummaryUrl');
-        expect(vm.store.filter).toEqual('cardFilter');
+        expect(vm.store.filter).toEqual({ key: 'cardFilter' });
     });
 
     it('should respond to prop changes and refetch data', async () => {
diff --git a/src/components/ui/__tests__/VnSearchbar.spec.js b/src/components/ui/__tests__/VnSearchbar.spec.js
index 25649194d..64014e8d8 100644
--- a/src/components/ui/__tests__/VnSearchbar.spec.js
+++ b/src/components/ui/__tests__/VnSearchbar.spec.js
@@ -7,7 +7,7 @@ describe('VnSearchbar', () => {
     let wrapper;
     let applyFilterSpy;
     const searchText = 'Bolas de madera';
-    const userParams = {staticKey: 'staticValue'};
+    const userParams = { staticKey: 'staticValue' };
 
     beforeEach(async () => {
         wrapper = createWrapper(VnSearchbar, {
@@ -23,8 +23,9 @@ describe('VnSearchbar', () => {
 
         vm.searchText = searchText;
         vm.arrayData.store.userParams = userParams;
-        applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {});
-        
+        applyFilterSpy = vi
+            .spyOn(vm.arrayData, 'applyFilter')
+            .mockImplementation(() => {});
     });
 
     afterEach(() => {
@@ -32,7 +33,9 @@ describe('VnSearchbar', () => {
     });
 
     it('search resets pagination and applies filter', async () => {
-        const resetPaginationSpy = vi.spyOn(vm.arrayData, 'resetPagination').mockImplementation(() => {});
+        const resetPaginationSpy = vi
+            .spyOn(vm.arrayData, 'resetPagination')
+            .mockImplementation(() => {});
         await vm.search();
 
         expect(resetPaginationSpy).toHaveBeenCalled();
@@ -48,7 +51,7 @@ describe('VnSearchbar', () => {
 
         expect(applyFilterSpy).toHaveBeenCalledWith({
             params: { staticKey: 'staticValue', search: searchText },
-            filter: {skip: 0},
+            filter: { skip: 0 },
         });
     });
 
@@ -68,4 +71,4 @@ describe('VnSearchbar', () => {
         });
         expect(vm.to.query.searchParam).toBe(expectedQuery);
     });
-});
\ No newline at end of file
+});
diff --git a/src/components/ui/__tests__/VnSms.spec.js b/src/components/ui/__tests__/VnSms.spec.js
index 4f4fd7d49..b71d8ccb0 100644
--- a/src/components/ui/__tests__/VnSms.spec.js
+++ b/src/components/ui/__tests__/VnSms.spec.js
@@ -1,5 +1,4 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import axios from 'axios';
 import { createWrapper } from 'app/test/vitest/helper';
 import VnSms from 'src/components/ui/VnSms.vue';
 
@@ -12,6 +11,9 @@ describe('VnSms', () => {
                 stubs: ['VnPaginate'],
                 mocks: {},
             },
+            propsData: {
+                url: 'SmsUrl',
+            },
         }).vm;
     });
 
diff --git a/src/composables/__tests__/useArrayData.spec.js b/src/composables/__tests__/useArrayData.spec.js
index a3fbbdd5d..74be8ccff 100644
--- a/src/composables/__tests__/useArrayData.spec.js
+++ b/src/composables/__tests__/useArrayData.spec.js
@@ -4,6 +4,8 @@ import { useArrayData } from 'composables/useArrayData';
 import { useRouter } from 'vue-router';
 import * as vueRouter from 'vue-router';
 import { setActivePinia, createPinia } from 'pinia';
+import { defineComponent, h } from 'vue';
+import { mount } from '@vue/test-utils';
 
 describe('useArrayData', () => {
     const filter = '{"limit":20,"skip":0}';
@@ -43,7 +45,7 @@ describe('useArrayData', () => {
     it('should fetch and replace url with new params', async () => {
         vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
 
-        const arrayData = useArrayData('ArrayData', {
+        const arrayData = mountArrayData('ArrayData', {
             url: 'mockUrl',
             searchUrl: 'params',
         });
@@ -72,7 +74,7 @@ describe('useArrayData', () => {
             data: [{ id: 1 }],
         });
 
-        const arrayData = useArrayData('ArrayData', {
+        const arrayData = mountArrayData('ArrayData', {
             url: 'mockUrl',
             navigate: {},
         });
@@ -94,7 +96,7 @@ describe('useArrayData', () => {
             ],
         });
 
-        const arrayData = useArrayData('ArrayData', {
+        const arrayData = mountArrayData('ArrayData', {
             url: 'mockUrl',
             oneRecord: true,
         });
@@ -107,3 +109,17 @@ describe('useArrayData', () => {
         });
     });
 });
+
+function mountArrayData(...args) {
+    let arrayData;
+
+    const TestComponent = defineComponent({
+        setup() {
+            arrayData = useArrayData(...args);
+            return () => h('div');
+        },
+    });
+
+    const asd = mount(TestComponent);
+    return arrayData;
+}
diff --git a/src/composables/__tests__/useSession.spec.js b/src/composables/__tests__/useSession.spec.js
index e86847b70..eb390e096 100644
--- a/src/composables/__tests__/useSession.spec.js
+++ b/src/composables/__tests__/useSession.spec.js
@@ -64,88 +64,84 @@ describe('session', () => {
         });
     });
 
-    describe(
-        'login',
-        () => {
-            const expectedUser = {
-                id: 999,
-                name: `T'Challa`,
-                nickname: 'Black Panther',
-                lang: 'en',
-                userConfig: {
-                    darkMode: false,
+    describe('login', () => {
+        const expectedUser = {
+            id: 999,
+            name: `T'Challa`,
+            nickname: 'Black Panther',
+            lang: 'en',
+            userConfig: {
+                darkMode: false,
+            },
+            worker: { department: { departmentFk: 155 } },
+        };
+        const rolesData = [
+            {
+                role: {
+                    name: 'salesPerson',
                 },
-                worker: { department: { departmentFk: 155 } },
-            };
-            const rolesData = [
-                {
-                    role: {
-                        name: 'salesPerson',
-                    },
+            },
+            {
+                role: {
+                    name: 'admin',
                 },
-                {
-                    role: {
-                        name: 'admin',
-                    },
-                },
-            ];
-            beforeEach(() => {
-                vi.spyOn(axios, 'get').mockImplementation((url) => {
-                    if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
-                    return Promise.resolve({
-                        data: { roles: rolesData, user: expectedUser },
-                    });
+            },
+        ];
+        beforeEach(() => {
+            vi.spyOn(axios, 'get').mockImplementation((url) => {
+                if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
+                return Promise.resolve({
+                    data: { roles: rolesData, user: expectedUser },
                 });
             });
+        });
 
-            it('should fetch the user roles and then set token in the sessionStorage', async () => {
-                const expectedRoles = ['salesPerson', 'admin'];
-                const expectedToken = 'mySessionToken';
-                const expectedTokenMultimedia = 'mySessionTokenMultimedia';
-                const keepLogin = false;
+        it('should fetch the user roles and then set token in the sessionStorage', async () => {
+            const expectedRoles = ['salesPerson', 'admin'];
+            const expectedToken = 'mySessionToken';
+            const expectedTokenMultimedia = 'mySessionTokenMultimedia';
+            const keepLogin = false;
 
-                await session.login({
-                    token: expectedToken,
-                    tokenMultimedia: expectedTokenMultimedia,
-                    keepLogin,
-                });
-
-                const roles = state.getRoles();
-                const localToken = localStorage.getItem('token');
-                const sessionToken = sessionStorage.getItem('token');
-
-                expect(roles.value).toEqual(expectedRoles);
-                expect(localToken).toBeNull();
-                expect(sessionToken).toEqual(expectedToken);
-
-                await session.destroy(); // this clears token and user for any other test
+            await session.login({
+                token: expectedToken,
+                tokenMultimedia: expectedTokenMultimedia,
+                keepLogin,
             });
 
-            it('should fetch the user roles and then set token in the localStorage', async () => {
-                const expectedRoles = ['salesPerson', 'admin'];
-                const expectedToken = 'myLocalToken';
-                const expectedTokenMultimedia = 'myLocalTokenMultimedia';
-                const keepLogin = true;
+            const roles = state.getRoles();
+            const localToken = localStorage.getItem('token');
+            const sessionToken = sessionStorage.getItem('token');
 
-                await session.login({
-                    token: expectedToken,
-                    tokenMultimedia: expectedTokenMultimedia,
-                    keepLogin,
-                });
+            expect(roles.value).toEqual(expectedRoles);
+            expect(localToken).toBeNull();
+            expect(sessionToken).toEqual(expectedToken);
 
-                const roles = state.getRoles();
-                const localToken = localStorage.getItem('token');
-                const sessionToken = sessionStorage.getItem('token');
+            await session.destroy(); // this clears token and user for any other test
+        });
 
-                expect(roles.value).toEqual(expectedRoles);
-                expect(localToken).toEqual(expectedToken);
-                expect(sessionToken).toBeNull();
+        it('should fetch the user roles and then set token in the localStorage', async () => {
+            const expectedRoles = ['salesPerson', 'admin'];
+            const expectedToken = 'myLocalToken';
+            const expectedTokenMultimedia = 'myLocalTokenMultimedia';
+            const keepLogin = true;
 
-                await session.destroy(); // this clears token and user for any other test
+            await session.login({
+                token: expectedToken,
+                tokenMultimedia: expectedTokenMultimedia,
+                keepLogin,
             });
-        },
-        {},
-    );
+
+            const roles = state.getRoles();
+            const localToken = localStorage.getItem('token');
+            const sessionToken = sessionStorage.getItem('token');
+
+            expect(roles.value).toEqual(expectedRoles);
+            expect(localToken).toEqual(expectedToken);
+            expect(sessionToken).toBeNull();
+
+            await session.destroy(); // this clears token and user for any other test
+        });
+    });
 
     describe('RenewToken', () => {
         const expectedToken = 'myToken';
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 46253c639..2b56aad23 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -20,6 +20,7 @@ globals:
     logOut: Log out
     date: Date
     dataSaved: Data saved
+    openDetail: Open detail
     dataDeleted: Data deleted
     delete: Delete
     search: Search
@@ -164,6 +165,9 @@ globals:
     department: Department
     noData: No data available
     vehicle: Vehicle
+    selectDocumentId: Select document id
+    document: Document
+    import: Import from existing
     pageTitles:
         logIn: Login
         addressEdit: Update address
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 6b16940cc..669371971 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -21,11 +21,12 @@ globals:
     date: Fecha
     dataSaved: Datos guardados
     dataDeleted: Datos eliminados
+    dataCreated: Datos creados
+    openDetail: Ver detalle
     delete: Eliminar
     search: Buscar
     lines: Lineas
     changes: Cambios
-    dataCreated: Datos creados
     add: Añadir
     create: Crear
     edit: Modificar
@@ -168,6 +169,9 @@ globals:
     noData: Datos no disponibles
     department: Departamento
     vehicle: Vehículo
+    selectDocumentId: Seleccione el id de gestión documental
+    document: Documento
+    import: Importar desde existente
     pageTitles:
         logIn: Inicio de sesión
         addressEdit: Modificar consignatario
diff --git a/src/pages/Claim/Card/ClaimPhoto.vue b/src/pages/Claim/Card/ClaimPhoto.vue
index 4ced7e862..f02038afe 100644
--- a/src/pages/Claim/Card/ClaimPhoto.vue
+++ b/src/pages/Claim/Card/ClaimPhoto.vue
@@ -23,7 +23,7 @@ const claimDms = ref([
 ]);
 const client = ref({});
 const inputFile = ref();
-const files = ref({});
+const files = ref([]);
 const spinnerRef = ref();
 const claimDmsRef = ref();
 const dmsType = ref({});
@@ -255,9 +255,8 @@ function onDrag() {
                 icon="add"
                 color="primary"
             >
-                <QInput
+                <QFile
                     ref="inputFile"
-                    type="file"
                     style="display: none"
                     multiple
                     v-model="files"
diff --git a/src/pages/Claim/Card/__tests__/ClaimLines.spec.js b/src/pages/Claim/Card/__tests__/ClaimLines.spec.js
index d975fb514..1ed5cccab 100644
--- a/src/pages/Claim/Card/__tests__/ClaimLines.spec.js
+++ b/src/pages/Claim/Card/__tests__/ClaimLines.spec.js
@@ -52,7 +52,7 @@ describe('ClaimLines', () => {
                 expectedData,
                 {
                     signal: canceller.signal,
-                }
+                },
             );
         });
     });
@@ -69,7 +69,7 @@ describe('ClaimLines', () => {
                 expect.objectContaining({
                     message: 'Discount updated',
                     type: 'positive',
-                })
+                }),
             );
         });
     });
diff --git a/src/pages/Claim/Card/__tests__/ClaimLinesImport.spec.js b/src/pages/Claim/Card/__tests__/ClaimLinesImport.spec.js
index 2a5176d0a..cec4b1681 100644
--- a/src/pages/Claim/Card/__tests__/ClaimLinesImport.spec.js
+++ b/src/pages/Claim/Card/__tests__/ClaimLinesImport.spec.js
@@ -14,6 +14,9 @@ describe('ClaimLinesImport', () => {
                     fetch: vi.fn(),
                 },
             },
+            propsData: {
+                ticketId: 1,
+            },
         }).vm;
     });
 
@@ -40,7 +43,7 @@ describe('ClaimLinesImport', () => {
                 expect.objectContaining({
                     message: 'Lines added to claim',
                     type: 'positive',
-                })
+                }),
             );
             expect(vm.canceller).toEqual(null);
         });
diff --git a/src/pages/Claim/Card/__tests__/ClaimPhoto.spec.js b/src/pages/Claim/Card/__tests__/ClaimPhoto.spec.js
index b14338b5c..bf3548af3 100644
--- a/src/pages/Claim/Card/__tests__/ClaimPhoto.spec.js
+++ b/src/pages/Claim/Card/__tests__/ClaimPhoto.spec.js
@@ -41,10 +41,10 @@ describe('ClaimPhoto', () => {
             await vm.deleteDms({ index: 0 });
 
             expect(axios.post).toHaveBeenCalledWith(
-                `ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`
+                `ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`,
             );
             expect(vm.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({ type: 'positive' })
+                expect.objectContaining({ type: 'positive' }),
             );
         });
     });
@@ -63,7 +63,7 @@ describe('ClaimPhoto', () => {
                         data: { index: 1 },
                         promise: vm.deleteDms,
                     },
-                })
+                }),
             );
         });
     });
@@ -102,10 +102,10 @@ describe('ClaimPhoto', () => {
                 new FormData(),
                 expect.objectContaining({
                     params: expect.objectContaining({ hasFile: false }),
-                })
+                }),
             );
             expect(vm.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({ type: 'positive' })
+                expect.objectContaining({ type: 'positive' }),
             );
 
             expect(vm.claimDmsRef.fetch).toHaveBeenCalledOnce();
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index c7461f890..8b4e025a2 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -39,7 +39,7 @@ const route = useRoute();
 const { t } = useI18n();
 
 const entityId = computed(() => {
-    return $props.id || route.params.id;
+    return Number($props.id || route.params.id);
 });
 
 const data = ref(useCardDescription());
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index baa728868..f4efd03b6 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -86,7 +86,7 @@ async function acceptPropagate({ isEqualizated }) {
                     :required="true"
                     :rules="validate('client.socialName')"
                     clearable
-                    uppercase="true"
+                    :uppercase="true"
                     v-model="data.socialName"
                 >
                     <template #append>
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index f19bb26ab..d05cb2a02 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -25,7 +25,7 @@ const $props = defineProps({
     },
 });
 
-const entityId = computed(() => $props.id || route.params.id);
+const entityId = computed(() => Number($props.id || route.params.id));
 const customer = computed(() => summary.value.entity);
 const summary = ref();
 const defaulterAmount = computed(() => customer.value.defaulters[0]?.amount);
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index c30b11528..48538aa2a 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -72,7 +72,7 @@ const exprBuilder = (param, value) => {
                         option-value="id"
                         option-label="name"
                         url="Departments"
-                        no-one="true"
+                        :no-one="true"
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/Customer/Payments/__tests__/CustomerPayments.spec.js b/src/pages/Customer/Payments/__tests__/CustomerPayments.spec.js
index a9c845cec..238545050 100644
--- a/src/pages/Customer/Payments/__tests__/CustomerPayments.spec.js
+++ b/src/pages/Customer/Payments/__tests__/CustomerPayments.spec.js
@@ -32,7 +32,7 @@ describe('CustomerPayments', () => {
                 expect.objectContaining({
                     message: 'Payment confirmed',
                     type: 'positive',
-                })
+                }),
             );
         });
     });
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 1294a5d25..dfa944748 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -41,7 +41,6 @@ const sampleType = ref({ hasPreview: false });
 const initialData = reactive({});
 const entityId = computed(() => route.params.id);
 const customer = computed(() => useArrayData('Customer').store?.data);
-const filterEmailUsers = { where: { userFk: user.value.id } };
 const filterClientsAddresses = {
     include: [
         { relation: 'province', scope: { fields: ['name'] } },
@@ -73,7 +72,7 @@ onBeforeMount(async () => {
 
 const setEmailUser = (data) => {
     optionsEmailUsers.value = data;
-    initialData.replyTo = data[0]?.email;
+    initialData.replyTo = data[0]?.notificationEmail;
 };
 
 const setClientsAddresses = (data) => {
@@ -182,10 +181,12 @@ const toCustomerSamples = () => {
 
 <template>
     <FetchData
-        :filter="filterEmailUsers"
+        :filter="{
+            where: { id: customer.departmentFk },
+        }"
         @on-fetch="setEmailUser"
         auto-load
-        url="EmailUsers"
+        url="Departments"
     />
     <FetchData
         :filter="filterClientsAddresses"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue
index e9ca762ed..2c8cab84f 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue
@@ -5,7 +5,7 @@ import InvoiceInSummary from './InvoiceInSummary.vue';
 const $props = defineProps({
     id: {
         type: Number,
-        required: true,
+        default: null,
     },
 });
 </script>
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 53433c56b..6d6dd2f51 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -164,6 +164,7 @@ onMounted(async () => {
             unelevated
             filled
             dense
+            data-cy="formSubmitBtn"
         />
         <QBtn
             v-else
@@ -174,6 +175,7 @@ onMounted(async () => {
             filled
             dense
             @click="getStatus = 'stopping'"
+            data-cy="formStopBtn"
         />
     </QForm>
 </template>
diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
index ab26b9cae..87d42e25b 100644
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/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"
diff --git a/src/pages/Item/components/ItemProposal.vue b/src/pages/Item/components/ItemProposal.vue
index edff4f394..bd0fdc0c2 100644
--- a/src/pages/Item/components/ItemProposal.vue
+++ b/src/pages/Item/components/ItemProposal.vue
@@ -6,10 +6,12 @@ import { toCurrency } from 'filters/index';
 import VnStockValueDisplay from 'src/components/ui/VnStockValueDisplay.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import axios from 'axios';
-import notifyResults from 'src/utils/notifyResults';
+import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
 import FetchData from 'components/FetchData.vue';
+import { useState } from 'src/composables/useState';
 
 const MATCH = 'match';
+const { notifyResults } = displayResults();
 
 const { t } = useI18n();
 const $props = defineProps({
@@ -18,14 +20,20 @@ const $props = defineProps({
         required: true,
         default: () => {},
     },
+    filter: {
+        type: Object,
+        required: true,
+        default: () => {},
+    },
     replaceAction: {
         type: Boolean,
-        required: false,
+        required: true,
         default: false,
     },
+
     sales: {
         type: Array,
-        required: false,
+        required: true,
         default: () => [],
     },
 });
@@ -36,6 +44,8 @@ const proposalTableRef = ref(null);
 const sale = computed(() => $props.sales[0]);
 const saleFk = computed(() => sale.value.saleFk);
 const filter = computed(() => ({
+    where: $props.filter,
+
     itemFk: $props.itemLack.itemFk,
     sales: saleFk.value,
 }));
diff --git a/src/pages/Item/components/ItemProposalProxy.vue b/src/pages/Item/components/ItemProposalProxy.vue
index 7da0ce398..27edd3670 100644
--- a/src/pages/Item/components/ItemProposalProxy.vue
+++ b/src/pages/Item/components/ItemProposalProxy.vue
@@ -1,13 +1,17 @@
 <script setup>
 import ItemProposal from './ItemProposal.vue';
 import { useDialogPluginComponent } from 'quasar';
-
 const $props = defineProps({
     itemLack: {
         type: Object,
         required: true,
         default: () => {},
     },
+    filter: {
+        type: Object,
+        required: true,
+        default: () => {},
+    },
     replaceAction: {
         type: Boolean,
         required: false,
@@ -31,7 +35,7 @@ defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.h
     <QDialog ref="dialogRef" transition-show="scale" transition-hide="scale">
         <QCard class="dialog-width">
             <QCardSection class="row items-center q-pb-none">
-                <span class="text-h6 text-grey">{{ $t('Item proposal') }}</span>
+                <span class="text-h6 text-grey">{{ $t('itemProposal') }}</span>
                 <QSpace />
                 <QBtn icon="close" flat round dense v-close-popup />
             </QCardSection>
diff --git a/src/pages/Item/composables/cloneItem.js b/src/pages/Item/composables/cloneItem.js
index 2421c0808..4e19661ca 100644
--- a/src/pages/Item/composables/cloneItem.js
+++ b/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 };
 }
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index dbb66c0ec..df39fff3c 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -120,7 +120,6 @@ watch(
                 :data-key="dataKey"
                 :tag-value="tagValue"
                 :tags="tags"
-                :initial-catalog-params="catalogParams"
                 :arrayData
             />
         </template>
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index ee66bb57e..434dbb038 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -27,7 +27,7 @@ const getTotalRef = ref();
 const total = ref(0);
 
 const entityId = computed(() => {
-    return $props.id || route.params.id;
+    return Number($props.id || route.params.id);
 });
 
 const orderTotal = computed(() => state.get('orderTotal') ?? 0);
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index 86bdbb5c5..7e345d69a 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -233,10 +233,10 @@ const ticketColumns = ref([
                                 </span>
                             </QTd>
                         </template>
-                        <template #body-cell-client="{ value, row }">
-                            <QTd auto-width>
+                        <template #body-cell-client="{ row }">
+                            <QTd>
                                 <span class="link">
-                                    {{ value }}
+                                    {{ row.clientFk }}
                                     <CustomerDescriptorProxy :id="row?.clientFk" />
                                 </span>
                             </QTd>
diff --git a/src/pages/Route/Vehicle/Card/VehicleDmsImportForm.vue b/src/pages/Route/Vehicle/Card/VehicleDmsImportForm.vue
new file mode 100644
index 000000000..ade3e6dc5
--- /dev/null
+++ b/src/pages/Route/Vehicle/Card/VehicleDmsImportForm.vue
@@ -0,0 +1,65 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+import FetchData from 'components/FetchData.vue';
+import useNotify from 'src/composables/useNotify.js';
+
+import axios from 'axios';
+
+const emit = defineEmits(['onDataSaved']);
+
+const { t } = useI18n();
+const { notify } = useNotify();
+const route = useRoute();
+
+const dmsOptions = ref([]);
+const dmsId = ref(null);
+
+const importDms = async () => {
+    try {
+        if (!dmsId.value) throw new Error(t(`vehicle.errors.documentIdEmpty`));
+
+        const data = {
+            vehicleFk: route.params.id,
+            dmsFk: dmsId.value,
+        };
+
+        await axios.post('vehicleDms', data);
+        notify(t('globals.dataSaved'), 'positive');
+        dmsId.value = null;
+        emit('onDataSaved');
+    } catch (e) {
+        throw e;
+    }
+};
+</script>
+
+<template>
+    <FetchData
+        url="Dms"
+        :filter="{ fields: ['id'], order: 'id ASC' }"
+        auto-load
+        @on-fetch="(data) => (dmsOptions = data)"
+    />
+    <FormModelPopup
+        model="DmsImport"
+        :title="t('globals.selectDocumentId')"
+        :form-initial-data="{}"
+        :save-fn="importDms"
+    >
+        <template #form-inputs>
+            <VnSelect
+                :label="t('globals.document')"
+                :options="dmsOptions"
+                hide-selected
+                option-label="id"
+                option-value="id"
+                v-model="dmsId"
+            />
+        </template>
+    </FormModelPopup>
+</template>
diff --git a/src/pages/Route/Vehicle/VehicleDms.vue b/src/pages/Route/Vehicle/VehicleDms.vue
new file mode 100644
index 000000000..61f608d6c
--- /dev/null
+++ b/src/pages/Route/Vehicle/VehicleDms.vue
@@ -0,0 +1,42 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnDmsList from 'src/components/common/VnDmsList.vue';
+import VehicleDmsImportForm from 'src/pages/Route/Vehicle/Card/VehicleDmsImportForm.vue';
+
+const { t } = useI18n();
+
+const dmsListRef = ref(null);
+const showImportDialog = ref(false);
+
+const onDataSaved = () => dmsListRef.value.dmsRef.fetch();
+</script>
+<template>
+    <VnDmsList
+        ref="dmsListRef"
+        model="VehicleDms"
+        update-model="vehicles"
+        delete-model="VehicleDms"
+        download-model="dms"
+        default-dms-code="vehicles"
+        filter="vehicleFk"
+    />
+    <QDialog v-model="showImportDialog">
+        <VehicleDmsImportForm @on-data-saved="onDataSaved()" />
+    </QDialog>
+    <QPageSticky position="bottom-right" :offset="[25, 90]">
+        <QBtn
+            fab
+            color="primary"
+            icon="file_copy"
+            @click="showImportDialog = true"
+            class="fill-icon"
+            data-cy="importBtn"
+        >
+            <QTooltip>
+                {{ t('globals.import') }}
+            </QTooltip>
+        </QBtn>
+    </QPageSticky>
+</template>
diff --git a/src/pages/Route/Vehicle/locale/en.yml b/src/pages/Route/Vehicle/locale/en.yml
index c92022f9d..af6f78fd1 100644
--- a/src/pages/Route/Vehicle/locale/en.yml
+++ b/src/pages/Route/Vehicle/locale/en.yml
@@ -18,3 +18,5 @@ vehicle:
     params:
         vehicleTypeFk: Type
         vehicleStateFk: State
+    errors:
+        documentIdEmpty: The document identifier can't be empty
diff --git a/src/pages/Route/Vehicle/locale/es.yml b/src/pages/Route/Vehicle/locale/es.yml
index c878f97ac..9fd0d3e91 100644
--- a/src/pages/Route/Vehicle/locale/es.yml
+++ b/src/pages/Route/Vehicle/locale/es.yml
@@ -18,3 +18,5 @@ vehicle:
     params:
         vehicleTypeFk: Tipo
         vehicleStateFk: Estado
+    errors:
+        documentIdEmpty: El número de documento no puede estar vacío
diff --git a/src/pages/Shelving/Parking/ParkingList.vue b/src/pages/Shelving/Parking/ParkingList.vue
index 7c5058a74..eb5be5747 100644
--- a/src/pages/Shelving/Parking/ParkingList.vue
+++ b/src/pages/Shelving/Parking/ParkingList.vue
@@ -80,7 +80,7 @@ const columns = computed(() => [
             <VnTable
                 :data-key="dataKey"
                 :columns="columns"
-                is-editable="false"
+                :is-editable="false"
                 :right-search="false"
                 :use-model="true"
                 :disable-option="{ table: true }"
diff --git a/src/pages/Shelving/ShelvingList.vue b/src/pages/Shelving/ShelvingList.vue
index 651121de8..f00750dd3 100644
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@@ -90,7 +90,7 @@ const onDataSaved = ({ id }) => {
             <VnTable
                 :data-key="dataKey"
                 :columns="columns"
-                is-editable="false"
+                :is-editable="false"
                 :right-search="false"
                 :use-model="true"
                 :disable-option="{ table: true }"
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 365eb67a1..2e3acdfb6 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -65,15 +65,13 @@ function findBankFk(value, row) {
     if (bankEntityFk) row.bankEntityFk = bankEntityFk.id;
 }
 
-function bankEntityFilter(val, update) {
-    update(() => {
-        const needle = val.toLowerCase();
-        filteredBankEntitiesOptions.value = bankEntitiesOptions.value.filter(
-            (bank) =>
-                bank.bic.toLowerCase().startsWith(needle) ||
-                bank.name.toLowerCase().includes(needle),
-        );
-    });
+function bankEntityFilter(val) {
+    const needle = val.toLowerCase();
+    filteredBankEntitiesOptions.value = bankEntitiesOptions.value.filter(
+        (bank) =>
+            bank.bic.toLowerCase().startsWith(needle) ||
+            bank.name.toLowerCase().includes(needle),
+    );
 }
 </script>
 <template>
@@ -82,7 +80,8 @@ function bankEntityFilter(val, update) {
         url="BankEntities"
         @on-fetch="
             (data) => {
-                (bankEntitiesOptions = data), (filteredBankEntitiesOptions = data);
+                bankEntitiesOptions = data;
+                filteredBankEntitiesOptions = data;
             }
         "
         auto-load
@@ -135,10 +134,8 @@ function bankEntityFilter(val, update) {
                         :label="t('worker.create.bankEntity')"
                         v-model="row.bankEntityFk"
                         :options="filteredBankEntitiesOptions"
-                        :default-filter="false"
-                        @filter="(val, update) => bankEntityFilter(val, update)"
+                        :filter-fn="bankEntityFilter"
                         option-label="bic"
-                        option-value="id"
                         hide-selected
                         :required="true"
                         :roles-allowed-to-create="['financial']"
diff --git a/src/pages/Supplier/Card/SupplierDescriptorProxy.vue b/src/pages/Supplier/Card/SupplierDescriptorProxy.vue
index 6311939b8..e4d1d9a13 100644
--- a/src/pages/Supplier/Card/SupplierDescriptorProxy.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptorProxy.vue
@@ -5,7 +5,7 @@ import SupplierSummary from './SupplierSummary.vue';
 const $props = defineProps({
     id: {
         type: Number,
-        required: true,
+        default: null,
     },
 });
 </script>
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 4293bd41a..2feb0e39a 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/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>
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index 76191b099..a58c934f8 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -101,7 +101,7 @@ const onNextStep = async () => {
                 t('basicData.negativesConfirmMessage'),
                 submitWithNegatives,
             );
-        else submit();
+        else await submit();
     }
 };
 </script>
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index f7389b592..30024fb26 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -28,6 +28,7 @@ const props = defineProps({
 
 onMounted(() => {
     restoreTicket();
+    hasDocuware();
 });
 
 watch(
diff --git a/src/pages/Ticket/Card/TicketDescriptorProxy.vue b/src/pages/Ticket/Card/TicketDescriptorProxy.vue
index ba8367e81..8b872733d 100644
--- a/src/pages/Ticket/Card/TicketDescriptorProxy.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorProxy.vue
@@ -1,7 +1,6 @@
 <script setup>
 import TicketDescriptor from './TicketDescriptor.vue';
 import TicketSummary from './TicketSummary.vue';
-
 const $props = defineProps({
     id: {
         type: Number,
diff --git a/src/pages/Ticket/Card/TicketDmsImportForm.vue b/src/pages/Ticket/Card/TicketDmsImportForm.vue
index 4b6b9c6cd..04cb3d75e 100644
--- a/src/pages/Ticket/Card/TicketDmsImportForm.vue
+++ b/src/pages/Ticket/Card/TicketDmsImportForm.vue
@@ -34,7 +34,7 @@ const importDms = async () => {
         dmsId.value = null;
         emit('onDataSaved');
     } catch (e) {
-        throw new Error(e.message);
+        throw e;
     }
 };
 </script>
@@ -49,7 +49,7 @@ const importDms = async () => {
     <FormModelPopup
         url-create="genera"
         model="DmsImport"
-        :title="t('Select document id')"
+        :title="t('globals.selectDocumentId')"
         :form-initial-data="{}"
         :save-fn="importDms"
     >
@@ -70,7 +70,6 @@ const importDms = async () => {
 
 <i18n>
 es:
-    Select document id: Introduzca id de gestion documental
     Document: Documento
     The document indentifier can't be empty: El número de documento no puede estar vacío
 </i18n>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 421085142..4975afffb 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -773,6 +773,7 @@ watch(
                 v-model="row.itemFk"
                 :use-like="false"
                 @update:model-value="changeItem(row)"
+                autofocus
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
diff --git a/src/pages/Ticket/Card/TicketSplit.vue b/src/pages/Ticket/Card/TicketSplit.vue
index e79057266..462c22264 100644
--- a/src/pages/Ticket/Card/TicketSplit.vue
+++ b/src/pages/Ticket/Card/TicketSplit.vue
@@ -3,7 +3,9 @@ import { ref } from 'vue';
 
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import split from './components/split';
-const emit = defineEmits(['ticketTransfered']);
+import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
+const { notifyResults } = displayResults();
+const emit = defineEmits(['ticketTransferred']);
 
 const $props = defineProps({
     ticket: {
@@ -16,13 +18,20 @@ const splitDate = ref(Date.vnNew());
 
 const splitSelectedRows = async () => {
     const tickets = Array.isArray($props.ticket) ? $props.ticket : [$props.ticket];
-    await split(tickets, splitDate.value);
-    emit('ticketTransfered', tickets);
+    const results = await split(tickets, splitDate.value);
+    notifyResults(results, 'ticketFk');
+    emit('ticketTransferred', tickets);
 };
 </script>
 
 <template>
-    <VnInputDate class="q-mr-sm" :label="$t('New date')" v-model="splitDate" clearable />
+    <VnInputDate
+        class="q-mr-sm"
+        :label="$t('New date')"
+        v-model="splitDate"
+        clearable
+        autofocus
+    />
     <QBtn class="q-mr-sm" color="primary" label="Split" @click="splitSelectedRows"></QBtn>
 </template>
 <style lang="scss">
diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index ffa964c92..c096dee21 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -5,7 +5,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import TicketTransferForm from './TicketTransferForm.vue';
 
 import { toDateFormat } from 'src/filters/date.js';
-const emit = defineEmits(['ticketTransfered']);
+const emit = defineEmits(['ticketTransferred']);
 
 const $props = defineProps({
     mana: {
diff --git a/src/pages/Ticket/Card/TicketTransferProxy.vue b/src/pages/Ticket/Card/TicketTransferProxy.vue
index 7d5d82f85..af3b13990 100644
--- a/src/pages/Ticket/Card/TicketTransferProxy.vue
+++ b/src/pages/Ticket/Card/TicketTransferProxy.vue
@@ -1,8 +1,8 @@
 <script setup>
 import { ref } from 'vue';
 import TicketTransfer from './TicketTransfer.vue';
-import Split from './TicketSplit.vue';
-const emit = defineEmits(['ticketTransfered']);
+import TicketSplit from './TicketSplit.vue';
+const emit = defineEmits(['ticketTransferred']);
 
 const $props = defineProps({
     mana: {
@@ -35,7 +35,7 @@ const transferRef = ref(null);
 <template>
     <QPopupProxy ref="popupProxyRef" data-cy="ticketTransferPopup">
         <div class="flex row items-center q-ma-lg" v-if="$props.split">
-            <Split
+            <TicketSplit
                 ref="splitRef"
                 @splitSelectedRows="splitSelectedRows"
                 :ticket="$props.ticket"
diff --git a/src/pages/Ticket/Card/components/split.js b/src/pages/Ticket/Card/components/split.js
index afa1d5cd6..f366ca177 100644
--- a/src/pages/Ticket/Card/components/split.js
+++ b/src/pages/Ticket/Card/components/split.js
@@ -1,13 +1,11 @@
 import axios from 'axios';
-import notifyResults from 'src/utils/notifyResults';
-
 export default async function (data, date) {
     const reducedData = data.reduce((acc, item) => {
         const existing = acc.find(({ ticketFk }) => ticketFk === item.id);
         if (existing) {
             existing.sales.push(item.saleFk);
         } else {
-            acc.push({ ticketFk: item.id, sales: [item.saleFk], date });
+            acc.push({ ticketFk: item.ticketFk, sales: [item.saleFk], date });
         }
         return acc;
     }, []);
@@ -16,7 +14,5 @@ export default async function (data, date) {
 
     const results = await Promise.allSettled(promises);
 
-    notifyResults(results, 'ticketFk');
-
     return results;
 }
diff --git a/src/pages/Ticket/Negative/TicketLackDetail.vue b/src/pages/Ticket/Negative/TicketLackDetail.vue
index dcf835d03..9fb0f48ac 100644
--- a/src/pages/Ticket/Negative/TicketLackDetail.vue
+++ b/src/pages/Ticket/Negative/TicketLackDetail.vue
@@ -23,7 +23,6 @@ const tableRef = ref();
 const changeItemDialogRef = ref(null);
 const changeStateDialogRef = ref(null);
 const changeQuantityDialogRef = ref(null);
-const showProposalDialog = ref(false);
 const showChangeQuantityDialog = ref(false);
 const selectedRows = ref([]);
 const route = useRoute();
@@ -63,6 +62,7 @@ const showItemProposal = () => {
         .dialog({
             component: ItemProposalProxy,
             componentProps: {
+                filter: filter.value,
                 itemLack: tableRef.value.itemLack,
                 replaceAction: true,
                 sales: selectedRows.value,
@@ -117,21 +117,17 @@ const showItemProposal = () => {
                                 sales: selectedRows,
                                 lastActiveTickets: selectedRows.map((row) => row.id),
                             }"
-                            @ticket-transfered="reload"
+                            @ticket-transferred="reload"
                         ></TicketTransferProxy>
                     </template>
                 </QBtn>
                 <QBtn
                     color="primary"
-                    @click="showProposalDialog = true"
-                    :disable="selectedRows.length < 1"
+                    @click="showItemProposal"
+                    :disable="!(selectedRows.length === 1)"
                     data-cy="itemProposal"
                 >
-                    <QIcon
-                        name="import_export"
-                        class="rotate-90"
-                        @click="showItemProposal"
-                    ></QIcon>
+                    <QIcon name="import_export" class="rotate-90" />
                     <QTooltip bottom anchor="bottom right">
                         {{ t('itemProposal') }}
                     </QTooltip>
@@ -139,7 +135,7 @@ const showItemProposal = () => {
                 <VnPopupProxy
                     data-cy="changeItem"
                     icon="sync"
-                    :disable="selectedRows.length < 1"
+                    :disable="!(selectedRows.length === 1)"
                     :tooltip="t('negative.detail.modal.changeItem.title')"
                 >
                     <template #extraIcon> <QIcon name="vn:item" /> </template>
@@ -153,7 +149,7 @@ const showItemProposal = () => {
                 <VnPopupProxy
                     data-cy="changeState"
                     icon="sync"
-                    :disable="selectedRows.length < 1"
+                    :disable="!(selectedRows.length === 1)"
                     :tooltip="t('negative.detail.modal.changeState.title')"
                 >
                     <template #extraIcon> <QIcon name="vn:eye" /> </template>
@@ -167,7 +163,7 @@ const showItemProposal = () => {
                 <VnPopupProxy
                     data-cy="changeQuantity"
                     icon="sync"
-                    :disable="selectedRows.length < 1"
+                    :disable="!(selectedRows.length === 1)"
                     :tooltip="t('negative.detail.modal.changeQuantity.title')"
                     @click="showChangeQuantityDialog = true"
                 >
diff --git a/src/pages/Ticket/Negative/TicketLackFilter.vue b/src/pages/Ticket/Negative/TicketLackFilter.vue
index 73d53b247..78c030476 100644
--- a/src/pages/Ticket/Negative/TicketLackFilter.vue
+++ b/src/pages/Ticket/Negative/TicketLackFilter.vue
@@ -6,6 +6,7 @@ import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInputDateTime from 'src/components/common/VnInputDateTime.vue';
 const { t } = useI18n();
 const props = defineProps({
     dataKey: {
@@ -66,6 +67,7 @@ const setUserParams = (params) => {
         :data-key="props.dataKey"
         :search-button="true"
         @set-user-params="setUserParams"
+        :unremovable-params="['warehouseFk']"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -77,12 +79,11 @@ const setUserParams = (params) => {
             <QList dense class="q-gutter-y-sm q-mt-sm">
                 <QItem>
                     <QItemSection>
-                        <VnInput
-                            v-model="params.days"
-                            :label="t('negative.days')"
+                        <VnInputDateTime
+                            v-model="params.availabled"
+                            :label="t('negative.availabled')"
                             dense
                             filled
-                            type="number"
                             @update:model-value="
                                 (value) => {
                                     setUserParams(params);
diff --git a/src/pages/Ticket/Negative/TicketLackList.vue b/src/pages/Ticket/Negative/TicketLackList.vue
index d1e8b823a..1e11515f9 100644
--- a/src/pages/Ticket/Negative/TicketLackList.vue
+++ b/src/pages/Ticket/Negative/TicketLackList.vue
@@ -21,14 +21,13 @@ const selectedRows = ref([]);
 const tableRef = ref();
 const filterParams = ref({});
 const negativeParams = reactive({
-    days: useRole().likeAny('buyer') ? 2 : 0,
     warehouseFk: useState().getUser().value.warehouseFk,
+    availabled: Date.getCurrentDateTimeFormatted(),
 });
 const redirectToCreateView = ({ itemFk }) => {
     router.push({
         name: 'NegativeDetail',
         params: { id: itemFk },
-        query: { days: filterParams.value.days ?? negativeParams.days },
     });
 };
 const columns = computed(() => [
@@ -65,15 +64,19 @@ const columns = computed(() => [
         columnFilter: {
             component: 'input',
             type: 'number',
-            columnClass: 'shrink',
+            inWhere: false,
         },
     },
     {
         name: 'longName',
-        align: 'center',
+        align: 'left',
         label: t('negative.longName'),
         field: ({ longName }) => longName,
-
+        columnFilter: {
+            component: 'input',
+            inWhere: false,
+            useLike: true,
+        },
         sortable: true,
         headerStyle: 'width: 350px',
         cardVisible: true,
@@ -94,6 +97,11 @@ const columns = computed(() => [
         field: ({ inkFk }) => inkFk,
         sortable: true,
         cardVisible: true,
+        columnFilter: {
+            component: 'input',
+            columnClass: 'shrink',
+            inWhere: false,
+        },
     },
     {
         name: 'size',
@@ -155,7 +163,6 @@ const setUserParams = (params) => {
             <TicketLackFilter data-key="NegativeList" @set-user-params="setUserParams" />
         </template>
     </RightMenu>
-    {{ filterRef }}
     <VnTable
         ref="tableRef"
         data-key="NegativeList"
diff --git a/src/pages/Ticket/Negative/TicketLackTable.vue b/src/pages/Ticket/Negative/TicketLackTable.vue
index c9c2a7cad..2afe3af72 100644
--- a/src/pages/Ticket/Negative/TicketLackTable.vue
+++ b/src/pages/Ticket/Negative/TicketLackTable.vue
@@ -5,7 +5,7 @@ import { computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import FetchData from 'src/components/FetchData.vue';
-import { toDate, toHour } from 'src/filters';
+import { toDate } from 'src/filters';
 import useNotify from 'src/composables/useNotify.js';
 import ZoneDescriptorProxy from 'pages/Zone/Card/ZoneDescriptorProxy.vue';
 import { useRoute } from 'vue-router';
@@ -22,14 +22,6 @@ const $props = defineProps({
     },
 });
 
-watch(
-    () => $props.filter,
-    (v) => {
-        filterLack.value.where = v;
-        tableRef.value.reload(filterLack);
-    },
-);
-
 const filterLack = ref({
     include: [
         {
@@ -90,6 +82,7 @@ const columns = computed(() => [
     },
     {
         name: 'alertLevelCode',
+        field: 'alertLevelCode',
         label: t('negative.detail.state'),
         columnFilter: {
             name: 'alertLevelCode',
@@ -158,7 +151,6 @@ const saveChange = async (field, { row }) => {
         fetchItemLack.value.fetch();
     } catch (err) {
         console.error('Error saving changes', err);
-        f;
     }
 };
 
@@ -171,7 +163,11 @@ function onBuysFetched(data) {
     <FetchData
         ref="fetchItemLack"
         :url="`Tickets/itemLack`"
-        :params="{ id: entityId }"
+        :params="{
+            itemFk: entityId,
+            warehouseFk: $props.filter.warehouseFk,
+            availabled: Date.getCurrentDateTimeFormatted(),
+        }"
         @on-fetch="(data) => (itemLack = data[0])"
         auto-load
     />
@@ -207,6 +203,7 @@ function onBuysFetched(data) {
         dense
         :is-editable="true"
         :row-click="false"
+        :search-url="false"
         :right-search="false"
         :right-search-icon="false"
         v-model:selected="selectedRows"
@@ -214,7 +211,6 @@ function onBuysFetched(data) {
     >
         <template #top-left>
             <div style="display: flex; align-items: center" v-if="itemLack">
-                <!-- <VnImg :id="itemLack.itemFk" class="rounded image-wrapper"></VnImg> -->
                 <div class="flex column" style="align-items: center">
                     <QBadge
                         ref="badgeLackRef"
@@ -239,7 +235,7 @@ function onBuysFetched(data) {
 
         <template #column-status="{ row }">
             <QTd style="min-width: 150px">
-                <div class="icon-container">
+                <div class="flex items-start q-ma-sm">
                     <QIcon
                         v-if="row.isBasket"
                         name="vn:basket"
@@ -266,9 +262,10 @@ function onBuysFetched(data) {
                         size="xs"
                     >
                         <QTooltip>{{
-                            t('negative.detail.hasObservation')
-                        }}</QTooltip> </QIcon
-                    ><QIcon
+                            row?.note || t('negative.detail.hasObservation')
+                        }}</QTooltip>
+                    </QIcon>
+                    <QIcon
                         v-if="row.isRookie"
                         name="vn:Person"
                         size="xs"
@@ -305,9 +302,9 @@ function onBuysFetched(data) {
             </span>
         </template>
         <template #column-ticketFk="{ row }">
-            <span class="q-pa-sm link">
-                {{ row.id }}
-                <TicketDescriptorProxy :id="row.id" />
+            <span class="link" @click.stop>
+                {{ row.ticketFk }}
+                <TicketDescriptorProxy :id="row.ticketFk" />
             </span>
         </template>
         <template #column-alertLevelCode="props">
@@ -335,15 +332,6 @@ function onBuysFetched(data) {
     </VnTable>
 </template>
 <style lang="scss" scoped>
-.icon-container {
-    display: grid;
-    grid-template-columns: repeat(3, 0.2fr);
-    row-gap: 5px; /* Ajusta el espacio entre los iconos según sea necesario */
-}
-.icon-container > * {
-    width: 100%;
-    height: auto;
-}
 .list-enter-active,
 .list-leave-active {
     transition: all 1s ease;
diff --git a/src/pages/Ticket/Negative/components/ChangeItemDialog.vue b/src/pages/Ticket/Negative/components/ChangeItemDialog.vue
index e419b85c0..e77bcb3bb 100644
--- a/src/pages/Ticket/Negative/components/ChangeItemDialog.vue
+++ b/src/pages/Ticket/Negative/components/ChangeItemDialog.vue
@@ -2,7 +2,9 @@
 import { ref } from 'vue';
 import axios from 'axios';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import notifyResults from 'src/utils/notifyResults';
+import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
+
+const { notifyResults } = displayResults();
 const emit = defineEmits(['update-item']);
 
 const showChangeItemDialog = ref(false);
@@ -37,7 +39,6 @@ const updateItem = async () => {
 <template>
     <QCard class="q-pa-sm">
         <QCardSection class="row items-center justify-center column items-stretch">
-            {{ showChangeItemDialog }}
             <span>{{ $t('negative.detail.modal.changeItem.title') }}</span>
             <VnSelect
                 url="Items/WithName"
@@ -47,6 +48,7 @@ const updateItem = async () => {
                 option-label="name"
                 option-value="id"
                 v-model="newItem"
+                autofocus
             >
             </VnSelect>
         </QCardSection>
diff --git a/src/pages/Ticket/Negative/components/ChangeQuantityDialog.vue b/src/pages/Ticket/Negative/components/ChangeQuantityDialog.vue
index 2e9aac4f0..35cb2617e 100644
--- a/src/pages/Ticket/Negative/components/ChangeQuantityDialog.vue
+++ b/src/pages/Ticket/Negative/components/ChangeQuantityDialog.vue
@@ -2,8 +2,9 @@
 import { ref } from 'vue';
 import axios from 'axios';
 import VnInput from 'src/components/common/VnInput.vue';
-import notifyResults from 'src/utils/notifyResults';
+import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
 
+const { notifyResults } = displayResults();
 const showChangeQuantityDialog = ref(false);
 const newQuantity = ref(null);
 const $props = defineProps({
@@ -16,15 +17,16 @@ const emit = defineEmits(['update-quantity']);
 const updateQuantity = async () => {
     try {
         showChangeQuantityDialog.value = true;
-        const rowsToUpdate = $props.selectedRows.map(({ saleFk }) =>
+        const rowsToUpdate = $props.selectedRows.map(({ saleFk, ticketFk }) =>
             axios.post(`Sales/${saleFk}/updateQuantity`, {
                 saleFk,
+                ticketFk,
                 quantity: +newQuantity.value,
             }),
         );
 
         const result = await Promise.allSettled(rowsToUpdate);
-        notifyResults(result, 'saleFk');
+        notifyResults(result, 'ticketFk');
 
         emit('update-quantity', newQuantity.value);
     } catch (err) {
@@ -42,6 +44,7 @@ const updateQuantity = async () => {
                 :min="0"
                 :label="$t('negative.detail.modal.changeQuantity.placeholder')"
                 v-model="newQuantity"
+                autofocus
             />
         </QCardSection>
         <QCardActions align="right">
diff --git a/src/pages/Ticket/Negative/components/ChangeStateDialog.vue b/src/pages/Ticket/Negative/components/ChangeStateDialog.vue
index 1acc7e0ef..273006dcb 100644
--- a/src/pages/Ticket/Negative/components/ChangeStateDialog.vue
+++ b/src/pages/Ticket/Negative/components/ChangeStateDialog.vue
@@ -3,8 +3,9 @@ import { ref } from 'vue';
 import axios from 'axios';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
-import notifyResults from 'src/utils/notifyResults';
+import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
 
+const { notifyResults } = displayResults();
 const emit = defineEmits(['update-state']);
 const editableStates = ref([]);
 const showChangeStateDialog = ref(false);
@@ -49,6 +50,7 @@ const updateState = async () => {
                 :options="editableStates"
                 option-label="name"
                 option-value="code"
+                autofocus
             />
         </QCardSection>
         <QCardActions align="right">
diff --git a/src/pages/Ticket/Negative/composables/notifyResults.js b/src/pages/Ticket/Negative/composables/notifyResults.js
new file mode 100644
index 000000000..5f513cc04
--- /dev/null
+++ b/src/pages/Ticket/Negative/composables/notifyResults.js
@@ -0,0 +1,56 @@
+import { Notify } from 'quasar';
+import useOpenURL from 'src/composables/useOpenURL';
+import { useI18n } from 'vue-i18n';
+
+export function displayResults() {
+    const { t } = useI18n();
+
+    const createSuccessNotification = (id, path) => {
+        Notify.create({
+            type: 'positive',
+            message: t('globals.dataSaved'),
+            actions: [
+                {
+                    label: t('globals.openDetail'),
+                    color: 'white',
+                    handler: () => useOpenURL(`#/ticket/${id}/${path}`),
+                },
+            ],
+        });
+    };
+
+    const handleResult = (result, key, path) => {
+        if (result.status !== 'fulfilled') {
+            const data = JSON.parse(result.reason.config.data);
+            const error =
+                result.reason.response?.data?.error?.message ?? result.reason.message;
+            Notify.create({
+                type: 'negative',
+                message: `Ticket ${data[key]}: ${error}`,
+            });
+            return;
+        }
+
+        const data = JSON.parse(result.value.config.data);
+        let id = data[key];
+
+        if (result.value.data.status === 'noSplit') {
+            Notify.create({
+                type: 'warning',
+                message: `Ticket ${id}: ${t('negative.split.noSplit')}`,
+            });
+            return;
+        }
+
+        if (result.value.data.status === 'split') {
+            id = result.value.data.newTicket;
+        }
+
+        createSuccessNotification(id, path);
+    };
+
+    const notifyResults = (results, key, path = 'sale') =>
+        results.forEach((result) => handleResult(result, key, path));
+
+    return { notifyResults };
+}
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index e44133065..9e9b17ca6 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/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" />
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 3612cb24a..096aa101c 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/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,
         }"
     >
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 2e44df7aa..175f0955b 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -236,6 +236,7 @@ negative:
     minTimed: minTimed
     negativeAction: Negative
     totalNegative: Total negatives
+    availabled: Availabled
     days: Days
     buttonsUpdate:
         item: Item
@@ -265,7 +266,7 @@ negative:
         isRookie: Is rookie
         turno: Turn line
         isBasket: Basket
-        hasObservation: Has substitution
+        hasObservation: Has substitution note
         hasToIgnore: VIP
         modal:
             changeItem:
@@ -288,3 +289,4 @@ negative:
         newTicket: New ticket
         status: Result
         message: Message
+        noSplit: No split
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 62013d9c5..3d03a7b33 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -216,7 +216,8 @@ ticketList:
 negative:
     hour: Hora
     id: Id Articulo
-    longName: Articulo
+    longName: Artículo
+    itemFk: Artículo
     supplier: Productor
     colour: Color
     size: Medida
@@ -232,6 +233,7 @@ negative:
     inkFk: Color
     timed: Hora
     date: Fecha
+    availabled: Disponible
     minTimed: Hora
     type: Tipo
     negativeAction: Negativo
@@ -265,7 +267,7 @@ negative:
         isRookie: Cliente nuevo
         turno: Linea turno
         isBasket: Cesta
-        hasObservation: Tiene sustitución
+        hasObservation: Tiene nota de sustitución
         hasToIgnore: VIP
         modal:
             changeItem:
@@ -284,10 +286,11 @@ negative:
                 title: Gestionar tickets spliteados
                 subTitle: Confir fecha y agencia
     split:
-        ticket: Ticket viejo
+        ticket: Ticket origen
         newTicket: Ticket nuevo
         status: Estado
         message: Mensaje
+        noSplit: No se puede splitar
     rounding: Redondeo
     noVerifiedData: Sin datos comprobados
     purchaseRequest: Petición de compra
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index f2bcc1247..a6ec86355 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -27,7 +27,7 @@ const entityId = computed(() => {
 <template>
     <EntityDescriptor :url="`Zones/${entityId}`" :filter="filter" data-key="Zone">
         <template #menu="{ entity }">
-            <ZoneDescriptorMenuItems :zone="entity" />
+            <ZoneDescriptorMenuItems />
         </template>
         <template #body="{ entity }">
             <VnLv :label="$t('list.agency')" :value="entity.agencyMode?.name" />
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 8d7c4a165..355eb900e 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -93,6 +93,7 @@ const columns = computed(() => [
             optionLabel: 'name',
             optionValue: 'id',
         },
+        columnClass: 'expand',
     },
     {
         align: 'left',
@@ -247,74 +248,70 @@ const closeEventForm = () => {
                     </QBtnGroup>
                 </template>
             </VnSubToolbar>
-            <div class="table-container">
-                <div class="column items-center">
-                    <VnTable
-                        ref="tableRef"
-                        :data-key="dataKey"
-                        :columns="columns"
-                        redirect="Zone"
-                        :create="{
-                            urlCreate: 'Zones',
-                            title: t('list.createZone'),
-                            onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
-                            formInitialData: {},
-                        }"
-                        table-height="85vh"
-                        v-model:selected="selectedRows"
-                        :table="{
-                            'row-key': 'id',
-                            selection: 'multiple',
-                        }"
-                    >
-                        <template #column-addressFk="{ row }">
-                            {{ dashIfEmpty(formatRow(row)) }}
-                        </template>
-                        <template #more-create-dialog="{ data }">
-                            <VnSelect
-                                url="AgencyModes"
-                                v-model="data.agencyModeFk"
-                                option-value="id"
-                                option-label="name"
-                                :label="t('list.agency')"
-                            />
-                            <VnInput
-                                v-model="data.price"
-                                :label="t('list.price')"
-                                min="0"
-                                type="number"
-                                required="true"
-                            />
-                            <VnInput
-                                v-model="data.bonus"
-                                :label="t('zone.bonus')"
-                                min="0"
-                                type="number"
-                            />
-                            <VnInput
-                                v-model="data.travelingDays"
-                                :label="t('zone.travelingDays')"
-                                type="number"
-                                min="0"
-                            />
-                            <VnInputTime v-model="data.hour" :label="t('list.close')" />
-                            <VnSelect
-                                url="Warehouses"
-                                v-model="data.warehouseFK"
-                                option-value="id"
-                                option-label="name"
-                                :label="t('list.warehouse')"
-                                :options="warehouseOptions"
-                            />
-                            <QCheckbox
-                                v-model="data.isVolumetric"
-                                :label="t('list.isVolumetric')"
-                                :toggle-indeterminate="false"
-                            />
-                        </template>
-                    </VnTable>
-                </div>
-            </div>
+            <VnTable
+                ref="tableRef"
+                :data-key="dataKey"
+                :columns="columns"
+                redirect="Zone"
+                :create="{
+                    urlCreate: 'Zones',
+                    title: t('list.createZone'),
+                    onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
+                    formInitialData: {},
+                }"
+                table-height="85vh"
+                v-model:selected="selectedRows"
+                :table="{
+                    'row-key': 'id',
+                    selection: 'multiple',
+                }"
+            >
+                <template #column-addressFk="{ row }">
+                    {{ dashIfEmpty(formatRow(row)) }}
+                </template>
+                <template #more-create-dialog="{ data }">
+                    <VnSelect
+                        url="AgencyModes"
+                        v-model="data.agencyModeFk"
+                        option-value="id"
+                        option-label="name"
+                        :label="t('list.agency')"
+                    />
+                    <VnInput
+                        v-model="data.price"
+                        :label="t('list.price')"
+                        min="0"
+                        type="number"
+                        required="true"
+                    />
+                    <VnInput
+                        v-model="data.bonus"
+                        :label="t('zone.bonus')"
+                        min="0"
+                        type="number"
+                    />
+                    <VnInput
+                        v-model="data.travelingDays"
+                        :label="t('zone.travelingDays')"
+                        type="number"
+                        min="0"
+                    />
+                    <VnInputTime v-model="data.hour" :label="t('list.close')" />
+                    <VnSelect
+                        url="Warehouses"
+                        v-model="data.warehouseFK"
+                        option-value="id"
+                        option-label="name"
+                        :label="t('list.warehouse')"
+                        :options="warehouseOptions"
+                    />
+                    <QCheckbox
+                        v-model="data.isVolumetric"
+                        :label="t('list.isVolumetric')"
+                        :toggle-indeterminate="false"
+                    />
+                </template>
+            </VnTable>
         </template>
     </VnSection>
     <QDialog v-model="showZoneEventForm" @hide="closeEventForm()">
@@ -333,24 +330,6 @@ const closeEventForm = () => {
         />
     </QDialog>
 </template>
-
-<style lang="scss" scoped>
-.table-container {
-    display: flex;
-    justify-content: center;
-}
-.column {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    min-width: 70%;
-}
-
-:deep(.shrink-column) {
-    width: 8%;
-}
-</style>
-
 <i18n>
 es:
     Search zone: Buscar zona
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 0dd41c86e..2b7cfc5be 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -166,7 +166,11 @@ const vehicleCard = {
     component: () => import('src/pages/Route/Vehicle/Card/VehicleCard.vue'),
     redirect: { name: 'VehicleSummary' },
     meta: {
-        menu: ['VehicleBasicData', 'VehicleNotes'],
+        menu: [
+            'VehicleBasicData',
+            'VehicleNotes',
+            'VehicleDms',
+        ],
     },
     children: [
         {
@@ -195,7 +199,16 @@ const vehicleCard = {
                 icon: 'vn:notes',
             },
             component: () => import('src/pages/Route/Vehicle/Card/VehicleNotes.vue'),
-        }
+        },
+        {
+            name: 'VehicleDms',
+            path: 'dms',
+            meta: {
+                title: 'dms',
+                icon: 'cloud_upload',
+            },
+            component: () => import('src/pages/Route/Vehicle/VehicleDms.vue'),
+        },
     ],
 };
 
diff --git a/src/stores/__tests__/useStateQueryStore.spec.js b/src/stores/__tests__/useStateQueryStore.spec.js
index ab3afb007..7bdb87ced 100644
--- a/src/stores/__tests__/useStateQueryStore.spec.js
+++ b/src/stores/__tests__/useStateQueryStore.spec.js
@@ -1,22 +1,23 @@
 import { describe, expect, it, beforeEach, beforeAll } from 'vitest';
-import { createWrapper } from 'app/test/vitest/helper';
+import { setActivePinia, createPinia } from 'pinia';
 
 import { useStateQueryStore } from 'src/stores/useStateQueryStore';
 
 describe('useStateQueryStore', () => {
-    beforeAll(() => {
-        createWrapper({}, {});
-    });
-
-    const stateQueryStore = useStateQueryStore();
-    const { add, isLoading, remove, reset } = useStateQueryStore();
+    let stateQueryStore;
+    let add, isLoading, remove, reset;
     const firstQuery = { url: 'myQuery' };
 
     function getQueries() {
         return stateQueryStore.queries;
     }
+    beforeAll(() => {
+        setActivePinia(createPinia());
+    });
 
     beforeEach(() => {
+        stateQueryStore = useStateQueryStore();
+        ({ add, isLoading, remove, reset } = useStateQueryStore());
         reset();
         expect(getQueries().size).toBeFalsy();
     });
diff --git a/src/utils/notifyResults.js b/src/utils/notifyResults.js
deleted file mode 100644
index e87ad6c6f..000000000
--- a/src/utils/notifyResults.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Notify } from 'quasar';
-
-export default function (results, key) {
-    results.forEach((result, index) => {
-        if (result.status === 'fulfilled') {
-            const data = JSON.parse(result.value.config.data);
-            Notify.create({
-                type: 'positive',
-                message: `Operación (${index + 1}) ${data[key]} completada con éxito.`,
-            });
-        } else {
-            const data = JSON.parse(result.reason.config.data);
-            Notify.create({
-                type: 'negative',
-                message: `Operación (${index + 1}) ${data[key]} fallida: ${result.reason.message}`,
-            });
-        }
-    });
-}
diff --git a/test/cypress/integration/claim/claimAction.spec.js b/test/cypress/integration/claim/claimAction.spec.js
index 6e916451c..674313a5a 100644
--- a/test/cypress/integration/claim/claimAction.spec.js
+++ b/test/cypress/integration/claim/claimAction.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe.skip('ClaimAction', () => {
+describe('ClaimAction', () => {
     const claimId = 1;
 
     const firstRow = 'tbody > :nth-child(1)';
@@ -15,13 +15,13 @@ describe.skip('ClaimAction', () => {
     });
 
     // https://redmine.verdnatura.es/issues/8756
-    xit('should change destination', () => {
+    it.skip('should change destination', () => {
         const rowData = [true, null, null, 'Bueno'];
         cy.fillRow(firstRow, rowData);
     });
 
     // https://redmine.verdnatura.es/issues/8756
-    xit('should change destination from other button', () => {
+    it.skip('should change destination from other button', () => {
         const rowData = [true];
 
         cy.fillRow(firstRow, rowData);
@@ -35,7 +35,7 @@ describe.skip('ClaimAction', () => {
     });
 
     // https://redmine.verdnatura.es/issues/8756
-    xit('should remove the line', () => {
+    it.skip('should remove the line', () => {
         cy.fillRow(firstRow, [true]);
         cy.removeCard();
         cy.clickConfirm();
diff --git a/test/cypress/integration/claim/claimDevelopment.spec.js b/test/cypress/integration/claim/claimDevelopment.spec.js
index 1fb77fe20..ed1e7c0a5 100755
--- a/test/cypress/integration/claim/claimDevelopment.spec.js
+++ b/test/cypress/integration/claim/claimDevelopment.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe.skip('ClaimDevelopment', () => {
+describe('ClaimDevelopment', () => {
     const claimId = 1;
     const firstLineReason = 'tbody > :nth-child(1) > :nth-child(2)';
     const thirdRow = 'tbody > :nth-child(3)';
diff --git a/test/cypress/integration/customer/clientList.spec.js b/test/cypress/integration/customer/clientList.spec.js
index caf94b8bd..7b1da6d89 100644
--- a/test/cypress/integration/customer/clientList.spec.js
+++ b/test/cypress/integration/customer/clientList.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe.skip('Client list', () => {
+describe('Client list', () => {
     beforeEach(() => {
         cy.login('developer');
         cy.visit('/#/customer/list', {
diff --git a/test/cypress/integration/entry/commands.js b/test/cypress/integration/entry/commands.js
index 4d4a8f980..87e3c3bfa 100644
--- a/test/cypress/integration/entry/commands.js
+++ b/test/cypress/integration/entry/commands.js
@@ -7,7 +7,7 @@ Cypress.Commands.add('selectTravel', (warehouse = '1') => {
 });
 
 Cypress.Commands.add('deleteEntry', () => {
-    cy.get('[data-cy="descriptor-more-opts"]').should('be.visible').click();
+    cy.dataCy('descriptor-more-opts').should('be.visible').click();
     cy.waitForElement('div[data-cy="delete-entry"]').click();
 });
 
diff --git a/test/cypress/integration/entry/entryCard/entryBasicData.spec.js b/test/cypress/integration/entry/entryCard/entryBasicData.spec.js
index de8bc6bc9..11643c566 100644
--- a/test/cypress/integration/entry/entryCard/entryBasicData.spec.js
+++ b/test/cypress/integration/entry/entryCard/entryBasicData.spec.js
@@ -1,6 +1,6 @@
 import '../commands.js';
 
-describe('EntryBasicData', () => {
+describe.skip('EntryBasicData', () => {
     beforeEach(() => {
         cy.login('buyer');
         cy.visit(`/#/entry/list`);
diff --git a/test/cypress/integration/entry/entryCard/entryDescriptor.spec.js b/test/cypress/integration/entry/entryCard/entryDescriptor.spec.js
index d6f2b2543..2e121064c 100644
--- a/test/cypress/integration/entry/entryCard/entryDescriptor.spec.js
+++ b/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`);
diff --git a/test/cypress/integration/entry/entryWasteRecalc.spec.js b/test/cypress/integration/entry/entryWasteRecalc.spec.js
index bd50e9c19..902d5bbc5 100644
--- a/test/cypress/integration/entry/entryWasteRecalc.spec.js
+++ b/test/cypress/integration/entry/entryWasteRecalc.spec.js
@@ -10,7 +10,7 @@ describe('EntryDms', () => {
         cy.dataCy('recalc').should('be.disabled');
 
         cy.dataCy('dateFrom').should('be.visible').click().type('01-01-2001');
-        cy.dataCy('dateTo').should('be.visible').click().type('01-01-2001');
+        cy.dataCy('dateTo').should('be.visible').click().type('01-01-2001{enter}');
 
         cy.dataCy('recalc').should('be.enabled').click();
         cy.get('.q-notification__message').should(
diff --git a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
index 641650436..fd6f1c238 100644
--- a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
@@ -84,7 +84,7 @@ describe('InvoiceInDescriptor', () => {
 
         beforeEach(() => cy.visit(`/#/invoice-in/${originalId}/summary`));
 
-        it('should create a correcting invoice and redirect to original invoice', () => {
+        it.skip('should create a correcting invoice and redirect to original invoice', () => {
             createCorrective();
             redirect(originalId);
         });
diff --git a/test/cypress/integration/invoiceOut/invoiceOutList.spec.js b/test/cypress/integration/invoiceOut/invoiceOutList.spec.js
index ba6f3e122..50ea01764 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutList.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutList.spec.js
@@ -31,7 +31,7 @@ describe('InvoiceOut list', () => {
     it.skip('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', 'A1111111');
+        cy.get('.summaryHeader > div').should('include.text', 'V10100001');
     });
 
     it('should open the client descriptor', () => {
diff --git a/test/cypress/integration/invoiceOut/invvoiceOutGlobal.spec.js b/test/cypress/integration/invoiceOut/invvoiceOutGlobal.spec.js
index 0170970a5..c6f75ef5f 100644
--- a/test/cypress/integration/invoiceOut/invvoiceOutGlobal.spec.js
+++ b/test/cypress/integration/invoiceOut/invvoiceOutGlobal.spec.js
@@ -22,6 +22,7 @@ describe('InvoiceOut global invoicing', () => {
         cy.get('.q-date__years-content > :nth-child(2) > .q-btn').click();
         cy.get('.q-date__calendar-days > :nth-child(6) > .q-btn').click();
         cy.get('[label="Max date ticket"]').type('01-01-2001{enter}');
+        cy.dataCy('formSubmitBtn').click();
         cy.get('.q-card').should('be.visible');
     });
 });
diff --git a/test/cypress/integration/item/itemList.spec.js b/test/cypress/integration/item/itemList.spec.js
index bd8108344..7950f2bda 100644
--- a/test/cypress/integration/item/itemList.spec.js
+++ b/test/cypress/integration/item/itemList.spec.js
@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
 
-describe.skip('Item list', () => {
+describe('Item list', () => {
     beforeEach(() => {
         cy.login('developer');
         cy.visit(`/#/item/list`);
diff --git a/test/cypress/integration/login/logout.spec.js b/test/cypress/integration/login/logout.spec.js
index 9f022617d..b17e42794 100644
--- a/test/cypress/integration/login/logout.spec.js
+++ b/test/cypress/integration/login/logout.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe.skip('Logout', () => {
+describe('Logout', () => {
     beforeEach(() => {
         cy.login('developer');
         cy.visit(`/#/dashboard`);
diff --git a/test/cypress/integration/order/orderCatalog.spec.js b/test/cypress/integration/order/orderCatalog.spec.js
index 8ff6f4240..4f6371f32 100644
--- a/test/cypress/integration/order/orderCatalog.spec.js
+++ b/test/cypress/integration/order/orderCatalog.spec.js
@@ -34,7 +34,7 @@ describe('OrderCatalog', () => {
         searchByCustomTagInput('Silver');
     });
 
-    it.skip('filters by custom value dialog', () => {
+    it('filters by custom value dialog', () => {
         Cypress.on('uncaught:exception', (err) => {
             if (err.message.includes('canceled')) {
                 return false;
diff --git a/test/cypress/integration/route/routeAutonomous.spec.js b/test/cypress/integration/route/routeAutonomous.spec.js
index 6aaa2a85e..b61431bfb 100644
--- a/test/cypress/integration/route/routeAutonomous.spec.js
+++ b/test/cypress/integration/route/routeAutonomous.spec.js
@@ -1,11 +1,12 @@
-describe.skip('RouteAutonomous', () => {
-    const getLinkSelector = (colField) =>
-        `tr:first-child > [data-col-field="${colField}"] > .no-padding > .link`;
+describe('RouteAutonomous', () => {
+    const getLinkSelector = (colField, link = true) =>
+        `tr:first-child > [data-col-field="${colField}"] > .no-padding${link ? ' > .link' : ''}`;
 
     const selectors = {
-        reference: 'Reference_input',
-        date: 'tr:first-child > [data-col-field="dated"]',
         total: '.value > .text-h6',
+        routeId: getLinkSelector('routeFk', false),
+        agencyRoute: getLinkSelector('agencyModeName'),
+        agencyAgreement: getLinkSelector('agencyAgreement'),
         received: getLinkSelector('invoiceInFk'),
         autonomous: getLinkSelector('supplierName'),
         firstRowCheckbox: '.q-virtual-scroll__content tr:first-child .q-checkbox__bg',
@@ -13,22 +14,30 @@ describe.skip('RouteAutonomous', () => {
         createInvoiceBtn: '.q-card > .q-btn',
         saveFormBtn: 'FormModelPopup_save',
         summaryIcon: 'tableAction-0',
-        summaryPopupBtn: '.header > :nth-child(2) > .q-btn__content > .q-icon',
-        summaryHeader: '.summaryHeader > :nth-child(2)',
-        descriptorHeader: '.summaryHeader > div',
-        descriptorTitle: '.q-item__label--header > .title > span',
-        summaryGoToSummaryBtn: '.header > .q-icon',
-        descriptorGoToSummaryBtn: '.descriptor > .header > a[href] > .q-btn',
+        descriptorRouteSubtitle: '[data-cy="vnDescriptor_subtitle"]',
+        descriptorAgencyAndSupplierTitle: '[data-cy="vnDescriptor_description"]',
+        descriptorInvoiceInTitle: '[data-cy="vnDescriptor_title"]',
+        descriptorOpenSummaryBtn: '.q-menu > .descriptor [data-cy="openSummaryBtn"]',
+        descriptorGoToSummaryBtn: '.q-menu > .descriptor [data-cy="goToSummaryBtn"]',
+        summaryGoToSummaryBtn: '.summaryHeader [data-cy="goToSummaryBtn"]',
     };
 
-    const data = {
-        reference: 'Test invoice',
-        total: '€206.40',
-        supplier: 'PLANTS SL',
-        route: 'first route',
+    const newInvoice = {
+        Reference: { val: 'Test invoice' },
+        Company: { val: 'VNL', type: 'select' },
+        Warehouse: { val: 'Warehouse One', type: 'select' },
+        Type: { val: 'Vehiculos', type: 'select' },
+        Description: { val: 'Test description' },
     };
 
-    const summaryUrl = '/summary';
+    const total = '€206.40';
+
+    const urls = {
+        summaryAgencyUrlRegex: /agency\/\d+\/summary/,
+        summaryInvoiceInUrlRegex: /invoice-in\/\d+\/summary/,
+        summarySupplierUrlRegex: /supplier\/\d+\/summary/,
+        summaryRouteUrlRegex: /route\/\d+\/summary/,
+    };
     const dataSaved = 'Data saved';
 
     beforeEach(() => {
@@ -44,10 +53,10 @@ describe.skip('RouteAutonomous', () => {
             .should('have.length.greaterThan', 0);
     });
 
-    it('Should create invoice in to selected route', () => {
+    it.skip('Should create invoice in to selected route', () => {
         cy.get(selectors.firstRowCheckbox).click();
         cy.get(selectors.createInvoiceBtn).click();
-        cy.dataCy(selectors.reference).type(data.reference);
+        cy.fillInForm(newInvoice);
         cy.dataCy('attachFile').click();
         cy.get('.q-file').selectFile('test/cypress/fixtures/image.jpg', {
             force: true,
@@ -59,62 +68,120 @@ describe.skip('RouteAutonomous', () => {
     it('Should display the total price of the selected rows', () => {
         cy.get(selectors.firstRowCheckbox).click();
         cy.get(selectors.secondRowCheckbox).click();
-        cy.validateContent(selectors.total, data.total);
+        cy.validateContent(selectors.total, total);
     });
 
     it('Should redirect to the summary when clicking a route', () => {
-        cy.get(selectors.date).click();
-        cy.get(selectors.summaryHeader).should('contain', data.route);
-        cy.url().should('include', summaryUrl);
+        cy.checkRedirectionFromPopUp({
+            selectorToClick: selectors.routeId,
+            expectedUrlRegex: urls.summaryRouteUrlRegex,
+            expectedTextSelector: selectors.descriptorRouteSubtitle,
+        });
+    });
+
+    describe('Agency route pop-ups', () => {
+        it('Should redirect to the agency route summary from the agency route descriptor pop-up', () => {
+            cy.checkRedirectionFromPopUp({
+                selectorToClick: selectors.agencyRoute,
+                steps: [selectors.descriptorGoToSummaryBtn],
+                expectedUrlRegex: urls.summaryAgencyUrlRegex,
+                expectedTextSelector: selectors.descriptorAgencyAndSupplierTitle,
+            });
+        });
+
+        it('Should redirect to the agency route summary from summary pop-up from the agency route descriptor pop-up', () => {
+            cy.checkRedirectionFromPopUp({
+                selectorToClick: selectors.agencyRoute,
+                steps: [
+                    selectors.descriptorOpenSummaryBtn,
+                    selectors.summaryGoToSummaryBtn,
+                ],
+                expectedUrlRegex: urls.summaryAgencyUrlRegex,
+                expectedTextSelector: selectors.descriptorAgencyAndSupplierTitle,
+            });
+        });
+    });
+
+    describe('Agency route pop-ups', () => {
+        it('Should redirect to the agency agreement summary from the agency agreement descriptor pop-up', () => {
+            cy.checkRedirectionFromPopUp({
+                selectorToClick: selectors.agencyAgreement,
+                steps: [selectors.descriptorGoToSummaryBtn],
+                expectedUrlRegex: urls.summaryAgencyUrlRegex,
+                expectedTextSelector: selectors.descriptorAgencyAndSupplierTitle,
+            });
+        });
+
+        it('Should redirect to the agency agreement summary from summary pop-up from the agency agreement descriptor pop-up', () => {
+            cy.checkRedirectionFromPopUp({
+                selectorToClick: selectors.agencyAgreement,
+                steps: [
+                    selectors.descriptorOpenSummaryBtn,
+                    selectors.summaryGoToSummaryBtn,
+                ],
+                expectedUrlRegex: urls.summaryAgencyUrlRegex,
+                expectedTextSelector: selectors.descriptorAgencyAndSupplierTitle,
+            });
+        });
     });
 
     describe('Received pop-ups', () => {
-        it('Should redirect to invoice in summary from the received descriptor pop-up', () => {
-            cy.get(selectors.received).click();
-            cy.validateContent(selectors.descriptorTitle, data.reference);
-            cy.get(selectors.descriptorGoToSummaryBtn).click();
-            cy.get(selectors.descriptorHeader).should('contain', data.supplier);
-            cy.url().should('include', summaryUrl);
+        it('Should redirect to the invoice in summary from the received descriptor pop-up', () => {
+            cy.checkRedirectionFromPopUp({
+                selectorToClick: selectors.received,
+                steps: [selectors.descriptorGoToSummaryBtn],
+                expectedUrlRegex: urls.summaryInvoiceInUrlRegex,
+                expectedTextSelector: selectors.descriptorInvoiceInTitle,
+            });
         });
 
         it('Should redirect to the invoiceIn summary from summary pop-up from the received descriptor pop-up', () => {
-            cy.get(selectors.received).click();
-            cy.validateContent(selectors.descriptorTitle, data.reference);
-            cy.get(selectors.summaryPopupBtn).click();
-            cy.get(selectors.descriptorHeader).should('contain', data.supplier);
-            cy.get(selectors.summaryGoToSummaryBtn).click();
-            cy.get(selectors.descriptorHeader).should('contain', data.supplier);
-            cy.url().should('include', summaryUrl);
+            cy.checkRedirectionFromPopUp({
+                selectorToClick: selectors.received,
+                steps: [
+                    selectors.descriptorOpenSummaryBtn,
+                    selectors.summaryGoToSummaryBtn,
+                ],
+                expectedUrlRegex: urls.summaryInvoiceInUrlRegex,
+                expectedTextSelector: selectors.descriptorInvoiceInTitle,
+            });
         });
     });
 
     describe('Autonomous pop-ups', () => {
         it('Should redirect to the supplier summary from the received descriptor pop-up', () => {
-            cy.get(selectors.autonomous).click();
-            cy.validateContent(selectors.descriptorTitle, data.supplier);
-            cy.get(selectors.descriptorGoToSummaryBtn).click();
-            cy.get(selectors.summaryHeader).should('contain', data.supplier);
-            cy.url().should('include', summaryUrl);
+            cy.checkRedirectionFromPopUp({
+                selectorToClick: selectors.autonomous,
+                steps: [selectors.descriptorGoToSummaryBtn],
+                expectedUrlRegex: urls.summarySupplierUrlRegex,
+                expectedTextSelector: selectors.descriptorAgencyAndSupplierTitle,
+            });
         });
 
         it('Should redirect to the supplier summary from summary pop-up from the autonomous descriptor pop-up', () => {
-            cy.get(selectors.autonomous).click();
-            cy.get(selectors.descriptorTitle).should('contain', data.supplier);
-            cy.get(selectors.summaryPopupBtn).click();
-            cy.get(selectors.summaryHeader).should('contain', data.supplier);
-            cy.get(selectors.summaryGoToSummaryBtn).click();
-            cy.get(selectors.summaryHeader).should('contain', data.supplier);
-            cy.url().should('include', summaryUrl);
+            cy.checkRedirectionFromPopUp({
+                selectorToClick: selectors.autonomous,
+                steps: [
+                    selectors.descriptorOpenSummaryBtn,
+                    selectors.summaryGoToSummaryBtn,
+                ],
+                expectedUrlRegex: urls.summarySupplierUrlRegex,
+                expectedTextSelector: selectors.descriptorAgencyAndSupplierTitle,
+            });
         });
     });
 
     describe('Route pop-ups', () => {
         it('Should redirect to the summary from the route summary pop-up', () => {
-            cy.dataCy(selectors.summaryIcon).first().click();
-            cy.get(selectors.summaryHeader).should('contain', data.route);
-            cy.get(selectors.summaryGoToSummaryBtn).click();
-            cy.get(selectors.summaryHeader).should('contain', data.route);
-            cy.url().should('include', summaryUrl);
+            cy.get(selectors.routeId)
+                .invoke('text')
+                .then((routeId) => {
+                    routeId = routeId.trim();
+                    cy.dataCy(selectors.summaryIcon).first().click();
+                    cy.get(selectors.summaryGoToSummaryBtn).click();
+                    cy.url().should('match', urls.summaryRouteUrlRegex);
+                    cy.containContent(selectors.descriptorRouteSubtitle, routeId);
+                });
         });
     });
 });
diff --git a/test/cypress/integration/route/routeExtendedList.spec.js b/test/cypress/integration/route/routeExtendedList.spec.js
index 83ecac122..d2b4e2108 100644
--- a/test/cypress/integration/route/routeExtendedList.spec.js
+++ b/test/cypress/integration/route/routeExtendedList.spec.js
@@ -69,7 +69,8 @@ describe.skip('Route extended list', () => {
                     .type(`{selectall}{backspace}${value}`);
                 break;
             case 'checkbox':
-                cy.get(selector).should('be.visible').click().click();
+                cy.get(selector).should('be.visible').click()
+                cy.get(selector).click();
                 break;
         }
     }
diff --git a/test/cypress/integration/route/vehicle/vehicleDms.spec.js b/test/cypress/integration/route/vehicle/vehicleDms.spec.js
new file mode 100644
index 000000000..4d9250e0f
--- /dev/null
+++ b/test/cypress/integration/route/vehicle/vehicleDms.spec.js
@@ -0,0 +1,147 @@
+describe('Vehicle DMS', () => {
+    const getSelector = (btnPosition) =>
+        `tr:last-child > .text-right > .no-wrap > :nth-child(${btnPosition}) > .q-btn > .q-btn__content > .q-icon`;
+
+    const selectors = {
+        lastRowDownloadBtn: getSelector(1),
+        lastRowEditBtn: getSelector(2),
+        lastRowDeleteBtn: getSelector(3),
+        lastRowReference: 'tr:last-child > :nth-child(5) > .q-tr > :nth-child(1) > span',
+        firstRowReference:
+            'tr:first-child > :nth-child(5) > .q-tr > :nth-child(1) > span',
+        firstRowId: 'tr:first-child > :nth-child(2) > .q-tr > :nth-child(1) > span',
+        lastRowWorkerLink: 'tr:last-child > :nth-child(8) > .q-tr > .link',
+        descriptorTitle: '.descriptor .title',
+        descriptorOpenSummaryBtn: '.q-menu .descriptor [data-cy="openSummaryBtn"]',
+        descriptorGoToSummaryBtn: '.q-menu .descriptor [data-cy="goToSummaryBtn"]',
+        summaryGoToSummaryBtn: '.summaryHeader [data-cy="goToSummaryBtn"]',
+        summaryTitle: '.summaryHeader',
+        referenceInput: 'Reference_input',
+        companySelect: 'Company_select',
+        warehouseSelect: 'Warehouse_select',
+        typeSelect: 'Type_select',
+        fileInput: 'VnDms_inputFile',
+        importBtn: '[data-cy="importBtn"]',
+        addBtn: '[data-cy="addButton"]',
+        saveFormBtn: 'FormModelPopup_save',
+    };
+
+    const data = {
+        Reference: { val: 'Vehicle:1234-ABC' },
+        Company: { val: 'VNL', type: 'select' },
+        Warehouse: { val: 'Warehouse One', type: 'select' },
+        Type: { val: 'Vehiculos', type: 'select' },
+    };
+
+    const updateData = {
+        Reference: { val: 'Vehicle:4598-FGH' },
+        Company: { val: 'CCs', type: 'select' },
+        Warehouse: { val: 'Warehouse Two', type: 'select' },
+        Type: { val: 'Facturas Recibidas', type: 'select' },
+    };
+
+    const workerSummaryUrlRegex = /worker\/\d+\/summary/;
+
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/route/vehicle/1/dms`);
+    });
+
+    it('should display vehicle DMS', () => {
+        cy.get('.q-table')
+            .children()
+            .should('be.visible')
+            .should('have.length.greaterThan', 0);
+    });
+
+    it.skip('Should download DMS', () => {
+        const fileName = '11.jpg';
+        cy.intercept('GET', /\/api\/dms\/11\/downloadFile/).as('download');
+        cy.get(selectors.lastRowDownloadBtn).click();
+
+        cy.wait('@download').then((interception) => {
+            expect(interception.response.statusCode).to.equal(200);
+            expect(interception.response.headers['content-disposition']).to.contain(
+                fileName,
+            );
+        });
+    });
+
+    it('Should create new DMS', () => {
+        const formSelectors = {
+            actionBtn: selectors.addBtn,
+            fileInput: selectors.fileInput,
+            saveFormBtn: selectors.saveFormBtn,
+        };
+
+        cy.testDmsAction('create', formSelectors, data, 'Data saved');
+    });
+
+    it('Should import DMS', () => {
+        const data = {
+            Document: { val: '10', type: 'select' },
+        };
+        const formSelectors = {
+            actionBtn: selectors.importBtn,
+            selectorContentToCheck: selectors.lastRowReference,
+            saveFormBtn: selectors.saveFormBtn,
+        };
+
+        cy.testDmsAction('import', formSelectors, data, 'Data saved', '1');
+    });
+
+    it('Should edit DMS', () => {
+        const formSelectors = {
+            actionBtn: selectors.lastRowEditBtn,
+            selectorContentToCheck: selectors.lastRowReference,
+            saveFormBtn: selectors.saveFormBtn,
+        };
+
+        cy.testDmsAction(
+            'edit',
+            formSelectors,
+            updateData,
+            'Data saved',
+            updateData.Reference.val,
+        );
+    });
+
+    it('Should delete DMS', () => {
+        const formSelectors = {
+            actionBtn: selectors.lastRowDeleteBtn,
+            selectorContentToCheck: selectors.lastRowReference,
+        };
+
+        cy.testDmsAction(
+            'delete',
+            formSelectors,
+            null,
+            'Data deleted',
+            'Vehicle:3333-BAT',
+        );
+    });
+
+    describe('Worker pop-ups', () => {
+        it('Should redirect to worker summary from worker descriptor pop-up', () => {
+            cy.checkRedirectionFromPopUp({
+                selectorToClick: selectors.lastRowWorkerLink,
+                steps: [selectors.descriptorGoToSummaryBtn],
+                expectedUrlRegex: workerSummaryUrlRegex,
+                expectedTextSelector: selectors.descriptorTitle,
+            });
+        });
+
+        it('Should redirect to worker summary from summary pop-up from worker descriptor pop-up', () => {
+            cy.checkRedirectionFromPopUp({
+                selectorToClick: selectors.lastRowWorkerLink,
+                steps: [
+                    selectors.descriptorOpenSummaryBtn,
+                    selectors.summaryGoToSummaryBtn,
+                ],
+                expectedUrlRegex: workerSummaryUrlRegex,
+                expectedTextSelector: selectors.descriptorTitle,
+            });
+        });
+    });
+});
diff --git a/test/cypress/integration/vnComponent/VnShortcut.spec.js b/test/cypress/integration/vnComponent/VnShortcut.spec.js
index cc5cacbe4..83249d15e 100644
--- a/test/cypress/integration/vnComponent/VnShortcut.spec.js
+++ b/test/cypress/integration/vnComponent/VnShortcut.spec.js
@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
 // https://redmine.verdnatura.es/issues/8848
-describe.skip('VnShortcuts', () => {
+describe('VnShortcuts', () => {
     const modules = {
         item: 'a',
         customer: 'c',
diff --git a/test/cypress/integration/worker/workerBusiness.spec.js b/test/cypress/integration/worker/workerBusiness.spec.js
index 46da28cd6..1650b66c7 100644
--- a/test/cypress/integration/worker/workerBusiness.spec.js
+++ b/test/cypress/integration/worker/workerBusiness.spec.js
@@ -1,4 +1,4 @@
-describe.skip('WorkerBusiness', () => {
+describe('WorkerBusiness', () => {
     const saveBtn = '.q-mt-lg > .q-btn--standard';
     const contributionCode = `Representantes de comercio`;
     const contractType = `INDEFINIDO A TIEMPO COMPLETO`;
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index ac84a5e60..f990c1774 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -195,8 +195,8 @@ Cypress.Commands.add('fillInForm', (obj, opts = {}) => {
                         break;
                     case 'date':
                         cy.get(el).type(
-                            `{selectall}{backspace}${val.split('-').join('')}`,
-                        );
+                            `{selectall}{backspace}${val}`,
+                        ).blur();
                         break;
                     case 'time':
                         cy.get(el).click();
@@ -635,3 +635,41 @@ Cypress.Commands.add('validateScrollContent', (validations) => {
         );
     });
 });
+
+Cypress.Commands.add(
+    'checkRedirectionFromPopUp',
+    ({ selectorToClick, steps = [], expectedUrlRegex, expectedTextSelector }) => {
+        cy.get(selectorToClick)
+            .click()
+            .invoke('text')
+            .then((label) => {
+                label = label.trim();
+
+                steps.forEach((stepSelector) => {
+                    cy.get(stepSelector).should('be.visible').click();
+                });
+
+                cy.location().should('match', expectedUrlRegex);
+                cy.containContent(expectedTextSelector, label);
+            });
+    },
+);
+
+Cypress.Commands.add('testDmsAction', (action, selectors, data, message, content) => {
+    cy.get(selectors.actionBtn).click();
+
+    if (action === 'create') {
+        cy.dataCy(selectors.fileInput).selectFile('test/cypress/fixtures/image.jpg', {
+            force: true,
+        });
+    }
+
+    if (action !== 'delete') {
+        cy.fillInForm(data);
+        cy.dataCy(selectors.saveFormBtn).click();
+    } else cy.clickConfirm();
+
+    cy.checkNotification(message);
+
+    if (action !== 'create') cy.containContent(selectors.selectorContentToCheck, content);
+});
diff --git a/test/vitest/helper.js b/test/vitest/helper.js
index be0029ee8..f70325254 100644
--- a/test/vitest/helper.js
+++ b/test/vitest/helper.js
@@ -4,6 +4,7 @@ import { createTestingPinia } from '@pinia/testing';
 import { vi } from 'vitest';
 import { i18n } from 'src/boot/i18n';
 import { Notify, Dialog } from 'quasar';
+import keyShortcut from 'src/boot/keyShortcut';
 import * as useValidator from 'src/composables/useValidator';
 
 installQuasarPlugin({
@@ -16,6 +17,26 @@ const pinia = createTestingPinia({ createSpy: vi.fn, stubActions: false });
 const mockPush = vi.fn();
 const mockReplace = vi.fn();
 
+vi.mock('vue', async (importOriginal) => {
+    const actual = await importOriginal();
+    return {
+        ...actual,
+        inject: vi.fn((key) => {
+            if (key === 'app') {
+                return {};
+            }
+            return actual.inject(key);
+        }),
+        onMounted: vi.fn((fn) => (fn && typeof fn === 'function' ? fn() : undefined)),
+        onBeforeMount: vi.fn((fn) => (fn && typeof fn === 'function' ? fn() : undefined)),
+        onUpdated: vi.fn((fn) => (fn && typeof fn === 'function' ? fn() : undefined)),
+        onUnmounted: vi.fn((fn) => (fn && typeof fn === 'function' ? fn() : undefined)),
+        onBeforeUnmount: vi.fn((fn) =>
+            fn && typeof fn === 'function' ? fn() : undefined,
+        ),
+    };
+});
+
 vi.mock('vue-router', () => ({
     useRouter: () => ({
         push: mockPush,
@@ -87,6 +108,10 @@ export function createWrapper(component, options) {
     const defaultOptions = {
         global: {
             plugins: [i18n, pinia],
+            directives: {
+                shortcut: keyShortcut,
+            },
+            stubs: ['useState', 'arrayData', 'useStateStore', 'vue-i18n', 'RouterLink'],
         },
         mocks: {
             t: (tKey) => tKey,
@@ -94,15 +119,11 @@ export function createWrapper(component, options) {
         },
     };
 
-    const mountOptions = Object.assign({}, defaultOptions);
-
-    if (options instanceof Object) {
-        Object.assign(mountOptions, options);
-
-        if (options.global) {
-            mountOptions.global.plugins = defaultOptions.global.plugins;
-        }
-    }
+    const mountOptions = {
+        ...defaultOptions,
+        ...options,
+        global: { ...defaultOptions.global, ...options?.global },
+    };
 
     const wrapper = mount(component, mountOptions);
     const vm = wrapper.vm;
diff --git a/test/vitest/setup-file.js b/test/vitest/setup-file.js
index 0ba9e53c2..6b49d958f 100644
--- a/test/vitest/setup-file.js
+++ b/test/vitest/setup-file.js
@@ -1,5 +1,26 @@
-// This file will be run before each test file, don't delete or vitest will not work.
-import { vi } from 'vitest';
+import { afterAll, beforeAll, vi } from 'vitest';
+
+let vueWarnings = [];
+
+const originalConsoleWarn = console.warn;
+
+beforeAll(() => {
+    console.warn = (...args) => {
+        vueWarnings.push(args.join(' '));
+    };
+});
+
+afterEach(() => {
+    if (vueWarnings.length > 0) {
+        const allWarnings = vueWarnings.join('\n');
+        vueWarnings = [];
+        throw new Error(`Vue warnings detected during test:\n${allWarnings}`);
+    }
+});
+
+afterAll(() => {
+    console.warn = originalConsoleWarn;
+});
 
 vi.mock('axios');
 vi.mock('vue-router', () => ({