Merge pull request 'fix(VnFilter): refs #8277 update columnFilter event handling on component mount' (!1733) from 8277-fixSupplierFilter into dev

Reviewed-on: #1733
Reviewed-by: Alex Moreno <alexm@verdnatura.es>

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,

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "25.16.0",
+    "version": "25.18.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -18,6 +18,8 @@
         "test:e2e:summary": "bash ./test/cypress/summary.sh",
         "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
         "test:front": "vitest",
+        "test:ui": "vitest --ui",
+        "test:coverage": "vitest run --coverage",
         "test:front:ci": "vitest run",
         "commitlint": "commitlint --edit",
         "prepare": "npx husky install",
@@ -27,6 +29,8 @@
         "docs:preview": "vitepress preview docs"
     },
     "dependencies": {
+        "@eslint/eslintrc": "^3.2.0",
+        "@eslint/js": "^9.20.0",
         "@quasar/cli": "^2.4.1",
         "@quasar/extras": "^1.16.16",
         "axios": "^1.4.0",
@@ -40,8 +44,6 @@
         "validator": "^13.9.0",
         "vue": "^3.5.13",
         "vue-i18n": "^9.4.0",
-        "@eslint/eslintrc": "^3.2.0",
-        "@eslint/js": "^9.20.0",
         "vue-router": "^4.2.5"
     },
     "devDependencies": {
@@ -54,6 +56,7 @@
         "@quasar/app-vite": "^2.0.8",
         "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
         "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
+        "@vitest/ui": "3.1.1",
         "@vue/compiler-sfc": "^3.5.13",
         "@vue/test-utils": "^2.4.4",
         "autoprefixer": "^10.4.14",

pnpm-lock.yaml

@@ -75,7 +75,10 @@ devDependencies:
     version: 4.1.2
   '@quasar/quasar-app-extension-testing-unit-vitest':
     specifier: ^0.4.0
-    version: 0.4.0(@vue/test-utils@2.4.6)(quasar@2.18.1)(typescript@5.8.3)(vite@6.2.5)(vitest@3.1.1)(vue@3.5.13)
+    version: 0.4.0(@vitest/ui@3.1.1)(@vue/test-utils@2.4.6)(quasar@2.18.1)(typescript@5.8.3)(vite@6.2.5)(vitest@3.1.1)(vue@3.5.13)
+  '@vitest/ui':
+    specifier: 3.1.1
+    version: 3.1.1(vitest@3.1.1)
   '@vue/compiler-sfc':
     specifier: ^3.5.13
     version: 3.5.13
@@ -132,7 +135,7 @@ devDependencies:
     version: 1.86.3
   vitest:
     specifier: ^3.0.3
-    version: 3.1.1(@types/node@22.14.0)(sass@1.86.3)
+    version: 3.1.1(@types/node@22.14.0)(@vitest/ui@3.1.1)(sass@1.86.3)
   xunit-viewer:
     specifier: ^10.6.1
     version: 10.6.1(@babel/runtime@7.27.0)(@codemirror/autocomplete@6.18.6)(@codemirror/language@6.11.0)(@codemirror/lint@6.8.5)(@codemirror/search@6.5.10)(@codemirror/state@6.5.2)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.36.5)(codemirror@6.0.1)(react-dom@19.1.0)(react@19.1.0)
@@ -1139,6 +1142,10 @@ packages:
       config-chain: 1.1.13
     dev: false
 
+  /@polka/url@1.0.0-next.28:
+    resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==}
+    dev: true
+
   /@quasar/app-vite@2.2.0(@types/node@22.14.0)(eslint@9.24.0)(pinia@2.3.1)(quasar@2.18.1)(sass@1.86.3)(typescript@5.8.3)(vue-router@4.5.0)(vue@3.5.13):
     resolution: {integrity: sha512-MvCfJrCbxUYvoGaK5jPq0h0hjO8mbxYOWngf+dIKrxhwb+1h5ERh6aVYEUuCtMIwTMEVfPkCez4DIfZIoReuDw==}
     engines: {node: ^30 || ^28 || ^26 || ^24 || ^22 || ^20 || ^18, npm: '>= 6.14.12', yarn: '>= 1.17.3'}
@@ -1262,7 +1269,7 @@ packages:
       '@quasar/quasar-ui-qcalendar': 4.1.2
     dev: true
 
-  /@quasar/quasar-app-extension-testing-unit-vitest@0.4.0(@vue/test-utils@2.4.6)(quasar@2.18.1)(typescript@5.8.3)(vite@6.2.5)(vitest@3.1.1)(vue@3.5.13):
+  /@quasar/quasar-app-extension-testing-unit-vitest@0.4.0(@vitest/ui@3.1.1)(@vue/test-utils@2.4.6)(quasar@2.18.1)(typescript@5.8.3)(vite@6.2.5)(vitest@3.1.1)(vue@3.5.13):
     resolution: {integrity: sha512-eyzdUdmZiCueNS+5nedjMmzdbpCetSrtdGIwW6KplW1dTzRbLiNvYUjpBOxQGmJCgEhWy9zuswJ7MZ/bTql24Q==}
     engines: {node: '>= 12.22.1', npm: '>= 6.14.12', yarn: '>= 1.17.3'}
     peerDependencies:
@@ -1275,13 +1282,14 @@ packages:
       '@vitest/ui':
         optional: true
     dependencies:
+      '@vitest/ui': 3.1.1(vitest@3.1.1)
       '@vue/test-utils': 2.4.6
       happy-dom: 11.2.0
       lodash-es: 4.17.21
       quasar: 2.18.1
       vite-jsconfig-paths: 2.0.1(vite@6.2.5)
       vite-tsconfig-paths: 4.3.2(typescript@5.8.3)(vite@6.2.5)
-      vitest: 3.1.1(@types/node@22.14.0)(sass@1.86.3)
+      vitest: 3.1.1(@types/node@22.14.0)(@vitest/ui@3.1.1)(sass@1.86.3)
       vue: 3.5.13(typescript@5.8.3)
     transitivePeerDependencies:
       - supports-color
@@ -1813,6 +1821,21 @@ packages:
       tinyspy: 3.0.2
     dev: true
 
+  /@vitest/ui@3.1.1(vitest@3.1.1):
+    resolution: {integrity: sha512-2HpiRIYg3dlvAJBV9RtsVswFgUSJK4Sv7QhpxoP0eBGkYwzGIKP34PjaV00AULQi9Ovl6LGyZfsetxDWY5BQdQ==}
+    peerDependencies:
+      vitest: 3.1.1
+    dependencies:
+      '@vitest/utils': 3.1.1
+      fflate: 0.8.2
+      flatted: 3.3.3
+      pathe: 2.0.3
+      sirv: 3.0.1
+      tinyglobby: 0.2.12
+      tinyrainbow: 2.0.0
+      vitest: 3.1.1(@types/node@22.14.0)(@vitest/ui@3.1.1)(sass@1.86.3)
+    dev: true
+
   /@vitest/utils@3.1.1:
     resolution: {integrity: sha512-1XIjflyaU2k3HMArJ50bwSh3wKWPD6Q47wz/NUSmRV0zNywPc4w79ARjg/i/aNINHwA+mIALhUVqD9/aUvZNgg==}
     dependencies:
@@ -4021,6 +4044,10 @@ packages:
       picomatch: 4.0.2
     dev: true
 
+  /fflate@0.8.2:
+    resolution: {integrity: sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==}
+    dev: true
+
   /figures@3.2.0:
     resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
     engines: {node: '>=8'}
@@ -5588,6 +5615,11 @@ packages:
     resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
     dev: false
 
+  /mrmime@2.0.1:
+    resolution: {integrity: sha512-Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==}
+    engines: {node: '>=10'}
+    dev: true
+
   /ms@2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
 
@@ -6964,6 +6996,15 @@ packages:
     engines: {node: '>=14'}
     dev: true
 
+  /sirv@3.0.1:
+    resolution: {integrity: sha512-FoqMu0NCGBLCcAkS1qA+XJIQTR6/JHfQXl+uGteNCQ76T91DMUjPa9xfmeqMY3z80nLSg9yQmNjK0Px6RWsH/A==}
+    engines: {node: '>=18'}
+    dependencies:
+      '@polka/url': 1.0.0-next.28
+      mrmime: 2.0.1
+      totalist: 3.0.1
+    dev: true
+
   /slash@3.0.0:
     resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
     engines: {node: '>=8'}
@@ -7364,6 +7405,11 @@ packages:
     resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
     engines: {node: '>=0.6'}
 
+  /totalist@3.0.1:
+    resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
+    engines: {node: '>=6'}
+    dev: true
+
   /tough-cookie@5.1.2:
     resolution: {integrity: sha512-FVDYdxtnj0G6Qm/DhNPSb8Ju59ULcup3tuJxkFb5K8Bv2pUXILbf0xZWU8PX8Ov19OXljbUyveOFwRMwkXzO+A==}
     engines: {node: '>=16'}
@@ -7772,7 +7818,7 @@ packages:
       fsevents: 2.3.3
     dev: true
 
-  /vitest@3.1.1(@types/node@22.14.0)(sass@1.86.3):
+  /vitest@3.1.1(@types/node@22.14.0)(@vitest/ui@3.1.1)(sass@1.86.3):
     resolution: {integrity: sha512-kiZc/IYmKICeBAZr9DQ5rT7/6bD9G7uqQEki4fxazi1jdVl2mWGzedtBs5s6llz59yQhVb7FFY2MbHzHCnT79Q==}
     engines: {node: ^18.0.0 || ^20.0.0 || >=22.0.0}
     hasBin: true
@@ -7807,6 +7853,7 @@ packages:
       '@vitest/runner': 3.1.1
       '@vitest/snapshot': 3.1.1
       '@vitest/spy': 3.1.1
+      '@vitest/ui': 3.1.1(vitest@3.1.1)
       '@vitest/utils': 3.1.1
       chai: 5.2.0
       debug: 4.4.0(supports-color@8.1.1)

src/App.vue

@@ -2,6 +2,7 @@
 import { onMounted } from 'vue';
 import { useQuasar, Dark } from 'quasar';
 import { useI18n } from 'vue-i18n';
+import VnScroll from './components/common/VnScroll.vue';
 
 const quasar = useQuasar();
 const { availableLocales, locale, fallbackLocale } = useI18n();
@@ -38,6 +39,7 @@ quasar.iconMapFn = (iconName) => {
 
 <template>
     <RouterView />
+    <VnScroll/>
 </template>
 
 <style lang="scss">

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));
         });
     });
 });

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();
+    };
 });

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"

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" />
@@ -332,6 +332,7 @@ watch(formUrl, async () => {
                 :disable="!selected?.length"
                 :title="t('globals.remove')"
                 v-if="$props.defaultRemove"
+                data-cy="crudModelDefaultRemoveBtn"
             />
             <QBtn
                 :label="tMobile('globals.reset')"

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>{{

src/components/EntityCalendar.vue

@@ -0,0 +1,152 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { date } from 'quasar';
+import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
+import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
+import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import useWeekdaysOrder from 'src/composables/getWeekdays';
+
+const formatDate = (dateToFormat, format = 'YYYY-MM-DD') => (
+  date.formatDate(dateToFormat, format)
+);
+
+
+const props = defineProps({
+    year: {
+        type: Number,
+        required: true,
+    },
+    month: {
+        type: Number,
+        required: true,
+    },
+    monthDate: {
+        type: Object,
+        default: null,
+    },
+    daysMap: {
+        type: Object,
+        default: null,
+    },
+});
+
+const emit = defineEmits(['onDateSelected']);
+
+const { locale } = useI18n();
+const weekdayStore = useWeekdayStore();
+const weekDays = useWeekdaysOrder();
+const calendarRef = ref(null);
+const today = ref(formatDate(Date.vnNew()));
+const todayTimestamp = computed(() => {
+    const date = Date.vnNew();
+    date.setHours(0, 0, 0, 0);
+    return date.getTime();
+});
+const _monthDate = computed(() => formatDate(props.monthDate));
+
+const calendarHeaderTitle = computed(() => {
+    return `${weekdayStore.getLocaleMonths[props.month - 1].locale} ${props.year}`;
+});
+
+const isToday = (timestamp) => {
+    const { year, month, day } = timestamp;
+    return todayTimestamp.value === new Date(year, month - 1, day).getTime();
+};
+
+const getEventByTimestamp = ({ year, month, day }) => {
+    const stamp = new Date(year, month - 1, day).getTime();
+    return props.daysMap?.[stamp] || null;
+};
+
+const handleDateClick = (timestamp) => {
+    const event = getEventByTimestamp(timestamp);
+    const { year, month, day } = timestamp;
+    const date = new Date(year, month - 1, day);
+    emit('onDateSelected', { 
+        date, 
+        isNewMode: !event,
+        event: event?.[0] || null 
+    });
+};
+
+const getEventAttrs = (timestamp) => {
+    return {
+        class: '--event',
+        label: timestamp.day,
+    };
+};
+
+defineExpose({ getEventByTimestamp, handleDateClick });
+</script>
+
+<template>
+    <QCalendarMonthWrapper
+        style="height: 290px; width: 290px"
+        transparent-background
+        view-customization="workerCalendar"
+    >
+        <template #header>
+            <span class="full-width text-center text-body1 q-py-sm">{{
+                calendarHeaderTitle
+            }}</span>
+        </template>
+        <template #calendar>
+            <QCalendarMonth
+                ref="calendarRef"
+                :model-value="_monthDate"
+                show-work-weeks
+                no-outside-days
+                no-active-date
+                :weekdays="weekDays"
+                short-weekday-label
+                :locale="locale"
+                :now="today"
+                @click-date="handleDateClick($event.scope.timestamp)"
+                mini-mode
+            >
+                <template #day="{ scope: { timestamp } }">
+                    <slot name="day" :timestamp="timestamp" :getEventAttrs="getEventAttrs">
+                        <QBtn
+                            v-if="getEventByTimestamp(timestamp)"
+                            v-bind="{ ...getEventAttrs(timestamp) }"
+                            @click="handleDateClick(timestamp)"
+                            rounded
+                            dense
+                            flat
+                            class="calendar-event"
+                            :class="{ '--today': isToday(timestamp) }"
+                        />
+                    </slot>
+                </template>
+            </QCalendarMonth>
+        </template>
+    </QCalendarMonthWrapper>
+</template>
+
+<style lang="scss">
+.calendar-event {
+    display: flex;
+    justify-content: center;
+    width: 32px;
+    height: 32px;
+    font-size: 13px;
+    line-height: 1.715em;
+    cursor: pointer;
+    color: white;
+
+    &.--today {
+        border: 2px solid $info;
+    }
+
+    &.--event {
+        background-color: $positive;
+        color: black;
+    }
+
+    &:hover {
+        opacity: 0.8;
+    }
+}
+</style>

src/components/EntityCalendarGrid.vue

@@ -0,0 +1,126 @@
+<script setup>
+import { computed, onMounted, ref, onUnmounted, nextTick } from 'vue';
+import { useStateStore } from 'stores/useStateStore';
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import { useArrayData } from 'src/composables/useArrayData';
+
+const props = defineProps({
+  dataKey: {
+    type: String,
+    required: true,
+  },
+  calendarComponent: {
+    type: Object,
+    required: true,
+  },
+  additionalProps: {
+    type: Object,
+    default: () => ({}),
+  }
+});
+
+const stateStore = useStateStore();
+const weekdayStore = useWeekdayStore();
+const nMonths = ref(4);
+const _date = ref(Date.vnNew());
+const firstDay = ref(Date.vnNew());
+const lastDay = ref(Date.vnNew());
+const months = ref([]);
+const arrayData = useArrayData(props.dataKey);
+onMounted(async () => {
+  const initialDate = Date.vnNew();
+  initialDate.setDate(1);
+  initialDate.setHours(0, 0, 0, 0);
+  date.value = initialDate;
+  await nextTick();
+  stateStore.rightDrawer = true;
+});
+
+onUnmounted(() => arrayData.destroy());
+
+const emit = defineEmits([
+  'update:firstDay',
+  'update:lastDay',
+  'update:events',
+  'onDateSelected',
+]);
+
+const date = computed({
+  get: () => _date.value,
+  set: (value) => {
+    if (!(value instanceof Date)) return;
+    _date.value = value;
+    const stamp = value.getTime();
+
+    firstDay.value = new Date(stamp);
+    firstDay.value.setDate(1);
+
+    lastDay.value = new Date(stamp);
+    lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
+    lastDay.value.setDate(0);
+
+    months.value = [];
+    for (let i = 0; i < nMonths.value; i++) {
+      const monthDate = new Date(stamp);
+      monthDate.setMonth(value.getMonth() + i);
+      months.value.push(monthDate);
+    }
+
+    emit('update:firstDay', firstDay.value);
+    emit('update:lastDay', lastDay.value);
+    emit('refresh-events');
+  },
+});
+
+const headerTitle = computed(() => {
+  if (!months.value?.length) return '';
+  const getMonthName = date => 
+    `${weekdayStore.getLocaleMonths[date.getMonth()].locale} ${date.getFullYear()}`;
+  return `${getMonthName(months.value[0])} - ${getMonthName(months.value[months.value.length - 1])}`;
+});
+
+const step = (direction) => {
+  const newDate = new Date(date.value);
+  newDate.setMonth(newDate.getMonth() + nMonths.value * direction);
+  date.value = newDate;
+};
+
+defineExpose({
+    firstDay,
+    lastDay
+});
+</script>
+
+<template>
+  <QCard style="height: max-content">
+    <div class="calendars-header">
+      <QBtn
+        icon="arrow_left"
+        size="sm"
+        flat
+        class="full-height"
+        @click="step(-1)"
+      />
+      <span>{{ headerTitle }}</span>
+      <QBtn
+        icon="arrow_right"
+        size="sm"
+        flat
+        class="full-height"
+        @click="step(1)"
+      />
+    </div>
+    <div class="calendars-container">
+      <component
+        :is="calendarComponent"
+        v-for="(month, index) in months"
+        :key="index"
+        :month="month.getMonth() + 1"
+        :year="month.getFullYear()"
+        :month-date="month"
+        v-bind="additionalProps"
+        @on-date-selected="data => emit('onDateSelected', data)"
+      />
+    </div>
+  </QCard>
+</template>

src/components/FormModel.vue

@@ -13,17 +13,15 @@ import VnConfirm from './ui/VnConfirm.vue';
 import { tMobile } from 'src/composables/tMobile';
 import { useArrayData } from 'src/composables/useArrayData';
 import { getDifferences, getUpdatedValues } from 'src/filters';
-
 const { push } = useRouter();
 const quasar = useQuasar();
 const state = useState();
 const stateStore = useStateStore();
 const { t } = useI18n();
-const { validate } = useValidator();
+const { validate, validations } = useValidator();
 const { notify } = useNotify();
 const route = useRoute();
 const myForm = ref(null);
-const attrs = useAttrs();
 const $props = defineProps({
     url: {
         type: String,
@@ -100,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;
@@ -119,7 +121,7 @@ const defaultButtons = computed(() => ({
         color: 'primary',
         icon: 'save',
         label: 'globals.save',
-        click: async () => await save(),
+        click: async (evt) => submitForm(evt),
         type: 'submit',
     },
     reset: {
@@ -132,6 +134,13 @@ const defaultButtons = computed(() => ({
     ...$props.defaultButtons,
 }));
 
+const submitForm = async (evt) => {
+    const isFormValid = await myForm.value.validate();
+    if (isFormValid) {
+        await save(evt);
+    }
+};
+
 onMounted(async () => {
     nextTick(() => (componentIsRendered.value = true));
 
@@ -227,10 +236,9 @@ async function save() {
         const method = $props.urlCreate ? 'post' : 'patch';
         const url =
             $props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
-        let response;
+        const response = await Promise.resolve(
-
+            $props.saveFn ? $props.saveFn(body) : axios[method](url, body),
-        if ($props.saveFn) response = await $props.saveFn(body);
+        );
-        else response = await axios[method](url, body);
 
         if ($props.urlCreate) notify('globals.dataCreated', 'positive');
 
@@ -296,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;
@@ -307,11 +315,13 @@ async function onKeyup(evt) {
             selectionStart = selectionEnd = selectionStart + 1;
             return;
         }
-        await save();
+        await myForm.value.submit(evt);
     }
 }
 
 defineExpose({
+    submitForm,
+    myForm,
     save,
     isLoading,
     hasChanges,
@@ -323,9 +333,10 @@ defineExpose({
 <template>
     <div class="column items-center full-width">
         <QForm
+            v-on="$attrs"
             ref="myForm"
             v-if="formData"
-            @submit.prevent
+            @submit.prevent="save"
             @keyup.prevent="onKeyup"
             @reset="reset"
             class="q-pa-md"
@@ -339,6 +350,7 @@ defineExpose({
                     name="form"
                     :data="formData"
                     :validate="validate"
+                    :validations="validations()"
                     :filter="filter"
                 />
                 <SkeletonForm v-else />
@@ -398,6 +410,7 @@ defineExpose({
             </QBtnDropdown>
             <QBtn
                 v-else
+                data-cy="saveDefaultBtn"
                 :label="tMobile('globals.save')"
                 color="primary"
                 icon="save"

src/components/FormModelPopup.vue

@@ -41,9 +41,12 @@ const onDataSaved = async (formData, requestResponse) => {
     emit('onDataSaved', formData, requestResponse);
 };
 
-const onClick = async (saveAndContinue) => {
+const onClick = async (saveAndContinue = showSaveAndContinueBtn) => {
+    await formModelRef.value.myForm.validate(true);
     isSaveAndContinue.value = saveAndContinue;
-    await formModelRef.value.save();
+    if (formModelRef.value) {
+        await formModelRef.value.submitForm();
+    }
 };
 
 defineExpose({
@@ -59,16 +62,23 @@ defineExpose({
         ref="formModelRef"
         :observe-form-changes="false"
         :default-actions="false"
+        @submit="onClick"
         v-bind="$attrs"
         @on-data-saved="onDataSaved"
+        :prevent-submit="false"
     >
-        <template #form="{ data, validate }">
+        <template #form="{ data, validate, validations }">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ title }}</h1>
             <p>{{ subtitle }}</p>
-            <slot name="form-inputs" :data="data" :validate="validate" />
+            <slot
+                name="form-inputs"
+                :data="data"
+                :validate="validate"
+                :validations="validations"
+            />
             <div class="q-mt-lg row justify-end">
                 <QBtn
                     :label="t('globals.cancel')"
@@ -87,12 +97,13 @@ defineExpose({
                     :flat="showSaveAndContinueBtn"
                     :label="t('globals.save')"
                     :title="t('globals.save')"
-                    @click="onClick(false)"
+                    :type="!showSaveAndContinueBtn ? 'submit' : 'button'"
                     color="primary"
                     class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"
                     data-cy="FormModelPopup_save"
+                    @click="showSaveAndContinueBtn ? onClick(false) : null"
                     z-max
                 />
                 <QBtn
@@ -100,12 +111,13 @@ defineExpose({
                     :label="t('globals.isSaveAndContinue')"
                     :title="t('globals.isSaveAndContinue')"
                     color="primary"
+                    :type="showSaveAndContinueBtn ? 'submit' : 'button'"
                     class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"
                     data-cy="FormModelPopup_isSaveAndContinue"
+                    @click="showSaveAndContinueBtn ? onClick(true) : null"
                     z-max
-                    @click="onClick(true)"
                 />
             </div>
         </template>

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" />

src/components/NavBar.vue

@@ -69,7 +69,7 @@ const refresh = () => window.location.reload();
                     'no-visible': !stateQuery.isLoading().value,
                 }"
                 size="sm"
-                data-cy="loading-spinner"
+                data-cy="navBar-spinner"
             />
             <QSpace />
             <div id="searchbar" class="searchbar"></div>

src/components/TicketProblems.vue

@@ -1,12 +1,22 @@
 <script setup>
 import { toCurrency } from 'src/filters';
+import { getValueFromPath } from 'src/composables/getValueFromPath';
 
-defineProps({ row: { type: Object, required: true } });
+const { row, visibleProblems = null } = defineProps({
+    row: { type: Object, required: true },
+    visibleProblems: { type: Array },
+});
+
+function showProblem(problem) {
+    const val = getValueFromPath(row, problem);
+    if (!visibleProblems) return val;
+    return !!(visibleProblems?.includes(problem) && val);
+}
 </script>
 <template>
     <span class="q-gutter-x-xs">
         <router-link
-            v-if="row.claim?.claimFk"
+            v-if="showProblem('claim.claimFk')"
             :to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
             class="link"
         >
@@ -18,7 +28,7 @@ defineProps({ row: { type: Object, required: true } });
             </QIcon>
         </router-link>
         <QIcon
-            v-if="row?.isDeleted"
+            v-if="showProblem('isDeleted')"
             color="primary"
             name="vn:deletedTicket"
             size="xs"
@@ -29,7 +39,7 @@ defineProps({ row: { type: Object, required: true } });
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="row?.hasRisk"
+            v-if="showProblem('hasRisk')"
             name="vn:risk"
             :color="row.hasHighRisk ? 'negative' : 'primary'"
             size="xs"
@@ -40,51 +50,76 @@ defineProps({ row: { type: Object, required: true } });
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="row?.hasComponentLack"
+            v-if="showProblem('hasComponentLack')"
             name="vn:components"
             color="primary"
             size="xs"
         >
             <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.hasItemDelay" color="primary" size="xs" name="vn:hasItemDelay">
+        <QIcon
+            v-if="showProblem('hasItemDelay')"
+            color="primary"
+            size="xs"
+            name="vn:hasItemDelay"
+        >
             <QTooltip>
                 {{ $t('ticket.summary.hasItemDelay') }}
             </QTooltip>
         </QIcon>
-        <QIcon v-if="row?.hasItemLost" color="primary" size="xs" name="vn:hasItemLost">
+        <QIcon
+            v-if="showProblem('hasItemLost')"
+            color="primary"
+            size="xs"
+            name="vn:hasItemLost"
+        >
             <QTooltip>
                 {{ $t('salesTicketsTable.hasItemLost') }}
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="row?.hasItemShortage"
+            v-if="showProblem('hasItemShortage')"
             name="vn:unavailable"
             color="primary"
             size="xs"
         >
             <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.hasRounding" color="primary" name="sync_problem" size="xs">
+        <QIcon
+            v-if="showProblem('hasRounding')"
+            color="primary"
+            name="sync_problem"
+            size="xs"
+        >
             <QTooltip>
                 {{ $t('ticketList.rounding') }}
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="row?.hasTicketRequest"
+            v-if="showProblem('hasTicketRequest')"
             name="vn:buyrequest"
             color="primary"
             size="xs"
         >
             <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.isTaxDataChecked" name="vn:no036" color="primary" size="xs">
+        <QIcon
+            v-if="showProblem('isTaxDataChecked')"
+            name="vn:no036"
+            color="primary"
+            size="xs"
+        >
             <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs">
+        <QIcon v-if="showProblem('isFreezed')" name="vn:frozen" color="primary" size="xs">
             <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="row?.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
+        <QIcon
+            v-if="showProblem('isTooLittle')"
+            name="vn:isTooLittle"
+            color="primary"
+            size="xs"
+        >
             <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
         </QIcon>
     </span>

src/components/VnTable/VnFilter.vue

@@ -1,6 +1,6 @@
 <script setup>
-import { markRaw, computed } from 'vue';
+import { markRaw, computed, onBeforeMount } from 'vue';
-import { QCheckbox, QToggle } from 'quasar';
+import { QToggle } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'components/common/VnInput.vue';
@@ -150,6 +150,16 @@ const showFilter = computed(
 const onTabPressed = async () => {
     if (model.value) enterEvent['keyup.enter']();
 };
+
+onBeforeMount(() => {
+    const columnFilter = $props.column?.columnFilter;
+    const component = columnFilter?.component;
+    const defaultComponent = components[component];
+    const events = { update: updateEvent, enter: enterEvent };
+
+    if (!columnFilter || defaultComponent) return;
+    $props.column.columnFilter.event = events[columnFilter.event];
+});
 </script>
 <template>
     <div v-if="showFilter" class="full-width" style="overflow: hidden">

src/components/VnTable/VnOrder.vue

@@ -16,7 +16,7 @@ const $props = defineProps({
         required: true,
     },
     searchUrl: {
-        type: String,
+        type: [String, Boolean],
         default: 'table',
     },
     vertical: {

src/components/VnTable/VnTable.vue

@@ -33,6 +33,7 @@ import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
 import VnTableFilter from './VnTableFilter.vue';
 import { getColAlign } from 'src/composables/getColAlign';
 import RightMenu from '../common/RightMenu.vue';
+import VnScroll from '../common/VnScroll.vue'
 
 const arrayData = useArrayData(useAttrs()['data-key']);
 const $props = defineProps({
@@ -65,7 +66,7 @@ const $props = defineProps({
         default: null,
     },
     create: {
-        type: Object,
+        type: [Boolean, Object],
         default: null,
     },
     createAsDialog: {
@@ -168,6 +169,7 @@ const params = ref(useFilterParams($attrs['data-key']).params);
 const orders = ref(useFilterParams($attrs['data-key']).orders);
 const app = inject('app');
 const tableHeight = useTableHeight();
+const vnScrollRef = ref(null);
 
 const editingRow = ref(null);
 const editingField = ref(null);
@@ -189,6 +191,17 @@ const tableModes = [
     },
 ];
 
+const onVirtualScroll = ({ to }) => {
+    handleScroll();
+    const virtualScrollContainer = tableRef.value?.$el?.querySelector('.q-table__middle');
+    if (virtualScrollContainer) {
+      virtualScrollContainer.dispatchEvent(new CustomEvent('scroll'));
+      if (vnScrollRef.value) {
+        vnScrollRef.value.updateScrollContainer(virtualScrollContainer);
+      }
+    }
+};
+
 onBeforeMount(() => {
     const urlParams = route.query[$props.searchUrl];
     hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
@@ -229,6 +242,7 @@ watch(
 
 defineExpose({
     create: createForm,
+    showForm,
     reload,
     redirect: redirectFn,
     selected,
@@ -326,16 +340,13 @@ function handleOnDataSaved(_) {
     if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
-
 function handleScroll() {
     if ($props.crudModel.disableInfiniteScroll) return;		
-
     const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');		
     const { scrollHeight, scrollTop, clientHeight } = tMiddle;		
     const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;		
     if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();		
 }
-
 function handleSelection({ evt, added, rows: selectedRows }, rows) {
     if (evt?.shiftKey && added) {
         const rowIndex = selectedRows[0].$index;
@@ -668,9 +679,9 @@ const rowCtrlClickFunction = computed(() => {
                 ref="tableRef"
                 v-bind="table"
                 :class="[
-                    'vnTable',
+                  'vnTable',
-                    table ? 'selection-cell' : '',
+                  table ? 'selection-cell' : '',
-                    $props.footer ? 'last-row-sticky' : '',
+                  $props.footer ? 'last-row-sticky' : '',
                 ]"
                 wrap-cells
                 :columns="splittedColumns.columns"
@@ -682,7 +693,7 @@ const rowCtrlClickFunction = computed(() => {
                 flat
                 :style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
                 :virtual-scroll="isTableMode"
-                @virtual-scroll="handleScroll"
+                @virtual-scroll="onVirtualScroll"
                 @row-click="(event, row) => handleRowClick(event, row)"
                 @update:selected="emit('update:selected', $event)"
                 @selection="(details) => handleSelection(details, rows)"
@@ -740,6 +751,7 @@ const rowCtrlClickFunction = computed(() => {
                                     withFilters
                                 "
                                 :column="col"
+                                :data-cy="`column-filter-${col.name}`"
                                 :show-title="true"
                                 :data-key="$attrs['data-key']"
                                 v-model="params[columnName(col)]"
@@ -1044,7 +1056,7 @@ const rowCtrlClickFunction = computed(() => {
             :model="$attrs['data-key'] + 'Create'"
             @on-data-saved="(_, res) => createForm.onDataSaved(res)"
         >
-            <template #form-inputs="{ data }">
+            <template #form-inputs="{ data, validations }">
                 <slot name="alter-create" :data="data">
                     <div :style="createComplement?.containerStyle">
                         <div
@@ -1062,6 +1074,7 @@ const rowCtrlClickFunction = computed(() => {
                                 :key="column.name"
                                 :name="`column-create-${column.name}`"
                                 :data="data"
+                                :validations="validations"
                                 :column-name="column.name"
                                 :label="column.label"
                             >
@@ -1085,6 +1098,11 @@ const rowCtrlClickFunction = computed(() => {
             </template>
         </FormModelPopup>
     </QDialog>
+    <VnScroll 
+      ref="vnScrollRef"
+      v-if="isTableMode"
+      :scroll-target="tableRef?.$el?.querySelector('.q-table__middle')"
+    />
 </template>
 <i18n>
 en:

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 }">

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() {

src/components/VnTable/__tests__/VnTable.spec.js

@@ -11,6 +11,9 @@ describe('VnTable', () => {
             propsData: {
                 columns: [],
             },
+            attrs: {
+                'data-key': 'test',
+            },
         });
         vm = wrapper.vm;
 

src/components/__tests__/CrudModel.spec.js

@@ -11,13 +11,7 @@ describe('CrudModel', () => {
     beforeAll(() => {
         wrapper = createWrapper(CrudModel, {
             global: {
-                stubs: [
+                stubs: ['vnPaginate', 'vue-i18n'],
-                    'vnPaginate',
-                    'useState',
-                    'arrayData',
-                    'useStateStore',
-                    '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 () => {

src/components/__tests__/EditTableCellValueForm.spec.js

@@ -1,57 +0,0 @@
-import { createWrapper } from 'app/test/vitest/helper';
-import { default as axios } from 'axios';
-import EditForm from 'components/EditTableCellValueForm.vue';
-import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
-
-const fieldA = 'fieldA';
-const fieldB = 'fieldB';
-
-describe('EditForm', () => {
-    let vm;
-    const mockRows = [
-        { id: 1, itemFk: 101 },
-        { id: 2, itemFk: 102 },
-    ];
-    const mockFieldsOptions = [
-        { label: 'Field A', field: fieldA, component: 'input', attrs: {} },
-        { label: 'Field B', field: fieldB, component: 'date', attrs: {} },
-    ];
-    const editUrl = '/api/edit';
-
-    beforeAll(() => {
-        vi.spyOn(axios, 'post').mockResolvedValue({ status: 200 });
-        vm = createWrapper(EditForm, {
-            props: {
-                rows: mockRows,
-                fieldsOptions: mockFieldsOptions,
-                editUrl,
-            },
-        }).vm;
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('onSubmit()', () => {
-        it('should call axios.post with the correct parameters in the payload', async () => {
-            const selectedField = { field: fieldA, component: 'input', attrs: {} };
-            const newValue = 'Test Value';
-
-            vm.selectedField = selectedField;
-            vm.newValue = newValue;
-
-            await vm.onSubmit();
-
-            const payload = axios.post.mock.calls[0][1];
-
-            expect(axios.post).toHaveBeenCalledWith(editUrl, expect.any(Object));
-            expect(payload.field).toEqual(fieldA);
-            expect(payload.newValue).toEqual(newValue);
-
-            expect(payload.lines).toEqual(expect.arrayContaining(mockRows));
-
-            expect(vm.isLoading).toEqual(false);
-        });
-    });
-});

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();
     });

src/components/__tests__/UserPanel.spec.js

@@ -1,65 +1,63 @@
-import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
+import { vi, describe, expect, it, beforeEach, beforeAll, afterEach } from 'vitest';
 import { createWrapper } from 'app/test/vitest/helper';
 import UserPanel from 'src/components/UserPanel.vue';
 import axios from 'axios';
 import { useState } from 'src/composables/useState';
 
-vi.mock('src/utils/quasarLang', () => ({
-  default: vi.fn(),
-}));
-
 describe('UserPanel', () => {
-  let wrapper;
+    let wrapper;
-  let vm;
+    let vm;
-  let state;
+    let state;
 
-  beforeEach(() => {
+    beforeEach(() => {
-    wrapper = createWrapper(UserPanel, {});
+        wrapper = createWrapper(UserPanel, {});
-    state = useState();
+        state = useState();
-    state.setUser({
+        state.setUser({
-      id: 115,
+            id: 115,
-      name: 'itmanagement',
+            name: 'itmanagement',
-      nickname: 'itManagementNick',
+            nickname: 'itManagementNick',
-      lang: 'en',
+            lang: 'en',
-      darkMode: false,
+            darkMode: false,
-      companyFk: 442,
+            companyFk: 442,
-      warehouseFk: 1,
+            warehouseFk: 1,
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
     });
-    wrapper = wrapper.wrapper;
-    vm = wrapper.vm;
-  });
 
-  afterEach(() => {
+    afterEach(() => {
-    vi.clearAllMocks();
+        vi.clearAllMocks();
-  });
+    });
 
-  it('should fetch warehouses data on mounted', async () => {
+    it('should fetch warehouses data on mounted', async () => {
-    const fetchData = wrapper.findComponent({ name: 'FetchData' });
+        const fetchData = wrapper.findComponent({ name: 'FetchData' });
-    expect(fetchData.props('url')).toBe('Warehouses');
+        expect(fetchData.props('url')).toBe('Warehouses');
-    expect(fetchData.props('autoLoad')).toBe(true);
+        expect(fetchData.props('autoLoad')).toBe(true);
-  });
+    });
 
-  it('should toggle dark mode correctly and update preferences', async () => {
+    it('should toggle dark mode correctly and update preferences', async () => {
-    await vm.saveDarkMode(true);
+        await vm.saveDarkMode(true);
-    expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
+        expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
-    expect(vm.user.darkMode).toBe(true);
+        expect(vm.user.darkMode).toBe(true);
-    await vm.updatePreferences();
+        vm.updatePreferences();
-    expect(vm.darkMode).toBe(true);
+        expect(vm.darkMode).toBe(true);
-  });
+    });
 
-  it('should change user language and update preferences', async () => {
+    it('should change user language and update preferences', async () => {
-    const userLanguage = 'es';
+        const userLanguage = 'es';
-    await vm.saveLanguage(userLanguage);
+        await vm.saveLanguage(userLanguage);
-    expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
+        expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
-    expect(vm.user.lang).toBe(userLanguage);
+        expect(vm.user.lang).toBe(userLanguage);
-    await vm.updatePreferences();
+        vm.updatePreferences();
-    expect(vm.locale).toBe(userLanguage);
+        expect(vm.locale).toBe(userLanguage);
-  });
+    });
 
-  it('should update user data', async () => {
+    it('should update user data', async () => {
-    const key = 'name';
+        const key = 'name';
-    const value = 'itboss';
+        const value = 'itboss';
-    await vm.saveUserData(key, value);
+        await vm.saveUserData(key, value);
-    expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', { [key]: value });
+        expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', {
-  });
+            [key]: value,
+        });
+    });
 });

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>

src/components/common/VnColor.vue

@@ -1,4 +1,6 @@
 <script setup>
+import { computed } from 'vue';
+
 const $props = defineProps({
     colors: {
         type: String,
@@ -6,9 +8,9 @@ const $props = defineProps({
     },
 });
 
-const colorArray = JSON.parse($props.colors)?.value;
+const colorArray = computed(() => JSON.parse($props.colors)?.value);
 const maxHeight = 30;
-const colorHeight = maxHeight / colorArray?.length;
+const colorHeight = maxHeight / colorArray.value?.length;
 </script>
 <template>
     <div v-if="colors" class="color-div" :style="{ height: `${maxHeight}px` }">

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" />

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;
+    let files = data.files;
-    if (files) formData.append(files?.name, 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);
+    try {
-    const response = await axios.post(getUrl(), body[0], body[1]);
+        const body = mapperDms(dms.value);
-    emit('onDataSaved', body[1].params, response);
+        const response = await axios.post(getUrl(), body[0], body[1]);
-    delete dms.value.files;
+        emit('onDataSaved', body[1].params, response);
-    return response;
+        notify(t('globals.dataSaved'), 'positive');
+        delete dms.value.files;
+        return response;
+    } catch (e) {
+        throw e;
+    }
 }
 
 function defaultData() {

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`);
+            try {
-            const index = rows.value.findIndex((row) => row.id == dmsFk);
+                await axios.post(
-            rows.value.splice(index, 1);
+                    `${$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"
     >

src/components/common/VnInputBic.vue

@@ -0,0 +1,44 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+
+import VnInput from 'src/components/common/VnInput.vue';
+
+const { t } = useI18n();
+const model = defineModel({ type: [Number, String] });
+const emit = defineEmits(['updateBic']);
+
+const getIbanCountry = (bank) => {
+    return bank.substr(0, 2);
+};
+
+const autofillBic = async (iban) => {
+    if (!iban) return;
+
+    const bankEntityId = parseInt(iban.substr(4, 4));
+    const ibanCountry = getIbanCountry(iban);
+
+    if (ibanCountry != 'ES') return;
+
+    const filter = { where: { id: bankEntityId } };
+    const params = { filter: JSON.stringify(filter) };
+
+    const { data } = await axios.get(`BankEntities`, { params });
+
+    emit('updateBic', data[0]?.id);
+};
+</script>
+<template>
+    <VnInput
+        :label="t('IBAN')"
+        clearable
+        v-model="model"
+        @update:model-value="autofillBic($event)"
+    >
+        <template #append>
+            <QIcon name="info" class="cursor-info">
+                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
+            </QIcon>
+        </template>
+    </VnInput>
+</template>

src/components/common/VnInputDate.vue

@@ -1,6 +1,6 @@
 <script setup>
-import { onMounted, watch, computed, ref, useAttrs } from 'vue';
+import { nextTick, watch, computed, ref, useAttrs } from 'vue';
-import { date } from 'quasar';
+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;
                     "

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>

src/components/common/VnJsonValue.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { watch } from 'vue';
-import { toDateString } from 'src/filters';
+import { toDateHourMinSec } from 'src/filters';
 
 const props = defineProps({
     value: { type: [String, Number, Boolean, Object], default: undefined },
@@ -40,7 +40,7 @@ const updateValue = () => {
                 break;
             case 'object':
                 if (props.value instanceof Date) {
-                    t = toDateString(props.value);
+                    t = toDateHourMinSec(props.value);
                 } else {
                     t = props.value.toString();
                 }

src/components/common/VnLog.vue

@@ -68,7 +68,6 @@ const filter = {
             },
         },
     ],
-    where: { and: [{ originFk: route.params.id }] },
 };
 
 const paginate = ref();
@@ -267,13 +266,6 @@ onMounted(() => {
 onUnmounted(() => {
     stateStore.rightDrawer = false;
 });
-
-watch(
-    () => router.currentRoute.value.params.id,
-    () => {
-        applyFilter();
-    },
-);
 </script>
 <template>
     <VnPaginate
@@ -281,6 +273,7 @@ watch(
         :data-key
         :url="dataKey + 's'"
         :user-filter="filter"
+        :filter="{ where: { and: [{ originFk: route.params.id }] } }"
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"

src/components/common/VnLogFilter.vue

@@ -39,7 +39,7 @@ const checkboxOptions = ref([
     { name: 'select', label: 'Accesses', selected: false },
 ]);
 const columns = computed(() => [
-    { name: 'changedModelValue' },
+    { name: 'changedModelValue', orderBy: 'id' },
     { name: 'changedModel' },
     { name: 'userType', orderBy: false },
     { name: 'userFk' },

src/components/common/VnScroll.vue

@@ -0,0 +1,100 @@
+<script setup>
+import { ref, onMounted, onUnmounted, watch, nextTick } from 'vue';
+
+const props = defineProps({
+    scrollTarget: { type: [String, Object], default: 'window' }
+});
+
+const scrollPosition = ref(0);
+const showButton = ref(false);
+let scrollContainer = null;
+
+const onScroll = () => {
+    if (!scrollContainer) return;
+    scrollPosition.value = 
+        typeof props.scrollTarget === 'object' 
+            ? scrollContainer.scrollTop 
+            : window.scrollY;
+};
+
+watch(scrollPosition, (newValue) => {
+    showButton.value = newValue > 0;
+});
+
+const scrollToTop = () => {
+    if (scrollContainer) {
+        scrollContainer.scrollTo({ top: 0, behavior: 'smooth' });
+    }
+};
+
+const updateScrollContainer = (container) => {
+  if (container) {
+    if (scrollContainer) {
+      scrollContainer.removeEventListener('scroll', onScroll);
+    }
+    scrollContainer = container;
+    scrollContainer.addEventListener('scroll', onScroll);
+    onScroll();
+  }
+};
+
+defineExpose({
+  updateScrollContainer
+});
+
+const initScrollContainer = async () => {
+    await nextTick();
+
+    if (typeof props.scrollTarget === 'object') {
+        scrollContainer = props.scrollTarget;
+    } else {
+        scrollContainer = window;
+    }
+
+    if (!scrollContainer) return
+        scrollContainer.addEventListener('scroll', onScroll);    
+};
+
+
+onMounted(() => {
+    initScrollContainer();
+});
+
+onUnmounted(() => {
+    if (scrollContainer) {
+        scrollContainer.removeEventListener('scroll', onScroll);
+        scrollContainer = null;
+    }
+});
+</script>
+
+<template>
+    <QIcon
+        v-if="showButton"
+        color="primary"
+        name="keyboard_arrow_up"
+        class="scroll-to-top"
+        @click="scrollToTop"
+    >
+        <QTooltip>{{ $t('globals.scrollToTop') }}</QTooltip>
+    </QIcon>
+</template>
+
+<style scoped>
+.scroll-to-top {
+  position: fixed;
+  top: 70px;
+  font-size: 65px;
+  left: 50%;
+  transform: translateX(-50%);
+  z-index: 1000;
+  transition: transform 0.2s ease-in-out;
+}
+
+.scroll-to-top:hover {
+  transform: translateX(-50%) scale(1.2);
+  cursor: pointer;
+  filter: brightness(0.8);
+}
+</style>
+

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: {
@@ -152,10 +152,22 @@ const value = computed({
     },
 });
 
+const arrayDataKey =
+    $props.dataKey ??
+    ($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
+
+const arrayData = useArrayData(arrayDataKey, {
+    url: $props.url,
+    searchUrl: false,
+    mapKey: $attrs['map-key'],
+});
+
 const computedSortBy = computed(() => {
     return $props.sortBy || $props.optionLabel + ' ASC';
 });
 
+const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
+
 watch(options, (newValue) => {
     setOptions(newValue);
 });
@@ -174,16 +186,7 @@ onMounted(() => {
     if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
 });
 
-const arrayDataKey =
+const someIsLoading = computed(() => isLoading.value || !!arrayData?.isLoading?.value);
-    $props.dataKey ??
-    ($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
-
-const arrayData = useArrayData(arrayDataKey, {
-    url: $props.url,
-    searchUrl: false,
-    mapKey: $attrs['map-key'],
-});
-
 function findKeyInOptions() {
     if (!$props.options) return;
     return filter($props.modelValue, $props.options)?.length;
@@ -252,43 +255,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.filterFn) update($props.filterFn(val));
-    if (
+    else if (!val && lastVal.value === val) update();
-        $props.url &&
+    else {
-        ($props.limit || (!$props.limit && Object.keys(myOptions.value).length === 0))
+        const makeRequest =
-    ) {
+            ($props.url && $props.limit) ||
-        newOptions = await fetchFilter(val);
+            (!$props.limit && Object.keys(myOptions.value).length === 0);
-    } else newOptions = filter(val, myOptionsOriginal.value);
+        newOptions = makeRequest
-    update(
+            ? await fetchFilter(val)
-        () => {
+            : filter(val, myOptionsOriginal.value);
-            if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
-                newOptions.unshift(noOneOpt.value);
 
-            myOptions.value = newOptions;
+        update(
-        },
+            () => {
-        (ref) => {
+                if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
-            if (val !== '' && ref.options.length > 0) {
+                    newOptions.unshift(noOneOpt.value);
-                ref.setOptionIndex(-1);
+
-                ref.moveOptionSelection(1, true);
+                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 +367,8 @@ function getCaption(opt) {
         virtual-scroll-slice-size="options.length"
         hide-bottom-space
         :input-debounce="useURL ? '300' : '0'"
-        :loading="isLoading"
+        :loading="someIsLoading"
+        :disable="someIsLoading"
         @virtual-scroll="onScroll"
         @keydown="handleKeyDown"
         :data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
@@ -374,7 +376,7 @@ function getCaption(opt) {
     >
         <template #append>
             <QIcon
-                v-show="isClearable && value"
+                v-show="isClearable && value != null && value !== ''"
                 name="close"
                 @click="
                     () => {
@@ -389,7 +391,7 @@ function getCaption(opt) {
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
             <div v-if="slotName == 'append'">
                 <QIcon
-                    v-show="isClearable && value"
+                    v-show="isClearable && value != null && value !== ''"
                     name="close"
                     @click.stop="
                         () => {
@@ -414,7 +416,7 @@ function getCaption(opt) {
                     <QItemLabel>
                         {{ opt[optionLabel] }}
                     </QItemLabel>
-                    <QItemLabel caption v-if="getCaption(opt)">
+                    <QItemLabel caption v-if="getCaption(opt) !== false">
                         {{ `#${getCaption(opt)}` }}
                     </QItemLabel>
                 </QItemSection>

src/components/common/VnSmsDialog.vue

@@ -232,7 +232,7 @@ fr:
     pt: Portugais
 pt:
     Send SMS: Enviar SMS
-    CustomerDefaultLanguage: Este cliente utiliza o <strong>{locale}</strong> como seu idioma padrão
+    CustomerDefaultLanguage: Este cliente utiliza o {locale} como seu idioma padrão
     Language: Linguagem
     Phone: Móvel
     Subject: Assunto

src/components/common/__tests__/VnDiscount.spec.js

@@ -12,7 +12,9 @@ describe('VnDiscount', () => {
                 price: 100,
                 quantity: 2,
                 discount: 10,
-            }
+                mana: 10,
+                promise: vi.fn(),
+            },
         }).vm;
     });
 

src/components/common/__tests__/VnDms.spec.js

@@ -41,10 +41,12 @@ describe('VnDms', () => {
         companyFk: 2,
         dmsTypeFk: 3,
         description: 'This is a test description',
-        files: {
+        files: [
-            name: 'example.txt',
+            {
-            content: new Blob(['file content'], { type: 'text/plain' }),
+                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);
         });
 

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;
@@ -12,25 +11,27 @@ describe('VnInput', () => {
         wrapper = createWrapper(VnInput, {
             props: {
                 modelValue: value,
-                isOutlined,  emptyToNull,  insertable,
+                isOutlined,
-                maxlength: 101
+                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']);
@@ -62,7 +63,6 @@ describe('VnInput', () => {
             expect(wrapper.emitted('update:modelValue')).toBeUndefined();
             const spyhandler = vi.spyOn(vm, 'handleInsertMode');
             expect(spyhandler).not.toHaveBeenCalled();
-            
         });
 
         /*
@@ -71,12 +71,12 @@ describe('VnInput', () => {
         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(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue]);
-            expect(vm.value).toBe( expectedValue);
+            expect(vm.value).toBe(expectedValue);
         });
     });
 

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 () => {
+        it('validateAndCleanInput should remove non-numeric characters', async () => {
-            generateWrapper('2023-12-25', false, false);
+            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 () => {
+        it('manageDate should reverse the date', async () => {
-            const input = wrapper.find('input');
+            generateWrapper();
-            await input.setValue('31/12/2023');
+            vm.manageDate('10/12/2023');
-            expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
+            await vm.$nextTick();
-            expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
+            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');
+            await input.setValue('25.12/2002');
-            expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
+            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({});
         });
 
         it('should set styleAttrs when isOutlined is true', async () => {
-            generateWrapper('2023-12-25', true, false);
+            generateWrapper(true, false);
             await vm.$nextTick();
             expect(vm.styleAttrs.outlined).toBe(true);
         });
@@ -58,13 +77,13 @@ 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');
         });

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);
+        });
+    });
+});

src/components/common/__tests__/VnJsonValue.spec.js

@@ -65,7 +65,7 @@ describe('VnJsonValue', () => {
         const date = new Date('2023-01-01');
         const wrapper = buildComponent({ value: date });
         const span = wrapper.find('span');
-        expect(span.text()).toBe('2023-01-01');
+        expect(span.text()).toBe('01/01/2023, 01:00:00');
         expect(span.classes()).toContain('json-object');
     });
 

src/components/common/__tests__/VnLog.spec.js

@@ -90,8 +90,10 @@ describe('VnLog', () => {
 
         vm = createWrapper(VnLog, {
             global: {
-                stubs: [],
+                stubs: ['FetchData', 'vue-i18n'],
-                mocks: {},
+                mocks: {
+                    fetch: vi.fn(),
+                },
             },
             propsData: {
                 model: 'Claim',

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;

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 {

src/components/ui/VnConfirm.vue

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

src/components/ui/VnDescriptor.vue

@@ -6,6 +6,7 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useRoute, useRouter } from 'vue-router';
 import { useClipboard } from 'src/composables/useClipboard';
 import VnMoreOptions from './VnMoreOptions.vue';
+import { getValueFromPath } from 'src/composables/getValueFromPath';
 
 const entity = defineModel({ type: Object, default: null });
 const $props = defineProps({
@@ -56,18 +57,6 @@ const routeName = computed(() => {
     return `${routeName}Summary`;
 });
 
-function getValueFromPath(path) {
-    if (!path) return;
-    const keys = path.toString().split('.');
-    let current = entity.value;
-
-    for (const key of keys) {
-        if (current[key] === undefined) return undefined;
-        else current = current[key];
-    }
-    return current;
-}
-
 function copyIdText(id) {
     copyText(id, {
         component: {
@@ -170,10 +159,10 @@ const toModule = computed(() => {
                         <div class="title">
                             <span
                                 v-if="title"
-                                :title="getValueFromPath(title)"
+                                :title="getValueFromPath(entity, title)"
                                 :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`"
                             >
-                                {{ getValueFromPath(title) ?? title }}
+                                {{ getValueFromPath(entity, title) ?? title }}
                             </span>
                             <slot v-else name="description" :entity="entity">
                                 <span
@@ -189,7 +178,7 @@ const toModule = computed(() => {
                             class="subtitle"
                             :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`"
                         >
-                            #{{ getValueFromPath(subtitle) ?? entity.id }}
+                            #{{ getValueFromPath(entity, subtitle) ?? entity.id }}
                         </QItemLabel>
                         <QBtn
                             round

src/components/ui/VnFilterPanel.vue

@@ -212,6 +212,7 @@ const getLocale = (label) => {
         color="primary"
         style="position: fixed; z-index: 1; right: 0; bottom: 0"
         icon="search"
+        data-cy="vnFilterPanel_search"
         @click="search()"
     >
         <QTooltip bottom anchor="bottom right">
@@ -229,6 +230,7 @@ const getLocale = (label) => {
                 <QItemSection top side>
                     <QBtn
                         @click="clearFilters"
+                        data-cy="clearFilters"
                         color="primary"
                         dense
                         flat
@@ -292,6 +294,7 @@ const getLocale = (label) => {
         </QList>
     </QForm>
     <QInnerLoading
+        data-cy="filterPanel-spinner"
         :label="t('globals.pleaseWait')"
         :showing="isLoading"
         color="primary"

src/components/ui/VnLv.vue

@@ -6,6 +6,7 @@ import { computed } from 'vue';
 
 const $props = defineProps({
     label: { type: String, default: null },
+    tooltip: { type: String, default: null },
     value: {
         type: [String, Boolean, Number],
         default: null,
@@ -40,7 +41,10 @@ const val = computed(() => $props.value);
         <template v-else>
             <div v-if="label || $slots.label" class="label">
                 <slot name="label">
-                    <span style="color: var(--vn-label-color)">{{ label }}</span>
+                    <QTooltip v-if="tooltip">{{ tooltip }}</QTooltip>
+                    <span style="color: var(--vn-label-color)">
+                        {{ label }}
+                    </span>
                 </slot>
             </div>
             <div class="value" v-if="value || $slots.value">

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"

src/components/ui/VnSearchbar.vue

@@ -46,7 +46,7 @@ const props = defineProps({
         default: null,
     },
     order: {
-        type: String,
+        type: [String, Array],
         default: '',
     },
     limit: {

src/components/ui/VnUsesMana.vue

@@ -1,60 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-const { t } = useI18n();
-const props = defineProps({
-    usesMana: {
-        type: Boolean,
-        required: true,
-    },
-    manaCode: {
-        type: String,
-        required: true,
-    },
-    manaVal: {
-        type: String,
-        default: 'mana',
-    },
-    manaLabel: {
-        type: String,
-        default: 'Promotion mana',
-    },
-    manaClaimVal: {
-        type: String,
-        default: 'manaClaim',
-    },
-    claimLabel: {
-        type: String,
-        default: 'Claim mana',
-    },
-});
-
-const manaCode = ref(props.manaCode);
-</script>
-
-<template>
-    <div class="column q-gutter-y-sm q-mt-sm">
-        <QRadio
-            v-model="manaCode"
-            dense
-            :val="manaVal"
-            :label="t(manaLabel)"
-            :dark="true"
-            class="q-mb-sm"
-        />
-        <QRadio
-            v-model="manaCode"
-            dense
-            :val="manaClaimVal"
-            :label="t(claimLabel)"
-            :dark="true"
-            class="q-mb-sm"
-        />
-    </div>
-</template>
-<i18n>
-    es:
-        Promotion mana: Maná promoción
-        Claim mana: Maná reclamación
-</i18n>

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 () => {

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 },
         });
     });
 

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;
     });
 

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;
+}

src/composables/__tests__/useSession.spec.js

@@ -64,88 +64,84 @@ describe('session', () => {
         });
     });
 
-    describe(
+    describe('login', () => {
-        'login',
+        const expectedUser = {
-        () => {
+            id: 999,
-            const expectedUser = {
+            name: `T'Challa`,
-                id: 999,
+            nickname: 'Black Panther',
-                name: `T'Challa`,
+            lang: 'en',
-                nickname: 'Black Panther',
+            userConfig: {
-                lang: 'en',
+                darkMode: false,
-                userConfig: {
+            },
-                    darkMode: false,
+            worker: { department: { departmentFk: 155 } },
+        };
+        const rolesData = [
+            {
+                role: {
+                    name: 'salesPerson',
                 },
-                worker: { department: { departmentFk: 155 } },
+            },
-            };
+            {
-            const rolesData = [
+                role: {
-                {
+                    name: 'admin',
-                    role: {
-                        name: 'salesPerson',
-                    },
                 },
-                {
+            },
-                    role: {
+        ];
-                        name: 'admin',
+        beforeEach(() => {
-                    },
+            vi.spyOn(axios, 'get').mockImplementation((url) => {
-                },
+                if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
-            ];
+                return Promise.resolve({
-            beforeEach(() => {
+                    data: { roles: rolesData, user: expectedUser },
-                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 () => {
+        it('should fetch the user roles and then set token in the sessionStorage', async () => {
-                const expectedRoles = ['salesPerson', 'admin'];
+            const expectedRoles = ['salesPerson', 'admin'];
-                const expectedToken = 'mySessionToken';
+            const expectedToken = 'mySessionToken';
-                const expectedTokenMultimedia = 'mySessionTokenMultimedia';
+            const expectedTokenMultimedia = 'mySessionTokenMultimedia';
-                const keepLogin = false;
+            const keepLogin = false;
 
-                await session.login({
+            await session.login({
-                    token: expectedToken,
+                token: expectedToken,
-                    tokenMultimedia: expectedTokenMultimedia,
+                tokenMultimedia: expectedTokenMultimedia,
-                    keepLogin,
+                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
             });
 
-            it('should fetch the user roles and then set token in the localStorage', async () => {
+            const roles = state.getRoles();
-                const expectedRoles = ['salesPerson', 'admin'];
+            const localToken = localStorage.getItem('token');
-                const expectedToken = 'myLocalToken';
+            const sessionToken = sessionStorage.getItem('token');
-                const expectedTokenMultimedia = 'myLocalTokenMultimedia';
-                const keepLogin = true;
 
-                await session.login({
+            expect(roles.value).toEqual(expectedRoles);
-                    token: expectedToken,
+            expect(localToken).toBeNull();
-                    tokenMultimedia: expectedTokenMultimedia,
+            expect(sessionToken).toEqual(expectedToken);
-                    keepLogin,
-                });
 
-                const roles = state.getRoles();
+            await session.destroy(); // this clears token and user for any other test
-                const localToken = localStorage.getItem('token');
+        });
-                const sessionToken = sessionStorage.getItem('token');
 
-                expect(roles.value).toEqual(expectedRoles);
+        it('should fetch the user roles and then set token in the localStorage', async () => {
-                expect(localToken).toEqual(expectedToken);
+            const expectedRoles = ['salesPerson', 'admin'];
-                expect(sessionToken).toBeNull();
+            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';

src/composables/getValueFromPath.js

@@ -0,0 +1,11 @@
+export function getValueFromPath(root, path) {
+    if (!root || !path) return;
+    const keys = path.toString().split('.');
+    let current = root;
+
+    for (const key of keys) {
+        if (current[key] === undefined) return undefined;
+        else current = current[key];
+    }
+    return current;
+}

src/composables/getWeekdays.js

@@ -0,0 +1,10 @@
+import { ref } from 'vue';
+import moment from 'moment';
+
+export default function useWeekdaysOrder() {
+
+  const firstDay = moment().weekday(1).day();
+  const weekdays = [...Array(7).keys()].map(i => (i + firstDay) % 7);
+
+  return ref(weekdays);
+}

src/composables/updateMinPriceBeforeSave.js

@@ -0,0 +1,51 @@
+import axios from 'axios';
+
+export async function beforeSave(data, getChanges, modelOrigin) {
+    try {
+        const changes = data.updates;
+        if (!changes) return data;
+        const patchPromises = [];
+
+        for (const change of changes) {
+            let patchData = {};
+
+            if ('hasMinPrice' in change.data) {
+                patchData.hasMinPrice = change.data?.hasMinPrice;
+                delete change.data.hasMinPrice;
+            }
+            if ('minPrice' in change.data) {
+                patchData.minPrice = change.data?.minPrice;
+                delete change.data.minPrice;
+            }
+
+            if (Object.keys(patchData).length > 0) {
+                const promise = axios
+                    .get(`${modelOrigin}/findOne`, {
+                        params: {
+                            filter: {
+                                fields: ['itemFk'],
+                                where: { id: change.where.id },
+                            },
+                        },
+                    })
+                    .then((row) => {
+                        return axios.patch(`Items/${row.data.itemFk}`, patchData);
+                    })
+                    .catch((error) => {
+                        console.error('Error processing change: ', change, error);
+                    });
+
+                patchPromises.push(promise);
+            }
+        }
+
+        await Promise.all(patchPromises);
+
+        data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
+
+        return data;
+    } catch (error) {
+        console.error('Error in beforeSave:', error);
+        throw error;
+    }
+}

src/composables/useArrayData.js

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

src/css/app.scss

@@ -343,3 +343,20 @@ input::-webkit-inner-spin-button {
 .q-item__section--main ~ .q-item__section--side {
     padding-inline: 0;
 }
+
+.calendars-header {
+    height: 45px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background-color: $primary;
+    font-weight: bold;
+    font-size: 16px;
+}
+
+.calendars-container {
+    max-width: 800px;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-evenly;
+}

src/css/quasar.variables.scss

@@ -18,6 +18,7 @@ $positive: #c8e484;
 $negative: #fb5252;
 $info: #84d0e2;
 $warning: #f4b974;
+$neutral: #b0b0b0;
 // Pendiente de cuadrar con la base de datos
 $success: $positive;
 $alert: $negative;
@@ -51,3 +52,6 @@ $width-xl: 1600px;
 .bg-alert {
     background-color: $negative;
 }
+.bg-neutral {
+    background-color: $neutral;
+}

src/i18n/locale/en.yml

@@ -6,6 +6,7 @@ globals:
     quantity: Quantity
     entity: Entity
     preview: Preview
+    scrollToTop: Go up
     user: User
     details: Details
     collapseMenu: Collapse lateral menu
@@ -19,6 +20,7 @@ globals:
     logOut: Log out
     date: Date
     dataSaved: Data saved
+    openDetail: Open detail
     dataDeleted: Data deleted
     delete: Delete
     search: Search
@@ -160,6 +162,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
@@ -341,6 +346,7 @@ globals:
         parking: Parking
         vehicleList: Vehicles
         vehicle: Vehicle
+        entryPreAccount: Pre-account
     unsavedPopup:
         title: Unsaved changes will be lost
         subtitle: Are you sure exit without saving?
@@ -877,6 +883,11 @@ components:
         active: Is active
         floramondo: Is floramondo
         showBadDates: Show future items
+        name: Nombre
+        rate2: Grouping price
+        rate3: Packing price
+        minPrice: Min. Price
+        itemFk: Item id
     userPanel:
         copyToken: Token copied to clipboard
         settings: Settings

src/i18n/locale/es.yml

@@ -6,6 +6,7 @@ globals:
     quantity: Cantidad
     entity: Entidad
     preview: Vista previa
+    scrollToTop: Ir arriba
     user: Usuario
     details: Detalles
     collapseMenu: Contraer menú lateral
@@ -20,10 +21,11 @@ globals:
     date: Fecha
     dataSaved: Datos guardados
     dataDeleted: Datos eliminados
+    dataCreated: Datos creados
+    openDetail: Ver detalle
     delete: Eliminar
     search: Buscar
     changes: Cambios
-    dataCreated: Datos creados
     add: Añadir
     create: Crear
     edit: Modificar
@@ -164,6 +166,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
@@ -344,6 +349,7 @@ globals:
         parking: Parking
         vehicleList: Vehículos
         vehicle: Vehículo
+        entryPreAccount: Precontabilizar
     unsavedPopup:
         title: Los cambios que no haya guardado se perderán
         subtitle: ¿Seguro que quiere salir sin guardar?
@@ -961,6 +967,11 @@ components:
         to: Hasta
         floramondo: Floramondo
         showBadDates: Ver items a futuro
+        name: Nombre
+        rate2: Precio grouping
+        rate3: Precio packing
+        minPrice: Precio mínimo
+        itemFk: Id item
     userPanel:
         copyToken: Token copiado al portapapeles
         settings: Configuración

src/pages/Claim/Card/ClaimDescriptor.vue

@@ -28,14 +28,8 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-const STATE_COLOR = {
+function stateColor(entity) {
-    pending: 'warning',
+    return entity?.claimState?.classColor;
-    incomplete: 'info',
-    resolved: 'positive',
-    canceled: 'negative',
-};
-function stateColor(code) {
-    return STATE_COLOR[code];
 }
 
 onMounted(async () => {
@@ -57,9 +51,8 @@ onMounted(async () => {
             <VnLv v-if="entity.claimState" :label="t('claim.state')">
                 <template #value>
                     <QBadge
-                        :color="stateColor(entity.claimState.code)"
+                        :color="stateColor(entity)"
-                        text-color="black"
+                        style="color: var(--vn-black-text-color)"
-                        dense
                     >
                         {{ entity.claimState.description }}
                     </QBadge>

src/pages/Claim/Card/ClaimLines.vue

@@ -123,8 +123,8 @@ async function fetchMana() {
 
 async function updateDiscount({ saleFk, discount, canceller }) {
     const body = { salesIds: [saleFk], newDiscount: discount };
-    const claimId = claim.value.ticketFk;
+    const ticketFk = claim.value.ticketFk;
-    const query = `Tickets/${claimId}/updateDiscount`;
+    const query = `Tickets/${ticketFk}/updateDiscount`;
 
     await axios.post(query, body, {
         signal: canceller.signal,

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"

src/pages/Claim/Card/ClaimSummary.vue

@@ -108,15 +108,9 @@ const markerLabels = [
     { value: 5, label: t('claim.person') },
 ];
 
-const STATE_COLOR = {
-    pending: 'warning',
-    incomplete: 'info',
-    resolved: 'positive',
-    canceled: 'negative',
-};
-
 function stateColor(code) {
-    return STATE_COLOR[code];
+    const claimState = claimStates.value.find((state) => state.code === code);
+    return claimState?.classColor;
 }
 
 const developmentColumns = ref([
@@ -188,7 +182,7 @@ function claimUrl(section) {
 <template>
     <FetchData
         url="ClaimStates"
-        :filter="{ fields: ['id', 'description'] }"
+        :filter="{ fields: ['id', 'description', 'code', 'classColor'] }"
         @on-fetch="(data) => (claimStates = data)"
         auto-load
     />
@@ -346,17 +340,18 @@ function claimUrl(section) {
                     <template #body="props">
                         <QTr :props="props">
                             <QTd v-for="col in props.cols" :key="col.name" :props="props">
-                                <span v-if="col.name != 'description'">{{
+                                <template v-if="col.name === 'description'">
-                                    t(col.value)
+                                    <span class="link">{{
-                                }}</span>
+                                        dashIfEmpty(col.field(props.row))
-                                <span class="link" v-if="col.name === 'description'">{{
+                                    }}</span>
-                                    t(col.value)
+                                    <ItemDescriptorProxy
-                                }}</span>
+                                        :id="props.row.sale.itemFk"
-                                <ItemDescriptorProxy
+                                        :sale-fk="props.row.saleFk"
-                                    v-if="col.name == 'description'"
+                                    />
-                                    :id="props.row.sale.itemFk"
+                                </template>
-                                    :sale-fk="props.row.saleFk"
+                                <template v-else>
-                                ></ItemDescriptorProxy>
+                                    {{ dashIfEmpty(col.field(props.row)) }}
+                                </template>
                             </QTd>
                         </QTr>
                     </template>

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',
-                })
+                }),
             );
         });
     });

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);
         });

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();

src/pages/Claim/ClaimList.vue

@@ -101,7 +101,10 @@ const columns = computed(() => [
         name: 'stateCode',
         chip: {
             condition: () => true,
-            color: ({ stateCode }) => STATE_COLOR[stateCode] ?? 'bg-grey',
+            color: ({ stateCode }) => {
+                const state = states.value?.find(({ code }) => code === stateCode);
+                return `bg-${state.classColor}`;
+            },
         },
         columnFilter: {
             name: 'claimStateFk',
@@ -131,12 +134,6 @@ const columns = computed(() => [
         ],
     },
 ]);
-
-const STATE_COLOR = {
-    pending: 'bg-warning',
-    loses: 'bg-negative',
-    resolved: 'bg-positive',
-};
 </script>
 
 <template>

src/pages/Customer/Card/CustomerBalance.vue

@@ -131,6 +131,7 @@ const columns = computed(() => [
         name: 'isConciliate',
         label: t('Conciliated'),
         cardVisible: true,
+        component: 'checkbox',
     },
     {
         align: 'left',

src/pages/Customer/Card/CustomerBillingData.vue

@@ -9,6 +9,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
+import VnInputBic from 'src/components/common/VnInputBic.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -17,7 +18,7 @@ const bankEntitiesRef = ref(null);
 
 const filter = {
     fields: ['id', 'bic', 'name'],
-    order: 'bic ASC'
+    order: 'bic ASC',
 };
 
 const getBankEntities = (data, formData) => {
@@ -43,13 +44,11 @@ const getBankEntities = (data, formData) => {
             </VnRow>
 
             <VnRow>
-                <VnInput :label="t('IBAN')" clearable v-model="data.iban">
+                <VnInputBic
-                    <template #append>
+                    :label="t('IBAN')"
-                        <QIcon name="info" class="cursor-info">
+                    v-model="data.iban"
-                            <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
+                    @update-bic="(bankEntityFk) => (data.bankEntityFk = bankEntityFk)"
-                        </QIcon>
+                />
-                    </template>
-                </VnInput>
                 <VnSelectDialog
                     :label="t('Swift / BIC')"
                     ref="bankEntitiesRef"

src/pages/Customer/Card/CustomerConsumption.vue

@@ -18,7 +18,7 @@ import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
-const arrayData = useArrayData('Client');
+const arrayData = useArrayData('Customer');
 const { t } = useI18n();
 const route = useRoute();
 const campaignList = ref();
@@ -260,7 +260,7 @@ const updateDateParams = (value, params) => {
                     :label="t('globals.campaign')"
                     :filled="true"
                     class="q-px-sm q-pt-none fit"
-                    :option-label="(opt) => t(opt.code)"
+                    :option-label="(opt) => t(opt.code ?? '')"
                     :fields="['id', 'code', 'dated', 'scopeDays']"
                     @update:model-value="(data) => updateDateParams(data, params)"
                     dense

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());

src/pages/Customer/Card/CustomerDescriptorProxy.vue

@@ -11,7 +11,7 @@ const $props = defineProps({
 </script>
 
 <template>
-    <QPopupProxy>
+    <QPopupProxy data-cy="CustomerDescriptor">
         <CustomerDescriptor v-if="$props.id" :id="$props.id" :summary="CustomerSummary" />
     </QPopupProxy>
 </template>

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -79,14 +79,14 @@ async function acceptPropagate({ isEqualizated }) {
         observe-form-changes
         @on-data-saved="checkEtChanges"
     >
-        <template #form="{ data, validate }">
+        <template #form="{ data, validate, validations }">
             <VnRow>
                 <VnInput
                     :label="t('Social name')"
                     :required="true"
                     :rules="validate('client.socialName')"
                     clearable
-                    uppercase="true"
+                    :uppercase="true"
                     v-model="data.socialName"
                 >
                     <template #append>
@@ -112,6 +112,7 @@ async function acceptPropagate({ isEqualizated }) {
                     v-model="data.sageTaxTypeFk"
                     data-cy="sageTaxTypeFk"
                     :required="data.isTaxDataChecked"
+                    :rules="[(val) => validations.required(data.isTaxDataChecked, val)]"
                 />
                 <VnSelect
                     :label="t('Sage transaction type')"
@@ -122,6 +123,9 @@ async function acceptPropagate({ isEqualizated }) {
                     data-cy="sageTransactionTypeFk"
                     v-model="data.sageTransactionTypeFk"
                     :required="data.isTaxDataChecked"
+                    :rules="[
+                        (val) => validations.required(data.sageTransactionTypeFk, val),
+                    ]"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">

src/pages/Customer/Card/CustomerSamples.vue

@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import { QBtn, useQuasar } from 'quasar';
-
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
 import VnTable from 'src/components/VnTable/VnTable.vue';
@@ -34,7 +33,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        format: (row) => row.type.description,
+        format: (row) => row?.type?.description,
         label: t('Description'),
         name: 'description',
     },
@@ -74,12 +73,11 @@ const tableRef = ref();
 <template>
     <VnTable
         ref="tableRef"
-        data-key="ClientSamples"
+        data-key="CustomerSamples"
         auto-load
-        :filter="filter"
+        :user-filter="filter"
         url="ClientSamples"
         :columns="columns"
-        :pagination="{ rowsPerPage: 12 }"
         :disable-option="{ card: true }"
         :right-search="false"
         :rows="rows"

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);
@@ -181,11 +181,11 @@ const sumRisk = ({ clientRisks }) => {
             <QCard class="vn-one">
                 <VnTitle
                     :url="`#/customer/${entityId}/billing-data`"
-                    :text="t('customer.summary.billingData')"
+                    :text="t('customer.summary.payMethodFk')"
                 />
                 <VnLv
                     :label="t('customer.summary.payMethod')"
-                    :value="entity.payMethod.name"
+                    :value="entity.payMethod?.name"
                 />
                 <VnLv :label="t('customer.summary.bankAccount')" :value="entity.iban" />
                 <VnLv :label="t('customer.summary.dueDay')" :value="entity.dueDay" />
@@ -208,7 +208,8 @@ const sumRisk = ({ clientRisks }) => {
                     :text="t('customer.summary.consignee')"
                 />
                 <VnLv
-                    :label="t('customer.summary.addressName')"
+                    :tooltip="t('customer.summary.addressName')"
+                    :label="t('customer.summary.addressNameAbbr')"
                     :value="entity.defaultAddress.nickname"
                 />
                 <VnLv
@@ -252,7 +253,8 @@ const sumRisk = ({ clientRisks }) => {
                 />
                 <VnLv
                     v-if="entity.claimsRatio"
-                    :label="t('customer.summary.priceIncreasingRate')"
+                    :tooltip="t('customer.summary.priceIncreasingRate')"
+                    :label="t('customer.summary.priceIncreasingRateAbbr')"
                     :value="toPercentage(priceIncreasingRate)"
                 />
                 <VnLv
@@ -261,7 +263,8 @@ const sumRisk = ({ clientRisks }) => {
                 />
                 <VnLv
                     v-if="entity.claimsRatio"
-                    :label="t('customer.summary.claimRate')"
+                    :label="t('customer.summary.claimRateAbbr')"
+                    :tooltip="t('customer.summary.claimRate')"
                     :value="toPercentage(claimRate)"
                 />
             </QCard>
@@ -289,7 +292,7 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv
                     v-if="entity.creditInsurance"
                     :label="t('customer.summary.securedCredit')"
-                    :value="toCurrency(entity.creditInsurance)"
+                    :value="`${toCurrency(entity.creditInsurance)} (${entity.classifications[0]?.insurances[0]?.grade || ''})`"
                     :info="t('customer.summary.securedCreditInfo')"
                 />
 
@@ -318,8 +321,9 @@ const sumRisk = ({ clientRisks }) => {
                 />
 
                 <VnLv
-                    :label="t('customer.summary.recommendCredit')"
+                    :label="t('customer.summary.recommendCreditAbbr')"
-                    :value="entity.recommendedCredit"
+                    :tooltip="t('customer.summary.recommendCredit')"
+                    :value="toCurrency(entity.recommendedCredit)"
                 />
             </QCard>
             <QCard class="vn-max">

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>

src/pages/Customer/CustomerList.vue

@@ -111,14 +111,11 @@ const columns = computed(() => [
             component: 'number',
         },
         columnField: {
-            component: null,
+            component: markRaw(VnLinkPhone),
-            after: {
+            attrs: ({ model }) => {
-                component: markRaw(VnLinkPhone),
+                return {
-                attrs: ({ model }) => {
+                    'phone-number': model,
-                    return {
+                };
-                        'phone-number': model,
-                    };
-                },
             },
         },
     },

src/pages/Customer/Payments/__tests__/CustomerPayments.spec.js

@@ -32,7 +32,7 @@ describe('CustomerPayments', () => {
                 expect.objectContaining({
                     message: 'Payment confirmed',
                     type: 'positive',
-                })
+                }),
             );
         });
     });

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"

src/pages/Customer/locale/en.yml

@@ -42,14 +42,17 @@ customer:
         hasCoreVnl: Has core VNL
         hasB2BVnl: Has B2B VNL
         addressName: Address name
+        addressNameAbbr: A. Name
         addressCity: City
         username: Username
         webAccess: Web access
         totalGreuge: Total greuge
         mana: Mana
         priceIncreasingRate: Price increasing rate
+        priceIncreasingRateAbbr: Price inc. rate
         averageInvoiced: Average invoiced
         claimRate: Claming rate
+        claimRateAbbr: Claim. rate
         payMethodFk: Billing data
         risk: Risk
         maximumRisk: Solunion's maximum risk
@@ -68,6 +71,7 @@ customer:
         descriptorInfo: Invoices minus payments plus orders not yet
         rating: Rating
         recommendCredit: Recommended credit
+        recommendCreditAbbr: Rec. credit
         goToLines: Go to lines
     basicData:
         socialName: Fiscal name

src/pages/Customer/locale/es.yml

@@ -42,14 +42,17 @@ customer:
         hasCoreVnl: Recibido core VNL
         hasB2BVnl: Recibido B2B VNL
         addressName: Nombre de la dirección
+        addressNameAbbr: N. Dirección
         addressCity: Ciudad
         username: Usuario
         webAccess: Acceso web
         totalGreuge: Greuge total
         mana: Maná
         priceIncreasingRate: Ratio de incremento de precio
+        priceIncreasingRateAbbr: R. Inc. Precio
         averageInvoiced: Facturación media
         claimRate: Ratio de reclamaciones
+        claimRateAbbr: R. Reclamaciones
         maximumRisk: Riesgo máximo asumido por Solunion
         payMethodFk: Forma de pago
         risk: Riesgo
@@ -68,6 +71,7 @@ customer:
         descriptorInfo: Facturas menos recibos mas pedidos sin facturar
         rating: Clasificación
         recommendCredit: Crédito recomendado
+        recommendCreditAbbr: Cr. Recomendado
         goToLines: Ir a líneas
     basicData:
         socialName: Nombre fiscal

src/pages/Entry/Card/EntryBuys.vue

@@ -19,6 +19,7 @@ import { checkEntryLock } from 'src/composables/checkEntryLock';
 import VnRow from 'src/components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import { beforeSave } from 'src/composables/updateMinPriceBeforeSave';
 
 const $props = defineProps({
     id: {
@@ -415,56 +416,6 @@ function getAmountStyle(row) {
     return { color: 'var(--vn-label-color)' };
 }
 
-async function beforeSave(data, getChanges) {
-    try {
-        const changes = data.updates;
-        if (!changes) return data;
-        const patchPromises = [];
-
-        for (const change of changes) {
-            let patchData = {};
-
-            if ('hasMinPrice' in change.data) {
-                patchData.hasMinPrice = change.data?.hasMinPrice;
-                delete change.data.hasMinPrice;
-            }
-            if ('minPrice' in change.data) {
-                patchData.minPrice = change.data?.minPrice;
-                delete change.data.minPrice;
-            }
-
-            if (Object.keys(patchData).length > 0) {
-                const promise = axios
-                    .get('Buys/findOne', {
-                        params: {
-                            filter: {
-                                fields: ['itemFk'],
-                                where: { id: change.where.id },
-                            },
-                        },
-                    })
-                    .then((buy) => {
-                        return axios.patch(`Items/${buy.data.itemFk}`, patchData);
-                    })
-                    .catch((error) => {
-                        console.error('Error processing change: ', change, error);
-                    });
-
-                patchPromises.push(promise);
-            }
-        }
-
-        await Promise.all(patchPromises);
-
-        data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
-
-        return data;
-    } catch (error) {
-        console.error('Error in beforeSave:', error);
-        throw error;
-    }
-}
-
 function invertQuantitySign(rows, sign) {
     for (const row of rows) {
         if (sign > 0) row.quantity = Math.abs(row.quantity);
@@ -697,7 +648,7 @@ onMounted(() => {
         :right-search="false"
         :row-click="false"
         :columns="columns"
-        :beforeSaveFn="beforeSave"
+        :beforeSaveFn="(data, getChanges) => beforeSave(data, getChanges, 'Buys')"
         class="buyList"
         :table-height="$props.tableHeight ?? '84vh'"
         auto-load
@@ -787,7 +738,7 @@ onMounted(() => {
             <span data-cy="footer-amount">{{ footer?.amount }} / </span>
             <span style="color: var(--q-positive)">{{ footer?.checkedAmount }}</span>
         </template>
-        <template #column-create-itemFk="{ data }">
+        <template #column-create-itemFk="{ data, validations }">
             <VnSelect
                 url="Items/search"
                 v-model="data.itemFk"
@@ -801,7 +752,8 @@ onMounted(() => {
                         await setBuyUltimate(value, data);
                     }
                 "
-                :required="true"
+                required
+                :rules="[(val) => validations.required(true, val)]"
                 data-cy="itemFk-create-popup"
                 sort-by="nickname DESC"
             >

src/pages/Entry/EntryPreAccount.vue

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

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

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

src/pages/Entry/locale/en.yml

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

src/pages/Entry/locale/es.yml

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

src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue

@@ -5,7 +5,7 @@ import InvoiceInSummary from './InvoiceInSummary.vue';
 const $props = defineProps({
     id: {
         type: Number,
-        required: true,
+        default: null,
     },
 });
 </script>

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>

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -79,6 +79,30 @@ const columns = computed(() => [
             inWhere: true,
         },
     },
+    {
+        align: 'left',
+        name: 'issued',
+        label: t('invoiceOut.summary.issued'),
+        component: 'date',
+        format: (row) => toDate(row.issued),
+        columnField: { component: null },
+    },
+    {
+        align: 'left',
+        name: 'created',
+        label: t('globals.created'),
+        component: 'date',
+        columnField: { component: null },
+        format: (row) => toDate(row.created),
+    },
+    {
+        align: 'left',
+        name: 'dued',
+        label: t('invoiceOut.summary.expirationDate'),
+        component: 'date',
+        columnField: { component: null },
+        format: (row) => toDate(row.dued),
+    },
     {
         align: 'left',
         name: 'clientFk',
@@ -132,22 +156,6 @@ const columns = computed(() => [
         cardVisible: true,
         format: (row) => toCurrency(row.amount),
     },
-    {
-        align: 'left',
-        name: 'created',
-        label: t('globals.created'),
-        component: 'date',
-        columnField: { component: null },
-        format: (row) => toDate(row.created),
-    },
-    {
-        align: 'left',
-        name: 'dued',
-        label: t('invoiceOut.summary.dued'),
-        component: 'date',
-        columnField: { component: null },
-        format: (row) => toDate(row.dued),
-    },
     {
         align: 'left',
         name: 'customsAgentFk',

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"