refactor: streamline image build process in run.sh

Merge pull request 'fix: refs #7967 show userErr & useNotify composable' (!1725 ) from 7939-showUserErr into dev
Reviewed-on: #1725 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
2025-05-12 12:39:08 +02:00 · 2025-05-12 10:35:45 +00:00 · 2025-05-12 10:42:00 +02:00 · 2025-05-12 08:19:22 +00:00 · 2025-05-12 10:13:16 +02:00 · 2025-05-12 10:13:14 +02:00
211 changed files with 5532 additions and 1446 deletions
--- a/.husky/addReferenceTag.js
+++ b/.husky/addReferenceTag.js
@ -26,7 +26,7 @@ if (branchName) {
        const splitedMsg = msg.split(':');
        if (splitedMsg.length > 1) {
-            const finalMsg = splitedMsg[0] + ': ' + referenceTag + splitedMsg.slice(1).join(':');
+            const finalMsg = `${splitedMsg[0]}: ${referenceTag}${splitedMsg.slice(1).join(':')}`;
            writeFileSync(msgPath, finalMsg);
        }
    }
--- a/cypress.config.js
+++ b/cypress.config.js
@ -1,6 +1,9 @@
 import { defineConfig } from 'cypress';
-let urlHost, reporter, reporterOptions, timeouts;
+let urlHost;
 let reporter;
 let reporterOptions;
 let timeouts;
 if (process.env.CI) {
    urlHost = 'front';
@ -61,5 +64,6 @@ export default defineConfig({
        ...timeouts,
        includeShadowDom: true,
        waitForAnimations: true,
        testIsolation: false,
    },
 });
--- a/index.html
+++ b/index.html
@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
    <head>
        <title><%= productName %></title>
@ -12,7 +12,12 @@
            content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width<% if (ctx.mode.cordova || ctx.mode.capacitor) { %>, viewport-fit=cover<% } %>"
        />
-        <link rel="icon" type="image/png" sizes="128x128" href="icons/favicon-128x128.png" />
+        <link
            rel="icon"
            type="image/png"
            sizes="128x128"
            href="icons/favicon-128x128.png"
        />
        <link rel="icon" type="image/png" sizes="96x96" href="icons/favicon-96x96.png" />
        <link rel="icon" type="image/png" sizes="32x32" href="icons/favicon-32x32.png" />
        <link rel="icon" type="image/png" sizes="16x16" href="icons/favicon-16x16.png" />
--- a/postcss.config.js
+++ b/postcss.config.js
@ -1,4 +1,3 @@
 /* eslint-disable */
 // https://github.com/michael-ciniawsky/postcss-load-config
 import autoprefixer from 'autoprefixer';
--- a/quasar.config.js
+++ b/quasar.config.js
@ -13,7 +13,7 @@ import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
 import path from 'path';
 const target = `http://${process.env.CI ? 'back' : 'localhost'}:3000`;
-export default configure(function (/* ctx */) {
+export default configure((/* ctx */) => {
    return {
        eslint: {
            // fix: true,
--- a/quasar.extensions.json
+++ b/quasar.extensions.json
@ -1,8 +1,6 @@
 {
    "@quasar/testing-unit-vitest": {
-        "options": [
+        "options": ["scripts"]
            "scripts"
        ]
    },
    "@quasar/qcalendar": {}
 }
--- a/quasar.testing.json
+++ b/quasar.testing.json
@ -1,5 +1,5 @@
 {
-  "unit-vitest": {
+    "unit-vitest": {
-    "runnerCommand": "vitest run"
+        "runnerCommand": "vitest run"
-  }
+    }
 }
--- a/src/App.vue
+++ b/src/App.vue
@ -39,7 +39,7 @@ quasar.iconMapFn = (iconName) => {
 <template>
    <RouterView />
-    <VnScroll/>
+    <VnScroll />
 </template>
 <style lang="scss">
--- a/src/boot/defaults/setDefault.js
+++ b/src/boot/defaults/setDefault.js
@ -11,8 +11,8 @@ export default function (component, key, value) {
            };
            break;
        case 'undefined':
-            throw new Error('unknown prop: ' + key);
+            throw new Error(`unknown prop: ${key}`);
        default:
-            throw new Error('unhandled type: ' + typeof prop);
+            throw new Error(`unhandled type: ${typeof prop}`);
    }
 }
--- a/src/boot/mainShortcutMixin.js
+++ b/src/boot/mainShortcutMixin.js
@ -9,7 +9,7 @@ export default {
        const keyBindingMap = routes
            .filter((route) => route.meta.keyBinding)
            .reduce((map, route) => {
-                map['Key' + route.meta.keyBinding.toUpperCase()] = route.path;
+                map[`Key${route.meta.keyBinding.toUpperCase()}`] = route.path;
                return map;
            }, {});
--- a/src/boot/quasar.defaults.js
+++ b/src/boot/quasar.defaults.js
@ -1,4 +1,3 @@
 /* eslint-disable eslint/export */
 export * from './defaults/qTable';
 export * from './defaults/qInput';
 export * from './defaults/qSelect';
--- a/src/boot/quasar.js
+++ b/src/boot/quasar.js
@ -7,7 +7,7 @@ import { QLayout } from 'quasar';
 import mainShortcutMixin from './mainShortcutMixin';
 import { useCau } from 'src/composables/useCau';
-export default boot(({ app }) => {
+export default boot(({ app, router }) => {
    QForm.mixins = [qFormMixin];
    QLayout.mixins = [mainShortcutMixin];
@ -22,14 +22,19 @@ export default boot(({ app }) => {
        }
        switch (response?.status) {
            case 401:
                if (!router.currentRoute.value.name.toLowerCase().includes('login')) {
                    message = 'errors.sessionExpired';
                } else message = 'login.loginError';
                break;
            case 403:
                if (!message || message.toLowerCase() === 'access denied')
                    message = 'errors.accessDenied';
            case 422:
                if (error.name == 'ValidationError')
-                    message +=
+                    message += ` "${responseError.details.context}.${Object.keys(
-                        ' "' +
+                        responseError.details.codes,
-                        responseError.details.context +
+                    ).join(',')}"`;
                        '.' +
                        Object.keys(responseError.details.codes).join(',') +
                        '"';
                break;
            case 500:
                message = 'errors.statusInternalServerError';
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@ -25,7 +25,7 @@ const autonomiesRef = ref([]);
 const onDataSaved = (dataSaved, requestResponse) => {
    requestResponse.autonomy = autonomiesRef.value.opts.find(
-        (autonomy) => autonomy.id == requestResponse.autonomyFk
+        (autonomy) => autonomy.id == requestResponse.autonomyFk,
    );
    emit('onDataSaved', dataSaved, requestResponse);
 };
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, useAttrs, watch } from 'vue';
+import { computed, ref, useAttrs, watch, nextTick } from 'vue';
 import { useRouter, onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@ -42,7 +42,15 @@ const $props = defineProps({
    },
    dataRequired: {
        type: Object,
-        default: () => {},
+        default: () => ({}),
    },
    dataDefault: {
        type: Object,
        default: () => ({}),
    },
    insertOnLoad: {
        type: Boolean,
        default: false,
    },
    defaultSave: {
        type: Boolean,
@ -87,6 +95,7 @@ const formData = ref();
 const saveButtonRef = ref(null);
 const watchChanges = ref();
 const formUrl = computed(() => $props.url);
 const rowsContainer = ref(null);
 const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
@ -122,9 +131,11 @@ async function fetch(data) {
    const rows = keyData ? data[keyData] : data;
    resetData(rows);
    emit('onFetch', rows);
    $props.insertOnLoad && await insert();
    return rows;
 }
 function resetData(data) {
    if (!data) return;
    if (data && Array.isArray(data)) {
@ -135,9 +146,16 @@ function resetData(data) {
    formData.value = JSON.parse(JSON.stringify(data));
    if (watchChanges.value) watchChanges.value(); //destroy watcher
-    watchChanges.value = watch(formData, () => (hasChanges.value = true), { deep: true });
+    watchChanges.value = watch(formData, (nVal) => {
-}
+        hasChanges.value = false;
        const filteredNewData = nVal.filter(row => !isRowEmpty(row) || row[$props.primaryKey]);
        const filteredOriginal = originalData.value.filter(row => row[$props.primaryKey]);
        const changes = getDifferences(filteredOriginal, filteredNewData);
        hasChanges.value = !isEmpty(changes);
    }, { deep: true });
 }
 async function reset() {
    await fetch(originalData.value);
    hasChanges.value = false;
@ -165,7 +183,9 @@ async function onSubmit() {
        });
    }
    isLoading.value = true;
    await saveChanges($props.saveFn ? formData.value : null);
 }
 async function onSubmitAndGo() {
@ -174,6 +194,10 @@ async function onSubmitAndGo() {
 }
 async function saveChanges(data) {
    formData.value = formData.value.filter(row => 
    row[$props.primaryKey] || !isRowEmpty(row)
    );
    if ($props.saveFn) {
        $props.saveFn(data, getChanges);
        isLoading.value = false;
@ -203,14 +227,32 @@ async function saveChanges(data) {
    });
 }
-async function insert(pushData = $props.dataRequired) {
+async function insert(pushData = { ...$props.dataRequired, ...$props.dataDefault }) {
-    const $index = formData.value.length
+    formData.value = formData.value.filter(row => !isRowEmpty(row));
-        ? formData.value[formData.value.length - 1].$index + 1
+
-        : 0;
+    const lastRow = formData.value.at(-1);
-    formData.value.push(Object.assign({ $index }, pushData));
+    const isLastRowEmpty = lastRow ? isRowEmpty(lastRow) : false;
-    hasChanges.value = true;
+    
    if (formData.value.length && isLastRowEmpty) return;
    const $index = formData.value.length ? formData.value.at(-1).$index + 1 : 0;
    const nRow = Object.assign({ $index }, pushData);
    formData.value.push(nRow);
    const hasChange = Object.keys(nRow).some(key => !isChange(nRow, key));
    if (hasChange) hasChanges.value = true;
 }
 function isRowEmpty(row) {
    return Object.keys(row).every(key => isChange(row, key));
 }
 function isChange(row,key){
    return !row[key] || key == '$index' || Object.hasOwn($props.dataRequired || {}, key);
 }
 async function remove(data) {
    if (!data.length)
        return quasar.notify({
@ -227,10 +269,8 @@ async function remove(data) {
        newData = newData.filter(
            (form) => !preRemove.some((index) => index == form.$index),
        );
-        const changes = getChanges();
+        formData.value = newData;
-        if (!changes.creates?.length && !changes.updates?.length)
+        hasChanges.value = JSON.stringify(removeIndexField(formData.value)) !== JSON.stringify(removeIndexField(originalData.value));
            hasChanges.value = false;
        fetch(newData);
    }
    if (ids.length) {
        quasar
@ -248,9 +288,8 @@ async function remove(data) {
                newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
                fetch(newData);
            });
    } else {
        reset();
    }
    emit('update:selected', []);
 }
@ -261,7 +300,7 @@ function getChanges() {
    const pk = $props.primaryKey;
    for (const [i, row] of formData.value.entries()) {
        if (!row[pk]) {
-            creates.push(row);
+            creates.push(Object.assign(row, { ...$props.dataRequired }));
        } else if (originalData.value[i]) {
            const data = getDifferences(originalData.value[i], row);
            if (!isEmpty(data)) {
@ -287,6 +326,33 @@ function isEmpty(obj) {
    return !Object.keys(obj).length;
 }
 function removeIndexField(data) {
    if (Array.isArray(data)) {
        return data.map(({ $index, ...rest }) => rest);
    } else if (typeof data === 'object' && data !== null) {
        const { $index, ...rest } = data;
        return rest;
    }
 }
 async function handleTab(event) {
    event.preventDefault();
    const { shiftKey, target } = event;
    const focusableSelector = `tbody tr td:not(:first-child) :is(a, button, input, textarea, select, details):not([disabled])`;
    const focusableElements = rowsContainer.value?.querySelectorAll(focusableSelector);
    const currentIndex = Array.prototype.indexOf.call(focusableElements, target);
    const index = shiftKey ? currentIndex - 1 : currentIndex + 1;
    const isLast = target === focusableElements[focusableElements.length - 1];
    const isFirst = currentIndex === 0;
    if ((shiftKey && !isFirst) || (!shiftKey && !isLast))
        focusableElements[index]?.focus();
    else if (isLast) {
        await insert();
        await nextTick();
    }
 }
 async function reload(params) {
    const data = await vnPaginateRef.value.fetch(params);
    fetch(data);
@ -312,12 +378,14 @@ watch(formUrl, async () => {
        v-bind="$attrs"
    >
        <template #body v-if="formData">
-            <slot
+            <div ref="rowsContainer" @keydown.tab="handleTab">
-                name="body"
+                <slot
-                :rows="formData"
+                    name="body"
-                :validate="validate"
+                    :rows="formData"
-                :filter="filter"
+                    :validate="validate"
-            ></slot>
+                    :filter="filter"
                ></slot>
            </div>
        </template>
    </VnPaginate>
    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
@ -347,8 +415,16 @@ watch(formUrl, async () => {
            <QBtnDropdown
                v-if="$props.goTo && $props.defaultSave"
                @click="onSubmitAndGo"
-                :label="tMobile('globals.saveAndContinue') + ' ' + t('globals.' + $props.goTo.split('/').pop())"
+                :label="
-                :title="t('globals.saveAndContinue') + ' ' + t('globals.' + $props.goTo.split('/').pop())"
+                    tMobile('globals.saveAndContinue') +
                    ' ' +
                    t('globals.' + $props.goTo.split('/').pop())
                "
                :title="
                    t('globals.saveAndContinue') +
                    ' ' +
                    t('globals.' + $props.goTo.split('/').pop())
                "
                :disable="!hasChanges"
                color="primary"
                icon="save"
--- a/src/components/EntityCalendar.vue
+++ b/src/components/EntityCalendar.vue
@ -8,10 +8,8 @@ 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') => (
+const formatDate = (dateToFormat, format = 'YYYY-MM-DD') =>
-  date.formatDate(dateToFormat, format)
+    date.formatDate(dateToFormat, format);
 );
 const props = defineProps({
    year: {
@ -67,7 +65,7 @@ const handleDateClick = (timestamp) => {
    emit('onDateSelected', {
        date,
        isNewMode: !event,
-        event: event?.[0] || null 
+        event: event?.[0] || null,
    });
 };
@ -107,7 +105,11 @@ defineExpose({ getEventByTimestamp, handleDateClick });
                mini-mode
            >
                <template #day="{ scope: { timestamp } }">
-                    <slot name="day" :timestamp="timestamp" :getEventAttrs="getEventAttrs">
+                    <slot
                        name="day"
                        :timestamp="timestamp"
                        :getEventAttrs="getEventAttrs"
                    >
                        <QBtn
                            v-if="getEventByTimestamp(timestamp)"
                            v-bind="{ ...getEventAttrs(timestamp) }"
--- a/src/components/EntityCalendarGrid.vue
+++ b/src/components/EntityCalendarGrid.vue
@ -5,18 +5,18 @@ import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import { useArrayData } from 'src/composables/useArrayData';
 const props = defineProps({
-  dataKey: {
+    dataKey: {
-    type: String,
+        type: String,
-    required: true,
+        required: true,
-  },
+    },
-  calendarComponent: {
+    calendarComponent: {
-    type: Object,
+        type: Object,
-    required: true,
+        required: true,
-  },
+    },
-  additionalProps: {
+    additionalProps: {
-    type: Object,
+        type: Object,
-    default: () => ({}),
+        default: () => ({}),
-  }
+    },
 });
 const stateStore = useStateStore();
@ -28,99 +28,99 @@ const lastDay = ref(Date.vnNew());
 const months = ref([]);
 const arrayData = useArrayData(props.dataKey);
 onMounted(async () => {
-  const initialDate = Date.vnNew();
+    const initialDate = Date.vnNew();
-  initialDate.setDate(1);
+    initialDate.setDate(1);
-  initialDate.setHours(0, 0, 0, 0);
+    initialDate.setHours(0, 0, 0, 0);
-  date.value = initialDate;
+    date.value = initialDate;
-  await nextTick();
+    await nextTick();
-  stateStore.rightDrawer = true;
+    stateStore.rightDrawer = true;
 });
 onUnmounted(() => arrayData.destroy());
 const emit = defineEmits([
-  'update:firstDay',
+    'update:firstDay',
-  'update:lastDay',
+    'update:lastDay',
-  'update:events',
+    'update:events',
-  'onDateSelected',
+    'onDateSelected',
 ]);
 const date = computed({
-  get: () => _date.value,
+    get: () => _date.value,
-  set: (value) => {
+    set: (value) => {
-    if (!(value instanceof Date)) return;
+        if (!(value instanceof Date)) return;
-    _date.value = value;
+        _date.value = value;
-    const stamp = value.getTime();
+        const stamp = value.getTime();
-    firstDay.value = new Date(stamp);
+        firstDay.value = new Date(stamp);
-    firstDay.value.setDate(1);
+        firstDay.value.setDate(1);
-    lastDay.value = new Date(stamp);
+        lastDay.value = new Date(stamp);
-    lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
+        lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
-    lastDay.value.setDate(0);
+        lastDay.value.setDate(0);
-    months.value = [];
+        months.value = [];
-    for (let i = 0; i < nMonths.value; i++) {
+        for (let i = 0; i < nMonths.value; i++) {
-      const monthDate = new Date(stamp);
+            const monthDate = new Date(stamp);
-      monthDate.setMonth(value.getMonth() + i);
+            monthDate.setMonth(value.getMonth() + i);
-      months.value.push(monthDate);
+            months.value.push(monthDate);
-    }
+        }
-    emit('update:firstDay', firstDay.value);
+        emit('update:firstDay', firstDay.value);
-    emit('update:lastDay', lastDay.value);
+        emit('update:lastDay', lastDay.value);
-    emit('refresh-events');
+        emit('refresh-events');
-  },
+    },
 });
 const headerTitle = computed(() => {
-  if (!months.value?.length) return '';
+    if (!months.value?.length) return '';
-  const getMonthName = date => 
+    const getMonthName = (date) =>
-    `${weekdayStore.getLocaleMonths[date.getMonth()].locale} ${date.getFullYear()}`;
+        `${weekdayStore.getLocaleMonths[date.getMonth()].locale} ${date.getFullYear()}`;
-  return `${getMonthName(months.value[0])} - ${getMonthName(months.value[months.value.length - 1])}`;
+    return `${getMonthName(months.value[0])} - ${getMonthName(months.value[months.value.length - 1])}`;
 });
 const step = (direction) => {
-  const newDate = new Date(date.value);
+    const newDate = new Date(date.value);
-  newDate.setMonth(newDate.getMonth() + nMonths.value * direction);
+    newDate.setMonth(newDate.getMonth() + nMonths.value * direction);
-  date.value = newDate;
+    date.value = newDate;
 };
 defineExpose({
    firstDay,
-    lastDay
+    lastDay,
 });
 </script>
 <template>
-  <QCard style="height: max-content">
+    <QCard style="height: max-content">
-    <div class="calendars-header">
+        <div class="calendars-header">
-      <QBtn
+            <QBtn
-        icon="arrow_left"
+                icon="arrow_left"
-        size="sm"
+                size="sm"
-        flat
+                flat
-        class="full-height"
+                class="full-height"
-        @click="step(-1)"
+                @click="step(-1)"
-      />
+            />
-      <span>{{ headerTitle }}</span>
+            <span>{{ headerTitle }}</span>
-      <QBtn
+            <QBtn
-        icon="arrow_right"
+                icon="arrow_right"
-        size="sm"
+                size="sm"
-        flat
+                flat
-        class="full-height"
+                class="full-height"
-        @click="step(1)"
+                @click="step(1)"
-      />
+            />
-    </div>
+        </div>
-    <div class="calendars-container">
+        <div class="calendars-container">
-      <component
+            <component
-        :is="calendarComponent"
+                :is="calendarComponent"
-        v-for="(month, index) in months"
+                v-for="(month, index) in months"
-        :key="index"
+                :key="index"
-        :month="month.getMonth() + 1"
+                :month="month.getMonth() + 1"
-        :year="month.getFullYear()"
+                :year="month.getFullYear()"
-        :month-date="month"
+                :month-date="month"
-        v-bind="additionalProps"
+                v-bind="additionalProps"
-        @on-date-selected="data => emit('onDateSelected', data)"
+                @on-date-selected="(data) => emit('onDateSelected', data)"
-      />
+            />
-    </div>
+        </div>
-  </QCard>
+    </QCard>
 </template>
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@ -380,8 +380,16 @@ defineExpose({
                data-cy="saveAndContinueDefaultBtn"
                v-if="$props.goTo"
                @click="saveAndGo"
-                :label="tMobile('globals.saveAndContinue') + ' ' + t('globals.' + $props.goTo.split('/').pop())"
+                :label="
-                :title="t('globals.saveAndContinue') + ' ' + t('globals.' + $props.goTo.split('/').pop())"
+                    tMobile('globals.saveAndContinue') +
                    ' ' +
                    t('globals.' + $props.goTo.split('/').pop())
                "
                :title="
                    t('globals.saveAndContinue') +
                    ' ' +
                    t('globals.' + $props.goTo.split('/').pop())
                "
                :disable="!hasChanges"
                color="primary"
                icon="save"
--- a/src/components/PinnedModules.vue
+++ b/src/components/PinnedModules.vue
@ -26,7 +26,7 @@ async function redirect() {
    if (route?.params?.id)
        return (window.location.href = await getUrl(
-            `${section}/${route.params.id}/summary`
+            `${section}/${route.params.id}/summary`,
        ));
    return (window.location.href = await getUrl(section + '/index'));
 }
--- a/src/components/RefundInvoiceForm.vue
+++ b/src/components/RefundInvoiceForm.vue
@ -55,7 +55,7 @@ const refund = async () => {
            (data) => (
                (rectificativeTypeOptions = data),
                (invoiceParams.cplusRectificationTypeFk = data.filter(
-                    (type) => type.description == 'I – Por diferencias'
+                    (type) => type.description == 'I – Por diferencias',
                )[0].id)
            )
        "
@ -68,7 +68,7 @@ const refund = async () => {
            (data) => (
                (siiTypeInvoiceOutsOptions = data),
                (invoiceParams.siiTypeInvoiceOutFk = data.filter(
-                    (type) => type.code == 'R4'
+                    (type) => type.code == 'R4',
                )[0].id)
            )
        "
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@ -52,7 +52,7 @@ watch(
        } else filter.value.where = {};
        await provincesFetchDataRef.value.fetch({});
        emit('onProvinceFetched', provincesOptions.value);
-    }
+    },
 );
 </script>
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@ -181,6 +181,10 @@ const col = computed(() => {
        newColumn.component = 'checkbox';
    if ($props.default && !newColumn.component) newColumn.component = $props.default;
    if (typeof newColumn.component !== 'string') {
        newColumn.attrs = { ...newColumn.component.attrs, autofocus: $props.autofocus };
        newColumn.event = { ...newColumn.component.event, ...$props?.eventHandlers };
    }
    return newColumn;
 });
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@ -684,8 +684,10 @@ const handleHeaderSelection = (evt, data) => {
        ref="CrudModelRef"
        @on-fetch="
            (...args) => {
-                selectAll = false;
+                if ($props.multiCheck.expand) {
-                selected = [];
+                    selectAll = false;
                    selected = [];
                }
                emit('onFetch', ...args);
            }
        "
--- a/src/components/VnTable/filters/tableFooter.js
+++ b/src/components/VnTable/filters/tableFooter.js
@ -6,7 +6,7 @@ export default function (initialFooter, data) {
            });
            return acc;
        },
-        { ...initialFooter }
+        { ...initialFooter },
    );
    return footer;
 }
--- a/src/components/tests/CrudModel.spec.js
+++ b/src/components/tests/CrudModel.spec.js
@ -193,11 +193,11 @@ describe('CrudModel', () => {
        });
        it('should set originalData and formatData with data and generate watchChanges', async () => {
-            data = {
+            data = [{
                name: 'Tony',
                lastName: 'Stark',
                age: 42,
-            };
+            }];
            vm.resetData(data);
@ -241,7 +241,7 @@ describe('CrudModel', () => {
            await vm.saveChanges(data);
-            expect(postMock).toHaveBeenCalledWith(vm.url + '/crud', data);
+            expect(postMock).toHaveBeenCalledWith(`${vm.url}/crud`, data);
            expect(vm.isLoading).toBe(false);
            expect(vm.hasChanges).toBe(false);
            expect(vm.originalData).toEqual(JSON.parse(JSON.stringify(vm.formData)));
--- a/src/components/tests/Leftmenu.spec.js
+++ b/src/components/tests/Leftmenu.spec.js
@ -142,14 +142,14 @@ describe('getRoutes', () => {
    const fn = (props) => getRoutes(props, getMethodA, getMethodB);
    it('should call getMethodB when source is card', () => {
-        let props = { source: 'methodB' };
+        const props = { source: 'methodB' };
        fn(props);
        expect(getMethodB).toHaveBeenCalled();
        expect(getMethodA).not.toHaveBeenCalled();
    });
    it('should call getMethodA when source is main', () => {
-        let props = { source: 'methodA' };
+        const props = { source: 'methodA' };
        fn(props);
        expect(getMethodA).toHaveBeenCalled();
@ -157,7 +157,7 @@ describe('getRoutes', () => {
    });
    it('should call getMethodA when source is not exists or undefined', () => {
-        let props = { source: 'methodC' };
+        const props = { source: 'methodC' };
        expect(() => fn(props)).toThrowError('Method not defined');
        expect(getMethodA).not.toHaveBeenCalled();
--- a/src/components/common/VnBankDetailsForm.vue
+++ b/src/components/common/VnBankDetailsForm.vue
@ -72,7 +72,7 @@ const getBankEntities = (data) => {
        :acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
        :options="bankEntities"
        hide-selected
-        option-label="name"
+        option-label="bic"
        option-value="id"
        v-model="bankEntityFk"
        @update:model-value="$emit('updateBic', { iban, bankEntityFk })"
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@ -15,7 +15,7 @@ let root = ref(null);
 watchEffect(() => {
    matched.value = currentRoute.value.matched.filter(
-        (matched) => !!matched?.meta?.title || !!matched?.meta?.icon
+        (matched) => !!matched?.meta?.title || !!matched?.meta?.icon,
    );
    breadcrumbs.value.length = 0;
    if (!matched.value[0]) return;
--- a/src/components/common/VnCheckboxMenu.vue
+++ b/src/components/common/VnCheckboxMenu.vue
@ -30,7 +30,7 @@ const onClick = async () => {
        params: { filter: JSON.stringify(filter) },
    };
    try {
-        const { data } = axios.get(props.url, params);
+        const { data } = await axios.get(props.url, params);
        rows.value = data;
    } catch (error) {
        const response = error.response;
@ -83,7 +83,7 @@ defineEmits(['update:selected', 'select:all']);
                            />
                            <span
                                v-else
-                                v-text="t('records', { rows: rows.length ?? 0 })"
+                                v-text="t('records', { rows: rows?.length ?? 0 })"
                            />
                        </QItemLabel>
                    </QItemSection>
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@ -21,7 +21,7 @@ watch(
    (newValue) => {
        if (!modelValue.value) return;
        modelValue.value = formatLocation(newValue) ?? null;
-    }
+    },
 );
 const mixinRules = [requiredFieldRule];
@ -45,7 +45,7 @@ const formatLocation = (obj, properties = locationProperties) => {
    });
    const filteredParts = parts.filter(
-        (part) => part !== null && part !== undefined && part !== ''
+        (part) => part !== null && part !== undefined && part !== '',
    );
    return filteredParts.join(', ');
--- a/src/components/common/VnScroll.vue
+++ b/src/components/common/VnScroll.vue
@ -2,7 +2,7 @@
 import { ref, onMounted, onUnmounted, watch, nextTick } from 'vue';
 const props = defineProps({
-    scrollTarget: { type: [String, Object], default: 'window' }
+    scrollTarget: { type: [String, Object], default: 'window' },
 });
 const scrollPosition = ref(0);
@ -28,18 +28,18 @@ const scrollToTop = () => {
 };
 const updateScrollContainer = (container) => {
-  if (container) {
+    if (container) {
-    if (scrollContainer) {
+        if (scrollContainer) {
-      scrollContainer.removeEventListener('scroll', onScroll);
+            scrollContainer.removeEventListener('scroll', onScroll);
        }
        scrollContainer = container;
        scrollContainer.addEventListener('scroll', onScroll);
        onScroll();
    }
    scrollContainer = container;
    scrollContainer.addEventListener('scroll', onScroll);
    onScroll();
  }
 };
 defineExpose({
-  updateScrollContainer
+    updateScrollContainer,
 });
 const initScrollContainer = async () => {
@ -51,11 +51,10 @@ const initScrollContainer = async () => {
        scrollContainer = window;
    }
-    if (!scrollContainer) return
+    if (!scrollContainer) return;
-        scrollContainer.addEventListener('scroll', onScroll);    
+    scrollContainer.addEventListener('scroll', onScroll);
 };
 onMounted(() => {
    initScrollContainer();
 });
@ -82,19 +81,18 @@ onUnmounted(() => {
 <style scoped>
 .scroll-to-top {
-  position: fixed;
+    position: fixed;
-  top: 70px;
+    top: 70px;
-  font-size: 65px;
+    font-size: 65px;
-  left: 50%;
+    left: 50%;
-  transform: translateX(-50%);
+    transform: translateX(-50%);
-  z-index: 1000;
+    z-index: 1000;
-  transition: transform 0.2s ease-in-out;
+    transition: transform 0.2s ease-in-out;
 }
 .scroll-to-top:hover {
-  transform: translateX(-50%) scale(1.2);
+    transform: translateX(-50%) scale(1.2);
-  cursor: pointer;
+    cursor: pointer;
-  filter: brightness(0.8);
+    filter: brightness(0.8);
 }
 </style>
--- a/src/components/common/VnSelectExpense.vue
+++ b/src/components/common/VnSelectExpense.vue
@ -0,0 +1,49 @@
 <script setup>
 import { ref, useTemplateRef } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
 import VnSelectDialog from './VnSelectDialog.vue';
 import CreateNewExpenseForm from '../CreateNewExpenseForm.vue';
 import FetchData from '../FetchData.vue';
 const model = defineModel({ type: [String, Number, Object] });
 const { t } = useI18n();
 const expenses = ref([]);
 const selectDialogRef = useTemplateRef('selectDialogRef');
 async function autocompleteExpense(evt) {
    const val = evt.target.value;
    if (!val || isNaN(val)) return;
    const lookup = expenses.value.find(({ id }) => id == useAccountShortToStandard(val));
    if (selectDialogRef.value)
        selectDialogRef.value.vnSelectDialogRef.vnSelectRef.toggleOption(lookup);
 }
 </script>
 <template>
    <VnSelectDialog
        v-bind="$attrs"
        ref="selectDialogRef"
        v-model="model"
        :options="expenses"
        option-value="id"
        :option-label="(x) => `${x.id}: ${x.name}`"
        :filter-options="['id', 'name']"
        :tooltip="t('Create a new expense')"
        :acls="[{ model: 'Expense', props: '*', accessType: 'WRITE' }]"
        @keydown.tab.prevent="autocompleteExpense"
    >
        <template #form>
            <CreateNewExpenseForm @on-data-saved="$refs.expensesRef.fetch()" />
        </template>
    </VnSelectDialog>
    <FetchData
        ref="expensesRef"
        url="Expenses"
        auto-load
        @on-fetch="(data) => (expenses = data)"
    />
 </template>
 <i18n>
 es:
    Create a new expense: Crear nuevo gasto
 </i18n>
--- a/src/components/common/tests/VnBankDetailsForm.spec.js
+++ b/src/components/common/tests/VnBankDetailsForm.spec.js
@ -40,4 +40,11 @@ describe('VnBankDetail Component', () => {
        await vm.autofillBic('ES1234567891324567891234');
        expect(vm.bankEntityFk).toBe(null);
    });
    it('should not update bankEntityFk if IBAN country is not ES', async () => {
        vm.bankEntities = bankEntities;
        await vm.autofillBic('FR1420041010050500013M02606');
        expect(vm.bankEntityFk).toBe(null);
    });
 });
--- a/src/components/common/tests/VnChangePassword.spec.js
+++ b/src/components/common/tests/VnChangePassword.spec.js
@ -35,7 +35,7 @@ describe('VnSmsDialog', () => {
            expect.objectContaining({
                message: 'You must enter a new password',
                type: 'negative',
-            })
+            }),
        );
    });
@ -47,7 +47,7 @@ describe('VnSmsDialog', () => {
            expect.objectContaining({
                message: `Passwords don't match`,
                type: 'negative',
-            })
+            }),
        );
    });
--- a/src/components/common/tests/VnDmsList.spec.js
+++ b/src/components/common/tests/VnDmsList.spec.js
@ -25,6 +25,9 @@ describe('VnDmsList', () => {
                deleteModel: 'WorkerDms',
                downloadModel: 'WorkerDms',
            },
            global: {
                stubs: ['VnUserLink'],
            },
        }).vm;
    });
--- a/src/components/common/tests/VnLocation.spec.js
+++ b/src/components/common/tests/VnLocation.spec.js
@ -6,8 +6,8 @@ function buildComponent(data) {
    return createWrapper(VnLocation, {
        global: {
            props: {
-                location: data
+                location: data,
-            }
+            },
        },
    }).vm;
 }
@ -24,7 +24,7 @@ describe('formatLocation', () => {
            postcode: '46680',
            city: 'Algemesi',
            province: { name: 'Valencia' },
-            country: { name: 'Spain' }
+            country: { name: 'Spain' },
        };
    });
@ -47,7 +47,12 @@ describe('formatLocation', () => {
    });
    it('should return the country', () => {
-        const location = { ...locationBase, postcode: undefined, city: undefined, province: undefined };
+        const location = {
            ...locationBase,
            postcode: undefined,
            city: undefined,
            province: undefined,
        };
        const vm = buildComponent(location);
        expect(vm.formatLocation(location)).toEqual('Spain');
    });
@ -61,7 +66,7 @@ describe('showLabel', () => {
            code: '46680',
            town: 'Algemesi',
            province: 'Valencia',
-            country: 'Spain'
+            country: 'Spain',
        };
    });
@ -84,7 +89,12 @@ describe('showLabel', () => {
    });
    it('should show the label with country', () => {
-        const location = { ...locationBase, code: undefined, town: undefined, province: undefined };
+        const location = {
            ...locationBase,
            code: undefined,
            town: undefined,
            province: undefined,
        };
        const vm = buildComponent(location);
        expect(vm.showLabel(location)).toEqual('Spain');
    });
--- a/src/components/common/tests/VnLog.spec.js
+++ b/src/components/common/tests/VnLog.spec.js
@ -90,7 +90,7 @@ describe('VnLog', () => {
        vm = createWrapper(VnLog, {
            global: {
-                stubs: ['FetchData', 'vue-i18n'],
+                stubs: ['FetchData', 'vue-i18n', 'VnUserLink'],
                mocks: {
                    fetch: vi.fn(),
                },
--- a/src/components/common/tests/VnSmsDialog.spec.js
+++ b/src/components/common/tests/VnSmsDialog.spec.js
@ -2,13 +2,14 @@ import { createWrapper } from 'app/test/vitest/helper';
 import VnSmsDialog from 'components/common/VnSmsDialog.vue';
 import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
 describe('VnSmsDialog', () => {
    let vm;
    const orderId = 1;
    const shipped = new Date();
    const phone = '012345678';
-    const promise = (response) => {return response;};
+    const promise = (response) => {
        return response;
    };
    const template = 'minAmount';
    const locale = 'en';
@ -17,13 +18,13 @@ describe('VnSmsDialog', () => {
            propsData: {
                data: {
                    orderId,
-                    shipped
+                    shipped,
                },
                template,
                locale,
                phone,
-                promise
+                promise,
-            }
+            },
        }).vm;
    });
@ -35,7 +36,9 @@ describe('VnSmsDialog', () => {
        it('should update the message value with the correct template and parameters', () => {
            vm.updateMessage();
-            expect(vm.message).toEqual(`A minimum amount of 50€ (VAT excluded) is required for your order ${orderId} of ${shipped} to receive it without additional shipping costs.`);
+            expect(vm.message).toEqual(
                `A minimum amount of 50€ (VAT excluded) is required for your order ${orderId} of ${shipped} to receive it without additional shipping costs.`,
            );
        });
    });
@ -47,7 +50,7 @@ describe('VnSmsDialog', () => {
                orderId,
                shipped,
                destination: phone,
-                message: vm.message
+                message: vm.message,
            };
            await vm.send();
--- a/src/components/ui/VnAvatar.vue
+++ b/src/components/ui/VnAvatar.vue
@ -17,7 +17,7 @@ const token = getTokenMultimedia();
 const { t } = useI18n();
 const src = computed(
-    () => `/api/Images/user/160x160/${$props.workerId}/download?access_token=${token}`
+    () => `/api/Images/user/160x160/${$props.workerId}/download?access_token=${token}`,
 );
 const title = computed(() => $props.title?.toUpperCase() || t('globals.system'));
 const showLetter = ref(false);
--- a/src/components/ui/VnLogo.vue
+++ b/src/components/ui/VnLogo.vue
@ -13,7 +13,7 @@ const src = computed({
    get() {
        return new URL(
            `../../assets/${$props.logo}${Dark.isActive ? '_dark' : ''}.svg`,
-            import.meta.url
+            import.meta.url,
        ).href;
    },
 });
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
-import { ref, reactive, useAttrs, computed, onMounted, nextTick, } from 'vue';
+import { ref, reactive, useAttrs, computed, onMounted, nextTick } from 'vue';
-import { onBeforeRouteLeave , useRouter, useRoute} from 'vue-router';
+import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
@ -34,7 +34,8 @@ const $props = defineProps({
    addNote: { type: Boolean, default: false },
    selectType: { type: Boolean, default: false },
    justInput: { type: Boolean, default: false },
-    goTo: { type: String, default: '', },
+    goTo: { type: String, default: '' },
    useUserRelation: { type: Boolean, default: true },
 });
 const { t } = useI18n();
@ -47,13 +48,33 @@ const newNote = reactive({ text: null, observationTypeFk: null });
 const observationTypes = ref([]);
 const vnPaginateRef = ref();
-const defaultObservationType = computed(() => 
+const defaultObservationType = computed(
-    observationTypes.value.find(ot => ot.code === 'salesPerson')?.id
+    () => observationTypes.value.find((ot) => ot.code === 'salesPerson')?.id,
 );
 let savedNote = false;
 let originalText;
 onBeforeRouteLeave((to, from, next) => {
    if (
        (newNote.text && !$props.justInput) ||
        (newNote.text !== originalText && $props.justInput)
    )
        quasar.dialog({
            component: VnConfirm,
            componentProps: {
                title: t('globals.unsavedPopup.title'),
                message: t('globals.unsavedPopup.subtitle'),
                promise: () => next(),
            },
        });
    else next();
 });
 onMounted(() => {
    nextTick(() => (componentIsRendered.value = true));
 });
 function handleClick(e) {
    if (e.shiftKey && e.key === 'Enter') return;
    if ($props.justInput) confirmAndUpdate();
@ -108,22 +129,6 @@ async function update() {
    );
 }
 onBeforeRouteLeave((to, from, next) => {
    if (
        (newNote.text && !$props.justInput) ||
        (newNote.text !== originalText && $props.justInput)
    )
        quasar.dialog({
            component: VnConfirm,
            componentProps: {
                title: t('globals.unsavedPopup.title'),
                message: t('globals.unsavedPopup.subtitle'),
                promise: () => next(),
            },
        });
    else next();
 });
 function fetchData([data]) {
    newNote.text = data?.notes;
    originalText = data?.notes;
@ -132,34 +137,71 @@ function fetchData([data]) {
 const handleObservationTypes = (data) => {
    observationTypes.value = data;
-    if(defaultObservationType.value) {
+    if (defaultObservationType.value) {
        newNote.observationTypeFk = defaultObservationType.value;
    }
 };
 onMounted(() => {
  nextTick(() => (componentIsRendered.value = true));
 });
 async function saveAndGo() {
    savedNote = false;
    await insert();
    await savedNote;
    router.push({ path: $props.goTo });
 }
 function getUserFilter() {
    const newUserFilter = $props.userFilter ?? {};
    const userInclude = {
        relation: 'user',
        scope: {
            fields: ['id', 'nickname', 'name'],
        },
    };
    if (newUserFilter.include) {
        if (Array.isArray(newUserFilter.include)) {
            newUserFilter.include.push(userInclude);
        } else {
            newUserFilter.include = [userInclude, newUserFilter.include];
        }
    } else {
        newUserFilter.include = userInclude;
    }
    if ($props.useUserRelation) {
        return {
            ...newUserFilter,
            ...$props.userFilter,
        };
    }
    return $props.filter;
 }
 </script>
 <template>
-    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && componentIsRendered && $props.goTo && !route.path.includes('summary')">
+    <Teleport
-      <QBtn
+        to="#st-actions"
-        :label="tMobile('globals.saveAndContinue') + ' ' + t('globals.' + $props.goTo.split('/').pop())"
+        v-if="
-        :title="t('globals.saveAndContinue') + ' ' + t('globals.' + $props.goTo.split('/').pop())"
+            stateStore?.isSubToolbarShown() &&
-        color="primary"
+            componentIsRendered &&
-        icon="save"
+            $props.goTo &&
-        @click="saveAndGo"
+            !route.path.includes('summary')
-        data-cy="saveContinueNoteButton"
+        "
-      />
+    >
-  </Teleport>
+        <QBtn
            :label="
                tMobile('globals.saveAndContinue') +
                ' ' +
                t('globals.' + $props.goTo.split('/').pop())
            "
            :title="
                t('globals.saveAndContinue') +
                ' ' +
                t('globals.' + $props.goTo.split('/').pop())
            "
            color="primary"
            icon="save"
            @click="saveAndGo"
            data-cy="saveContinueNoteButton"
        />
    </Teleport>
    <FetchData
        v-if="selectType"
        url="ObservationTypes"
@ -227,16 +269,14 @@ async function saveAndGo() {
        :url="$props.url"
        order="created DESC"
        :limit="0"
-        :user-filter="userFilter"
+        :user-filter="getUserFilter()"
        :filter="filter"
        auto-load
        ref="vnPaginateRef"
        class="show"
        v-bind="$attrs"
        :search-url="false"
-        @on-fetch="
+        @on-fetch="newNote.text = ''"
            newNote.text = '';
        "
    >
        <template #body="{ rows }">
            <TransitionGroup name="list" tag="div" class="column items-center full-width">
@ -248,15 +288,15 @@ async function saveAndGo() {
                    <QCardSection horizontal>
                        <VnAvatar
                            :descriptor="false"
-                            :worker-id="note.workerFk"
+                            :worker-id="note.user?.id"
                            size="md"
-                            :title="note.worker?.user.nickname"
+                            :title="note.user?.nickname"
                        />
                        <div class="full-width row justify-between q-pa-xs">
                            <div>
                                <VnUserLink
-                                    :name="`${note.worker.user.name}`"
+                                    :name="`${note.user?.name}`"
-                                    :worker-id="note.worker.id"
+                                    :worker-id="note.user?.id"
                                />
                                <QBadge
                                    class="q-ml-xs"
--- a/src/components/ui/VnSms.vue
+++ b/src/components/ui/VnSms.vue
@ -87,7 +87,7 @@ function formatNumber(number) {
                                <QItemLabel caption>{{
                                    date.formatDate(
                                        row.sms.created,
-                                        'YYYY-MM-DD HH:mm:ss'
+                                        'YYYY-MM-DD HH:mm:ss',
                                    )
                                }}</QItemLabel>
                                <QItemLabel class="row center">
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@ -37,8 +37,7 @@ onBeforeUnmount(() => stateStore.toggleSubToolbar() && hasSubToolbar);
        class="justify-end sticky"
    >
        <slot name="st-data">
-            <div id="st-data" :class="{ 'full-width': !actionsChildCount() }">
+            <div id="st-data" :class="{ 'full-width': !actionsChildCount() }"></div>
            </div>
        </slot>
        <QSpace />
        <slot name="st-actions">
--- a/src/components/ui/VnUserLink.vue
+++ b/src/components/ui/VnUserLink.vue
@ -1,18 +1,39 @@
 <script setup>
 import AccountDescriptorProxy from 'src/pages/Account/Card/AccountDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-
+import { ref, onMounted } from 'vue';
-defineProps({
+import axios from 'axios';
 const $props = defineProps({
    name: { type: String, default: null },
    tag: { type: String, default: null },
    workerId: { type: Number, default: null },
    defaultName: { type: Boolean, default: false },
 });
 const isWorker = ref(false);
 onMounted(async () => {
    if (!$props.workerId) return;
    try {
        const {
            data: { exists },
        } = await axios(`/Workers/${$props.workerId}/exists`);
        isWorker.value = exists;
    } catch (error) {
        if (error.status === 403) return;
        throw error;
    }
 });
 </script>
 <template>
    <slot name="link">
        <span :class="{ link: workerId }">
-            {{ defaultName ? name ?? $t('globals.system') : name }}
+            {{ defaultName ? (name ?? $t('globals.system')) : name }}
        </span>
    </slot>
-    <WorkerDescriptorProxy v-if="workerId" :id="workerId" />
+    <WorkerDescriptorProxy
        v-if="isWorker"
        :id="workerId"
        @on-fetch="(data) => (isWorker = data?.workerId !== undefined)"
    />
    <AccountDescriptorProxy v-else :id="workerId" />
 </template>
--- a/src/components/ui/tests/VnImg.spec.js
+++ b/src/components/ui/tests/VnImg.spec.js
@ -12,16 +12,16 @@ function generateWrapper(storage = 'images') {
            id: 123,
            zoomResolution: '400x400',
            storage,
-        }
+        },
    });
    wrapper = wrapper.wrapper;
    vm = wrapper.vm;
    vm.timeStamp = 'timestamp';
-};
+}
 vi.mock('src/composables/useSession', () => ({
    useSession: () => ({
-      getTokenMultimedia: () => 'token',
+        getTokenMultimedia: () => 'token',
    }),
 }));
@ -31,7 +31,6 @@ vi.mock('src/composables/useRole', () => ({
    }),
 }));
 describe('VnImg', () => {
    beforeEach(() => {
        isEmployeeMock.mockReset();
@ -63,7 +62,9 @@ describe('VnImg', () => {
            generateWrapper();
            await vm.$nextTick();
            const url = vm.getUrl();
-            expect(url).toBe('/api/images/catalog/200x200/123/download?access_token=token&timestamp');
+            expect(url).toBe(
                '/api/images/catalog/200x200/123/download?access_token=token&timestamp',
            );
        });
        it('should return /api/{storage}/{collection}/{curResolution}/{id}/download?access_token={token}&{timeStamp} when zoom is true and role is employee and storage is not dms', async () => {
@ -71,7 +72,9 @@ describe('VnImg', () => {
            generateWrapper();
            await vm.$nextTick();
            const url = vm.getUrl(true);
-            expect(url).toBe('/api/images/catalog/400x400/123/download?access_token=token&timestamp');
+            expect(url).toBe(
                '/api/images/catalog/400x400/123/download?access_token=token&timestamp',
            );
        });
    });
--- a/src/composables/tests/useAcl.spec.js
+++ b/src/composables/tests/useAcl.spec.js
@ -53,26 +53,26 @@ describe('useAcl', () => {
            expect(
                acl.hasAny([
                    { model: 'Worker', props: 'updateAttributes', accessType: 'WRITE' },
-                ])
+                ]),
            ).toBeFalsy();
        });
        it('should return false if no roles matched', async () => {
            expect(
-                acl.hasAny([{ model: 'Worker', props: 'holidays', accessType: 'READ' }])
+                acl.hasAny([{ model: 'Worker', props: 'holidays', accessType: 'READ' }]),
            ).toBeTruthy();
        });
        describe('*', () => {
            it('should return true if an acl matched', async () => {
                expect(
-                    acl.hasAny([{ model: 'Address', props: '*', accessType: 'WRITE' }])
+                    acl.hasAny([{ model: 'Address', props: '*', accessType: 'WRITE' }]),
                ).toBeTruthy();
            });
            it('should return false if no acls matched', async () => {
                expect(
-                    acl.hasAny([{ model: 'Worker', props: '*', accessType: 'READ' }])
+                    acl.hasAny([{ model: 'Worker', props: '*', accessType: 'READ' }]),
                ).toBeFalsy();
            });
        });
@ -80,13 +80,15 @@ describe('useAcl', () => {
        describe('$authenticated', () => {
            it('should return false if no acls matched', async () => {
                expect(
-                    acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: '*' }])
+                    acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: '*' }]),
                ).toBeFalsy();
            });
            it('should return true if an acl matched', async () => {
                expect(
-                    acl.hasAny([{ model: 'Url', props: 'getByUser', accessType: 'READ' }])
+                    acl.hasAny([
                        { model: 'Url', props: 'getByUser', accessType: 'READ' },
                    ]),
                ).toBeTruthy();
            });
        });
@ -96,7 +98,7 @@ describe('useAcl', () => {
                expect(
                    acl.hasAny([
                        { model: 'TpvTransaction', props: 'start', accessType: 'READ' },
-                    ])
+                    ]),
                ).toBeFalsy();
            });
@ -104,7 +106,7 @@ describe('useAcl', () => {
                expect(
                    acl.hasAny([
                        { model: 'TpvTransaction', props: 'start', accessType: 'WRITE' },
-                    ])
+                    ]),
                ).toBeTruthy();
            });
        });
--- a/src/composables/downloadFile.js
+++ b/src/composables/downloadFile.js
@ -18,7 +18,7 @@ export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile',
 export async function downloadDocuware(url, params) {
    const appUrl = await getAppUrl();
-    const response = await axios.get(`${appUrl}/api/` + url, {
+    const response = await axios.get(`${appUrl}/api/${url}`, {
        responseType: 'blob',
        params,
    });
--- a/src/composables/getColAlign.js
+++ b/src/composables/getColAlign.js
@ -20,5 +20,5 @@ export function getColAlign(col) {
    if (/^is[A-Z]/.test(col.name) || /^has[A-Z]/.test(col.name)) align = 'center';
-    return 'text-' + (align ?? 'center');
+    return `text-${align ?? 'center'}`;
 }
--- a/src/composables/getDateQBadgeColor.js
+++ b/src/composables/getDateQBadgeColor.js
@ -1,10 +1,10 @@
 export function getDateQBadgeColor(date) {
-    let today = Date.vnNew();
+    const today = Date.vnNew();
    today.setHours(0, 0, 0, 0);
-    let timeTicket = new Date(date);
+    const timeTicket = new Date(date);
    timeTicket.setHours(0, 0, 0, 0);
-    let comparation = today - timeTicket;
+    const comparation = today - timeTicket;
    if (comparation == 0) return 'warning';
    if (comparation < 0) return 'success';
--- a/src/composables/getWeekdays.js
+++ b/src/composables/getWeekdays.js
@ -2,9 +2,8 @@ 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);
-  const firstDay = moment().weekday(1).day();
+    return ref(weekdays);
  const weekdays = [...Array(7).keys()].map(i => (i + firstDay) % 7);
  return ref(weekdays);
 }
--- a/src/composables/updateMinPriceBeforeSave.js
+++ b/src/composables/updateMinPriceBeforeSave.js
@ -7,7 +7,7 @@ export async function beforeSave(data, getChanges, modelOrigin) {
        const patchPromises = [];
        for (const change of changes) {
-            let patchData = {};
+            const patchData = {};
            if ('hasMinPrice' in change.data) {
                patchData.hasMinPrice = change.data?.hasMinPrice;
--- a/src/composables/useCardSize.js
+++ b/src/composables/useCardSize.js
@ -1,7 +1,6 @@
 import { useQuasar } from 'quasar';
-export default function() {
+export default function () {
    const quasar = useQuasar();
-   return quasar.screen.gt.xs ? 'q-pa-md': 'q-pa-xs';
+    return quasar.screen.gt.xs ? 'q-pa-md' : 'q-pa-xs';
 }
--- a/src/composables/useColor.js
+++ b/src/composables/useColor.js
@ -6,7 +6,7 @@ export function djb2a(string) {
 }
 export function useColor(value) {
-    return '#' + colors[djb2a(value || '') % colors.length];
+    return `#${colors[djb2a(value || '') % colors.length]}`;
 }
 const colors = [
--- a/src/composables/usePrintService.js
+++ b/src/composables/usePrintService.js
@ -15,18 +15,16 @@ export function usePrintService() {
                message: t('globals.notificationSent'),
                type: 'positive',
                icon: 'check',
-            })
+            }),
        );
    }
    function openReport(path, params, isNewTab = '_self') {
        if (typeof params === 'string') params = JSON.parse(params);
-        params = Object.assign(
+        params = {
-            {
+            access_token: getTokenMultimedia(),
-                access_token: getTokenMultimedia(),
+            ...params,
-            },
+        };
            params
        );
        const query = new URLSearchParams(params).toString();
        window.open(`api/${path}?${query}`, isNewTab);
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@ -17,7 +17,7 @@ export function useSession() {
    let intervalId = null;
    function setSession(data) {
-        let keepLogin = data.keepLogin;
+        const keepLogin = data.keepLogin;
        const storage = keepLogin ? localStorage : sessionStorage;
        storage.setItem(TOKEN, data.token);
        storage.setItem(TOKEN_MULTIMEDIA, data.tokenMultimedia);
--- a/src/composables/useVnConfirm.js
+++ b/src/composables/useVnConfirm.js
@ -8,7 +8,7 @@ export function useVnConfirm() {
        message,
        promise,
        successFn,
-        customHTML = {}
+        customHTML = {},
    ) => {
        const { component, props } = customHTML;
        Dialog.create({
@ -19,7 +19,7 @@ export function useVnConfirm() {
                    message: message,
                    promise: promise,
                },
-                { customHTML: () => h(component, props) }
+                { customHTML: () => h(component, props) },
            ),
        }).onOk(async () => {
            if (successFn) successFn();
--- a/src/css/fonts/selection.json
+++ b/src/css/fonts/selection.json
--- a/src/css/icons.scss
+++ b/src/css/icons.scss
@ -1,453 +1,455 @@
@font-face {
-  font-family: 'icon';
+    font-family: 'icon';
-  src:  url('fonts/icon.eot?uocffs');
+    src: url('fonts/icon.eot?uocffs');
-  src:  url('fonts/icon.eot?uocffs#iefix') format('embedded-opentype'),
+    src:
-    url('fonts/icon.ttf?uocffs') format('truetype'),
+        url('fonts/icon.eot?uocffs#iefix') format('embedded-opentype'),
-    url('fonts/icon.woff?uocffs') format('woff'),
+        url('fonts/icon.ttf?uocffs') format('truetype'),
-    url('fonts/icon.svg?uocffs#icon') format('svg');
+        url('fonts/icon.woff?uocffs') format('woff'),
-  font-weight: normal;
+        url('fonts/icon.svg?uocffs#icon') format('svg');
-  font-style: normal;
+    font-weight: normal;
-  font-display: block;
+    font-style: normal;
    font-display: block;
 }
-[class^="icon-"], [class*=" icon-"] {
+[class^='icon-'],
-  /* use !important to prevent issues with browser extensions that change fonts */
+[class*=' icon-'] {
-  font-family: 'icon' !important;
+    /* use !important to prevent issues with browser extensions that change fonts */
-  speak: never;
+    font-family: 'icon' !important;
-  font-style: normal;
+    speak: never;
-  font-weight: normal;
+    font-style: normal;
-  font-variant: normal;
+    font-weight: normal;
-  text-transform: none;
+    font-variant: normal;
-  line-height: 1;
+    text-transform: none;
    line-height: 1;
-  /* Better Font Rendering =========== */
+    /* Better Font Rendering =========== */
-  -webkit-font-smoothing: antialiased;
+    -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
+    -moz-osx-font-smoothing: grayscale;
 }
 .icon-inactive-car:before {
-  content: "\e978";
+    content: '\e978';
 }
 .icon-hasItemLost:before {
-  content: "\e957";
+    content: '\e957';
 }
 .icon-hasItemDelay:before {
-  content: "\e96d";
+    content: '\e96d';
 }
 .icon-add_entries:before {
-  content: "\e953";
+    content: '\e953';
 }
 .icon-100:before {
-  content: "\e901";
+    content: '\e901';
 }
 .icon-Client_unpaid:before {
-  content: "\e98c";
+    content: '\e98c';
 }
 .icon-History:before {
-  content: "\e902";
+    content: '\e902';
 }
 .icon-Person:before {
-  content: "\e903";
+    content: '\e903';
 }
 .icon-accessory:before {
-  content: "\e904";
+    content: '\e904';
 }
 .icon-account:before {
-  content: "\e905";
+    content: '\e905';
 }
 .icon-actions:before {
-  content: "\e907";
+    content: '\e907';
 }
 .icon-addperson:before {
-  content: "\e908";
+    content: '\e908';
 }
 .icon-agencia_tributaria:before {
-  content: "\e948";
+    content: '\e948';
 }
 .icon-agency:before {
-  content: "\e92a";
+    content: '\e92a';
 }
 .icon-agency-term:before {
-  content: "\e909";
+    content: '\e909';
 }
 .icon-albaran:before {
-  content: "\e92c";
+    content: '\e92c';
 }
 .icon-anonymous:before {
-  content: "\e90b";
+    content: '\e90b';
 }
 .icon-apps:before {
-  content: "\e90c";
+    content: '\e90c';
 }
 .icon-artificial:before {
-  content: "\e90d";
+    content: '\e90d';
 }
 .icon-attach:before {
-  content: "\e90e";
+    content: '\e90e';
 }
 .icon-barcode:before {
-  content: "\e90f";
+    content: '\e90f';
 }
 .icon-basket:before {
-  content: "\e910";
+    content: '\e910';
 }
 .icon-basketadd:before {
-  content: "\e911";
+    content: '\e911';
 }
 .icon-bin:before {
-  content: "\e913";
+    content: '\e913';
 }
 .icon-botanical:before {
-  content: "\e914";
+    content: '\e914';
 }
 .icon-bucket:before {
-  content: "\e915";
+    content: '\e915';
 }
 .icon-buscaman:before {
-  content: "\e916";
+    content: '\e916';
 }
 .icon-buyrequest:before {
-  content: "\e917";
+    content: '\e917';
 }
 .icon-calc_volum .path1:before {
-  content: "\e918";
+    content: '\e918';
-  color: rgb(0, 0, 0);
+    color: rgb(0, 0, 0);
 }
 .icon-calc_volum .path2:before {
-  content: "\e919";
+    content: '\e919';
-  margin-left: -1em;
+    margin-left: -1em;
-  color: rgb(0, 0, 0);
+    color: rgb(0, 0, 0);
 }
 .icon-calc_volum .path3:before {
-  content: "\e91c";
+    content: '\e91c';
-  margin-left: -1em;
+    margin-left: -1em;
-  color: rgb(0, 0, 0);
+    color: rgb(0, 0, 0);
 }
 .icon-calc_volum .path4:before {
-  content: "\e91d";
+    content: '\e91d';
-  margin-left: -1em;
+    margin-left: -1em;
-  color: rgb(0, 0, 0);
+    color: rgb(0, 0, 0);
 }
 .icon-calc_volum .path5:before {
-  content: "\e91e";
+    content: '\e91e';
-  margin-left: -1em;
+    margin-left: -1em;
-  color: rgb(0, 0, 0);
+    color: rgb(0, 0, 0);
 }
 .icon-calc_volum .path6:before {
-  content: "\e91f";
+    content: '\e91f';
-  margin-left: -1em;
+    margin-left: -1em;
-  color: rgb(255, 255, 255);
+    color: rgb(255, 255, 255);
 }
 .icon-calendar:before {
-  content: "\e920";
+    content: '\e920';
 }
 .icon-catalog:before {
-  content: "\e921";
+    content: '\e921';
 }
 .icon-claims:before {
-  content: "\e922";
+    content: '\e922';
 }
 .icon-client:before {
-  content: "\e923";
+    content: '\e923';
 }
 .icon-clone:before {
-  content: "\e924";
+    content: '\e924';
 }
 .icon-columnadd:before {
-  content: "\e925";
+    content: '\e925';
 }
 .icon-columndelete:before {
-  content: "\e926";
+    content: '\e926';
 }
 .icon-components:before {
-  content: "\e927";
+    content: '\e927';
 }
 .icon-consignatarios:before {
-  content: "\e928";
+    content: '\e928';
 }
 .icon-control:before {
-  content: "\e929";
+    content: '\e929';
 }
 .icon-credit:before {
-  content: "\e92b";
+    content: '\e92b';
 }
 .icon-defaulter:before {
-  content: "\e92d";
+    content: '\e92d';
 }
 .icon-deletedTicket:before {
-  content: "\e92e";
+    content: '\e92e';
 }
 .icon-deleteline:before {
-  content: "\e92f";
+    content: '\e92f';
 }
 .icon-delivery:before {
-  content: "\e930";
+    content: '\e930';
 }
 .icon-deliveryprices:before {
-  content: "\e932";
+    content: '\e932';
 }
 .icon-details:before {
-  content: "\e933";
+    content: '\e933';
 }
 .icon-dfiscales:before {
-  content: "\e934";
+    content: '\e934';
 }
 .icon-disabled:before {
-  content: "\e935";
+    content: '\e935';
 }
 .icon-doc:before {
-  content: "\e936";
+    content: '\e936';
 }
 .icon-entry:before {
-  content: "\e937";
+    content: '\e937';
 }
 .icon-entry_lastbuys:before {
-  content: "\e91a";
+    content: '\e91a';
 }
 .icon-exit:before {
-  content: "\e938";
+    content: '\e938';
 }
 .icon-eye:before {
-  content: "\e939";
+    content: '\e939';
 }
 .icon-fixedPrice:before {
-  content: "\e93a";
+    content: '\e93a';
 }
 .icon-flower:before {
-  content: "\e93b";
+    content: '\e93b';
 }
 .icon-frozen:before {
-  content: "\e93c";
+    content: '\e93c';
 }
 .icon-fruit:before {
-  content: "\e93d";
+    content: '\e93d';
 }
 .icon-funeral:before {
-  content: "\e93e";
+    content: '\e93e';
 }
 .icon-grafana:before {
-  content: "\e906";
+    content: '\e906';
 }
 .icon-greenery:before {
-  content: "\e93f";
+    content: '\e93f';
 }
 .icon-greuge:before {
-  content: "\e940";
+    content: '\e940';
 }
 .icon-grid:before {
-  content: "\e941";
+    content: '\e941';
 }
 .icon-handmade:before {
-  content: "\e942";
+    content: '\e942';
 }
 .icon-handmadeArtificial:before {
-  content: "\e943";
+    content: '\e943';
 }
 .icon-headercol:before {
-  content: "\e945";
+    content: '\e945';
 }
 .icon-info:before {
-  content: "\e946";
+    content: '\e946';
 }
 .icon-inventory:before {
-  content: "\e947";
+    content: '\e947';
 }
 .icon-invoice:before {
-  content: "\e968";
+    content: '\e968';
-  color: #5f5f5f;
+    color: #5f5f5f;
 }
 .icon-invoice-in:before {
-  content: "\e949";
+    content: '\e949';
 }
 .icon-invoice-in-create:before {
-  content: "\e94a";
+    content: '\e94a';
 }
 .icon-invoice-out:before {
-  content: "\e94b";
+    content: '\e94b';
 }
 .icon-isTooLittle:before {
-  content: "\e94c";
+    content: '\e94c';
 }
 .icon-item:before {
-  content: "\e94d";
+    content: '\e94d';
 }
 .icon-languaje:before {
-  content: "\e970";
+    content: '\e970';
 }
 .icon-lines:before {
-  content: "\e94e";
+    content: '\e94e';
 }
 .icon-linesprepaired:before {
-  content: "\e94f";
+    content: '\e94f';
 }
 .icon-link-to-corrected:before {
-  content: "\e931";
+    content: '\e931';
 }
 .icon-link-to-correcting:before {
-  content: "\e944";
+    content: '\e944';
 }
 .icon-logout:before {
-  content: "\e973";
+    content: '\e973';
 }
 .icon-mana:before {
-  content: "\e950";
+    content: '\e950';
 }
 .icon-mandatory:before {
-  content: "\e951";
+    content: '\e951';
 }
 .icon-net:before {
-  content: "\e952";
+    content: '\e952';
 }
 .icon-newalbaran:before {
-  content: "\e954";
+    content: '\e954';
 }
 .icon-niche:before {
-  content: "\e955";
+    content: '\e955';
 }
 .icon-no036:before {
-  content: "\e956";
+    content: '\e956';
 }
 .icon-noPayMethod:before {
-  content: "\e958";
+    content: '\e958';
 }
 .icon-notes:before {
-  content: "\e959";
+    content: '\e959';
 }
 .icon-noweb:before {
-  content: "\e95a";
+    content: '\e95a';
 }
 .icon-onlinepayment:before {
-  content: "\e95b";
+    content: '\e95b';
 }
 .icon-package:before {
-  content: "\e95c";
+    content: '\e95c';
 }
 .icon-payment:before {
-  content: "\e95d";
+    content: '\e95d';
 }
 .icon-pbx:before {
-  content: "\e95e";
+    content: '\e95e';
 }
 .icon-pets:before {
-  content: "\e95f";
+    content: '\e95f';
 }
 .icon-photo:before {
-  content: "\e960";
+    content: '\e960';
 }
 .icon-plant:before {
-  content: "\e961";
+    content: '\e961';
 }
 .icon-polizon:before {
-  content: "\e962";
+    content: '\e962';
 }
 .icon-preserved:before {
-  content: "\e963";
+    content: '\e963';
 }
 .icon-recovery:before {
-  content: "\e964";
+    content: '\e964';
 }
 .icon-regentry:before {
-  content: "\e965";
+    content: '\e965';
 }
 .icon-reserva:before {
-  content: "\e966";
+    content: '\e966';
 }
 .icon-revision:before {
-  content: "\e967";
+    content: '\e967';
 }
 .icon-risk:before {
-  content: "\e969";
+    content: '\e969';
 }
 .icon-saysimple:before {
-  content: "\e912";
+    content: '\e912';
 }
 .icon-services:before {
-  content: "\e96a";
+    content: '\e96a';
 }
 .icon-settings:before {
-  content: "\e96b";
+    content: '\e96b';
 }
 .icon-shipment:before {
-  content: "\e96c";
+    content: '\e96c';
 }
 .icon-sign:before {
-  content: "\e90a";
+    content: '\e90a';
 }
 .icon-sms:before {
-  content: "\e96e";
+    content: '\e96e';
 }
 .icon-solclaim:before {
-  content: "\e96f";
+    content: '\e96f';
 }
 .icon-solunion:before {
-  content: "\e971";
+    content: '\e971';
 }
 .icon-splitline:before {
-  content: "\e972";
+    content: '\e972';
 }
 .icon-splur:before {
-  content: "\e974";
+    content: '\e974';
 }
 .icon-stowaway:before {
-  content: "\e975";
+    content: '\e975';
 }
 .icon-supplier:before {
-  content: "\e976";
+    content: '\e976';
 }
 .icon-supplierfalse:before {
-  content: "\e977";
+    content: '\e977';
 }
 .icon-tags:before {
-  content: "\e979";
+    content: '\e979';
 }
 .icon-tax:before {
-  content: "\e97a";
+    content: '\e97a';
 }
 .icon-thermometer:before {
-  content: "\e97b";
+    content: '\e97b';
 }
 .icon-ticket:before {
-  content: "\e97c";
+    content: '\e97c';
 }
 .icon-ticketAdd:before {
-  content: "\e97e";
+    content: '\e97e';
 }
 .icon-traceability:before {
-  content: "\e97f";
+    content: '\e97f';
 }
 .icon-transaction:before {
-  content: "\e91b";
+    content: '\e91b';
 }
 .icon-treatments:before {
-  content: "\e980";
+    content: '\e980';
 }
 .icon-trolley:before {
-  content: "\e900";
+    content: '\e900';
 }
 .icon-troncales:before {
-  content: "\e982";
+    content: '\e982';
 }
 .icon-unavailable:before {
-  content: "\e983";
+    content: '\e983';
 }
 .icon-visible_columns:before {
-  content: "\e984";
+    content: '\e984';
 }
 .icon-volume:before {
-  content: "\e985";
+    content: '\e985';
 }
 .icon-wand:before {
-  content: "\e986";
+    content: '\e986';
 }
 .icon-web:before {
-  content: "\e987";
+    content: '\e987';
 }
 .icon-wiki:before {
-  content: "\e989";
+    content: '\e989';
 }
 .icon-worker:before {
-  content: "\e98a";
+    content: '\e98a';
 }
 .icon-zone:before {
-  content: "\e98b";
+    content: '\e98b';
 }
--- a/src/filters/date.js
+++ b/src/filters/date.js
@ -30,10 +30,12 @@ export function isValidDate(date) {
 export function toDateFormat(date, locale = 'es-ES', opts = {}) {
    if (!isValidDate(date)) return '';
-    const format = Object.assign(
+    const format = {
-        { year: 'numeric', month: '2-digit', day: '2-digit' },
+        year: 'numeric',
-        opts
+        month: '2-digit',
-    );
+        day: '2-digit',
        ...opts,
    };
    return new Date(date).toLocaleDateString(locale, format);
 }
@ -104,17 +106,17 @@ export function secondsToHoursMinutes(seconds, includeHSuffix = true) {
    const hours = Math.floor(seconds / 3600);
    const remainingMinutes = seconds % 3600;
    const minutes = Math.floor(remainingMinutes / 60);
-    const formattedHours = hours < 10 ? '0' + hours : hours;
+    const formattedHours = hours < 10 ? `0${hours}` : hours;
-    const formattedMinutes = minutes < 10 ? '0' + minutes : minutes;
+    const formattedMinutes = minutes < 10 ? `0${minutes}` : minutes;
    // Append "h." if includeHSuffix is true
    const suffix = includeHSuffix ? ' h.' : '';
    // Return formatted string
-    return formattedHours + ':' + formattedMinutes + suffix;
+    return `${formattedHours}:${formattedMinutes}${suffix}`;
 }
 export function getTimeDifferenceWithToday(date) {
-    let today = Date.vnNew();
+    const today = Date.vnNew();
    today.setHours(0, 0, 0, 0);
    date = new Date(date);
--- a/src/filters/filterPanel.js
+++ b/src/filters/filterPanel.js
@ -5,12 +5,12 @@
 * @return {Object} The fields as object
 */
 function fieldsToObject(fields) {
-    let fieldsObj = {};
+    const fieldsObj = {};
    if (Array.isArray(fields)) {
-        for (let field of fields) fieldsObj[field] = true;
+        for (const field of fields) fieldsObj[field] = true;
    } else if (typeof fields == 'object') {
-        for (let field in fields) {
+        for (const field in fields) {
            if (fields[field]) fieldsObj[field] = true;
        }
    }
@ -26,7 +26,7 @@ function fieldsToObject(fields) {
 * @return {Array} The merged fields as an array
 */
 function mergeFields(src, dst) {
-    let fields = {};
+    const fields = {};
    Object.assign(fields, fieldsToObject(src), fieldsToObject(dst));
    return Object.keys(fields);
 }
@ -39,7 +39,7 @@ function mergeFields(src, dst) {
 * @return {Array} The merged wheres
 */
 function mergeWhere(src, dst) {
-    let and = [];
+    const and = [];
    if (src) and.push(src);
    if (dst) and.push(dst);
    return simplifyOperation(and, 'and');
@ -53,7 +53,7 @@ function mergeWhere(src, dst) {
 * @return {Object} The result filter
 */
 function mergeFilters(src, dst) {
-    let res = Object.assign({}, dst);
+    const res = { ...dst };
    if (!src) return res;
@ -80,12 +80,12 @@ function simplifyOperation(operation, operator) {
 }
 function buildFilter(params, builderFunc) {
-    let and = [];
+    const and = [];
-    for (let param in params) {
+    for (const param in params) {
-        let value = params[param];
+        const value = params[param];
        if (value == null) continue;
-        let expr = builderFunc(param, value);
+        const expr = builderFunc(param, value);
        if (expr) and.push(expr);
    }
    return simplifyOperation(and, 'and');
--- a/src/filters/getDifferences.js
+++ b/src/filters/getDifferences.js
@ -1,14 +1,14 @@
 export default function getDifferences(obj1, obj2) {
-    let diff = {};
+    const diff = {};
    delete obj1.$index;
    delete obj2.$index;
-    for (let key in obj1) {
+    for (const key in obj1) {
        if (obj2[key] && JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])) {
            diff[key] = obj2[key];
        }
    }
-    for (let key in obj2) {
+    for (const key in obj2) {
        if (
            obj1[key] === undefined ||
            JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])
--- a/src/filters/toDateString.js
+++ b/src/filters/toDateString.js
@ -1,10 +1,10 @@
 export default function toDateString(date) {
    let day = date.getDate();
    let month = date.getMonth() + 1;
-    let year = date.getFullYear();
+    const year = date.getFullYear();
    if (day < 10) day = `0${day}`;
    if (month < 10) month = `0${month}`;
-    return `${year}-${month}-${day}`
+    return `${year}-${month}-${day}`;
 }
--- a/src/filters/toLowerCamel.js
+++ b/src/filters/toLowerCamel.js
@ -1,5 +1,5 @@
 export default function toLowerCamel(value) {
    if (!value) return;
-    if (typeof (value) !== 'string') return value;
+    if (typeof value !== 'string') return value;
    return value.charAt(0).toLowerCase() + value.slice(1);
 }
--- a/src/filters/toRelativeDate.js
+++ b/src/filters/toRelativeDate.js
@ -9,7 +9,7 @@ export default function formatDate(dateVal) {
    const dateZeroTime = new Date(dateVal);
    dateZeroTime.setHours(0, 0, 0, 0);
    const diff = Math.trunc(
-        (today.getTime() - dateZeroTime.getTime()) / (1000 * 3600 * 24)
+        (today.getTime() - dateZeroTime.getTime()) / (1000 * 3600 * 24),
    );
    let format;
    if (diff === 0) format = t('globals.today');
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@ -11,14 +11,14 @@ for (const file in files) {
            translations[lang] = g.default;
        })
        .finally(() => {
-            const actualLang = lang + '.yml';
+            const actualLang = `${lang}.yml`;
            for (const module in modules) {
                if (!module.endsWith(actualLang)) continue;
                modules[module]().then((t) => {
                    Object.assign(translations[lang], t.default);
-                })
+                });
            }
-    });
+        });
 }
 export const localeEquivalence = {
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@ -400,6 +400,8 @@ errors:
    updateUserConfig: Error updating user config
    tokenConfig: Error fetching token config
    writeRequest: The requested operation could not be completed
    sessionExpired: Your session has expired. Please log in again
    accessDenied: Access denied
    claimBeginningQuantity: Cannot import a line with a claimed quantity of 0
 login:
    title: Login
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@ -396,6 +396,8 @@ errors:
    updateUserConfig: Error al actualizar la configuración de usuario
    tokenConfig: Error al obtener configuración de token
    writeRequest: No se pudo completar la operación solicitada
    sessionExpired: Tu sesión ha expirado, por favor vuelve a iniciar sesión
    accessDenied: Acceso denegado
    claimBeginningQuantity: No se puede importar una linea sin una cantidad reclamada
 login:
    title: Inicio de sesión
--- a/src/pages/Account/AccountConnections.vue
+++ b/src/pages/Account/AccountConnections.vue
@ -80,7 +80,7 @@ const killSession = async ({ userId, created }) => {
                                    openConfirmationModal(
                                        t('Session will be killed'),
                                        t('Are you sure you want to continue?'),
-                                        () => killSession(row)
+                                        () => killSession(row),
                                    )
                                "
                                outline
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@ -149,12 +149,12 @@ const columns = computed(() => [
                :right-search="false"
            >
                <template #more-create-dialog="{ data }">
-                        <VnInputPassword
+                    <VnInputPassword
-                            :label="t('Password')"
+                        :label="t('Password')"
-                            v-model="data.password"
+                        v-model="data.password"
-                            :required="true"
+                        :required="true"
-                            autocomplete="new-password"
+                        autocomplete="new-password"
-                        />
+                    />
                </template>
            </VnTable>
        </template>
--- a/src/pages/Account/Alias/Card/AliasUsers.vue
+++ b/src/pages/Account/Alias/Card/AliasUsers.vue
@ -57,7 +57,7 @@ watch(
        store.url = urlPath.value;
        store.filter = filter;
        fetchAliases();
-    }
+    },
 );
 const fetchAliases = () => paginateRef.value.fetch();
@ -91,7 +91,7 @@ const fetchAliases = () => paginateRef.value.fetch();
                                            openConfirmationModal(
                                                t('User will be removed from alias'),
                                                t('Are you sure you want to continue?'),
-                                                () => deleteAlias(row)
+                                                () => deleteAlias(row),
                                            )
                                        "
                                    >
--- a/src/pages/Account/Card/AccountMailForwarding.vue
+++ b/src/pages/Account/Card/AccountMailForwarding.vue
@ -28,7 +28,7 @@ const loading = ref(false);
 const hasDataChanged = computed(
    () =>
        formData.value.forwardTo !== initialData.value.forwardTo ||
-        initialData.value.hasData !== hasData.value
+        initialData.value.hasData !== hasData.value,
 );
 const fetchMailForwards = async () => {
@ -77,7 +77,7 @@ const setInitialData = async () => {
 watch(
    () => route.params.id,
-    () => setInitialData()
+    () => setInitialData(),
 );
 onMounted(async () => await setInitialData());
--- a/src/pages/Account/Card/AccountPrivileges.vue
+++ b/src/pages/Account/Card/AccountPrivileges.vue
@ -14,7 +14,7 @@ const rolesOptions = ref([]);
 const formModelRef = ref();
 watch(
    () => route.params.id,
-    () => formModelRef.value.reset()
+    () => formModelRef.value.reset(),
 );
 </script>
 <template>
--- a/src/pages/Account/InheritedRoles.vue
+++ b/src/pages/Account/InheritedRoles.vue
@ -44,7 +44,7 @@ watch(
        store.filter = filter.value;
        store.limit = 0;
        fetchSubRoles();
-    }
+    },
 );
 const fetchSubRoles = () => paginateRef.value.fetch();
--- a/src/pages/Account/Role/Card/InheritedRoles.vue
+++ b/src/pages/Account/Role/Card/InheritedRoles.vue
@ -43,7 +43,7 @@ watch(
        store.url = urlPath.value;
        store.filter = filter.value;
        fetchSubRoles();
-    }
+    },
 );
 const fetchSubRoles = () => paginateRef.value.fetch();
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@ -178,7 +178,7 @@ async function save(data) {
 }
 async function importToNewRefundTicket() {
-    try{
+    try {
        await post(`ClaimBeginnings/${claimId}/importToNewRefundTicket`);
        await claimActionsForm.value.reload();
        quasar.notify({
@ -187,7 +187,7 @@ async function importToNewRefundTicket() {
        });
    } catch (error) {
        const errorMessage = error.response?.data?.error?.message;
-        notify( t(errorMessage), 'negative' );
+        notify(t(errorMessage), 'negative');
    }
 }
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@ -138,6 +138,7 @@ const columns = computed(() => [
        :filter="developmentsFilter"
        ref="claimDevelopmentForm"
        :data-required="{ claimFk: route.params.id }"
        :insert-on-load="true"
        v-model:selected="selected"
        @save-changes="$router.push(`/claim/${route.params.id}/action`)"
        :default-save="false"
@ -238,7 +239,9 @@ const columns = computed(() => [
 <style lang="scss" scoped>
 .grid-style-transition {
-    transition: transform 0.28s, background-color 0.28s;
+    transition:
        transform 0.28s,
        background-color 0.28s;
 }
 </style>
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@ -79,7 +79,7 @@ const columns = computed(() => [
        field: ({ sale }) => sale.quantity,
        sortable: true,
        style: 'padding-right: 2%;',
-        headerStyle: 'padding-right: 2%;'
+        headerStyle: 'padding-right: 2%;',
    },
    {
        name: 'claimed',
@ -113,7 +113,7 @@ const columns = computed(() => [
        format: (value) => toCurrency(value),
        sortable: true,
        style: 'padding-right: 2%;',
-        headerStyle: 'padding-right: 2%;'
+        headerStyle: 'padding-right: 2%;',
    },
 ]);
@ -160,7 +160,7 @@ function fillClaimedQuantities() {
    const formData = claimLinesForm.value.formData;
    let hasChanges = false;
-    const selectedRows = formData.filter(row => selected.value.includes(row));
+    const selectedRows = formData.filter((row) => selected.value.includes(row));
    for (const row of selectedRows) {
        if (row.quantity === 0 || row.quantity === null) {
@ -170,10 +170,10 @@ function fillClaimedQuantities() {
    }
    if (hasChanges) {
-    quasar.notify({
+        quasar.notify({
-        message: t('Quantities filled automatically'),
+            message: t('Quantities filled automatically'),
-        type: 'positive',
+            type: 'positive',
-    });
+        });
    } else {
        quasar.notify({
            message: t('No quantities to fill'),
@ -181,8 +181,6 @@ function fillClaimedQuantities() {
        });
    }
 }
 </script>
 <template>
    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
@ -210,7 +208,6 @@ function fillClaimedQuantities() {
        auto-load
    />
    <div class="q-pa-md">
        <CrudModel
            data-key="claimLines"
            ref="claimLinesForm"
@ -236,12 +233,7 @@ function fillClaimedQuantities() {
                >
                    <template #body-cell-claimed="{ row }">
                        <QTd auto-width align="right" class="text-primary shrink">
-                            <QInput
+                            <QInput v-model.number="row.quantity" type="number" dense />
                                v-model.number="row.quantity"
                                type="number"
                                dense
                            />
                        </QTd>
                    </template>
                    <template #body-cell-description="{ row, value }">
@ -297,7 +289,6 @@ function fillClaimedQuantities() {
                                                        type="number"
                                                        dense
                                                        autofocus
                                                    />
                                                </QItemLabel>
                                            </template>
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@ -1,12 +1,9 @@
 <script setup>
 import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useState } from 'src/composables/useState';
 import VnNotes from 'src/components/ui/VnNotes.vue';
 const route = useRoute();
 const state = useState();
 const user = state.getUser();
 const $props = defineProps({
    id: { type: [Number, String], default: null },
@ -15,25 +12,14 @@ const $props = defineProps({
 const claimId = computed(() => $props.id || route.params.id);
 const claimFilter = {
-    fields: ['id', 'created', 'workerFk', 'text'],
+    fields: ['id', 'created', 'userFk', 'text'],
    include: {
-        relation: 'worker',
+        relation: 'user',
        scope: {
-            fields: ['id', 'firstName', 'lastName'],
+            fields: ['id', 'nickname', 'name'],
            include: {
                relation: 'user',
                scope: {
                    fields: ['id', 'nickname', 'name'],
                },
            },
        },
    },
 };
 const body = {
    claimFk: claimId.value,
    workerFk: user.value.id,
 };
 </script>
 <template>
@ -43,7 +29,9 @@ const body = {
        :add-note="$props.addNote"
        :user-filter="claimFilter"
        :filter="{ where: { claimFk: claimId } }"
-        :body="body"
+        :body="{
            claimFk: claimId,
        }"
        v-bind="$attrs"
        style="overflow-y: auto"
    />
--- a/src/pages/Claim/Card/ClaimPhoto.vue
+++ b/src/pages/Claim/Card/ClaimPhoto.vue
@ -210,7 +210,7 @@ function onDrag() {
                    class="all-pointer-events absolute delete-button zindex"
                    @click.stop="viewDeleteDms(index)"
                    round
-                    :data-cy="`delete-button-${index+1}`"
+                    :data-cy="`delete-button-${index + 1}`"
                />
                <QIcon
                    name="play_circle"
@ -228,7 +228,7 @@ function onDrag() {
                        class="rounded-borders cursor-pointer fit"
                        @click="openDialog(media.dmsFk)"
                        v-if="!media.isVideo"
-                        :data-cy="`file-${index+1}`"
+                        :data-cy="`file-${index + 1}`"
                    >
                    </QImg>
                    <video
@ -237,7 +237,7 @@ function onDrag() {
                        muted="muted"
                        v-if="media.isVideo"
                        @click="openDialog(media.dmsFk)"
-                        :data-cy="`file-${index+1}`"
+                        :data-cy="`file-${index + 1}`"
                    />
                </QCard>
            </div>
--- a/src/pages/Claim/Card/tests/ClaimDescriptorMenu.spec.js
+++ b/src/pages/Claim/Card/tests/ClaimDescriptorMenu.spec.js
@ -27,7 +27,7 @@ describe('ClaimDescriptorMenu', () => {
            await vm.remove();
            expect(vm.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({ type: 'positive' })
+                expect.objectContaining({ type: 'positive' }),
            );
        });
    });
--- a/src/pages/Customer/Card/CustomerConsumption.vue
+++ b/src/pages/Customer/Card/CustomerConsumption.vue
@ -17,6 +17,7 @@ import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.v
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnCheckbox from 'src/components/common/VnCheckbox.vue';
 const arrayData = useArrayData('Customer');
 const { t } = useI18n();
@ -50,7 +51,7 @@ const columns = computed(() => [
        label: t('globals.ticket'),
        cardVisible: true,
        columnFilter: {
-            inWhere: true,
+            name: 'ticketId',
        },
    },
    {
@ -84,25 +85,19 @@ const columns = computed(() => [
        label: t('globals.description'),
        columnClass: 'expand',
        columnFilter: {
-            inWhere: true,
+            name: 'description',
        },
    },
    {
-        name: 'quantity',
+         name: 'quantity',
        label: t('globals.quantity'),
        cardVisible: true,
        visible: true,
-        columnFilter: {
+        columnFilter: false
-            inWhere: true,
+         
        },
    },
    {
        name: 'grouped',
        label: t('Group by items'),
        component: 'checkbox',
        visible: false,
        orderBy: false,
    },
 ]);
 onBeforeMount(async () => {
@ -170,7 +165,6 @@ const updateDateParams = (value, params) => {
        v-if="campaignList"
        data-key="CustomerConsumption"
        url="Clients/consumption"
        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
        :filter="{ where: { clientFk: route.params.id } }"
        :columns="columns"
        search-url="consumption"
@ -218,9 +212,9 @@ const updateDateParams = (value, params) => {
            <div v-if="row.subName" class="subName">
                {{ row.subName }}
            </div>
-            <FetchedTags :item="row" />
+            <FetchedTags :item="row" :columns="6"/>
        </template>
-        <template #moreFilterPanel="{ params }">
+        <template #moreFilterPanel="{ params, searchFn}">
            <div class="column no-wrap flex-center q-gutter-y-md q-mt-xs q-pr-xl">
                <VnSelect
                    :filled="true"
@ -290,6 +284,13 @@ const updateDateParams = (value, params) => {
                    class="q-px-xs q-pt-none fit"
                    dense
                />
                <VnCheckbox
                    v-model="params.grouped"
                    :label="t('Group by items')"
                    class="q-px-xs q-pt-none fit"
                    dense
                    @update:modelValue="() => searchFn()"
                />
            </div>
        </template>
    </VnTable>
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@ -117,8 +117,6 @@ async function acceptPropagate({ isEqualizated }) {
                    option-value="id"
                    v-model="data.sageTaxTypeFk"
                    data-cy="sageTaxTypeFk"
                    :required="data.isTaxDataChecked"
                    :rules="[(val) => validations.required(data.isTaxDataChecked, val)]"
                />
                <VnSelect
                    :label="t('Sage transaction type')"
@ -128,10 +126,6 @@ async function acceptPropagate({ isEqualizated }) {
                    option-value="id"
                    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">
--- a/src/pages/Customer/Card/CustomerNotes.vue
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@ -1,12 +1,15 @@
 <script setup>
 import VnNotes from 'src/components/ui/VnNotes.vue';
 import { useState } from 'src/composables/useState';
 const state = useState();
 const user = state.getUser();
 </script>
 <template>
    <VnNotes
        url="clientObservations"
        :add-note="true"
        :filter="{ where: { clientFk: $route.params.id } }"
-        :body="{ clientFk: $route.params.id }"
+        :body="{ clientFk: $route.params.id, userFk: user.id }"
        style="overflow-y: auto"
        :select-type="true"
        required
--- a/src/pages/Customer/Card/CustomerUnpaid.vue
+++ b/src/pages/Customer/Card/CustomerUnpaid.vue
@ -50,8 +50,11 @@ const filterClientFindOne = {
        >
            <template #form="{ data }">
                <VnRow>
-                    <QCheckbox :label="t('Unpaid client')" v-model="data.unpaid"
+                    <QCheckbox
-                    data-cy="UnpaidCheckBox" />
+                        :label="t('Unpaid client')"
                        v-model="data.unpaid"
                        data-cy="UnpaidCheckBox"
                    />
                </VnRow>
                <VnRow class="row q-gutter-md q-mb-md" v-show="data.unpaid">
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@ -76,7 +76,7 @@ const columns = computed(() => [
    },
    {
        align: 'left',
-        name: 'workerFk',
+        name: 'userFk',
        label: t('Author'),
        tooltip: t('Worker who made the last observation'),
        columnFilter: {
@ -155,7 +155,7 @@ function exprBuilder(param, value) {
            return { [`c.${param}`]: value };
        case 'payMethod':
            return { [`c.payMethodFk`]: value };
-        case 'workerFk':
+        case 'userFk':
            return { [`co.${param}`]: value };
        case 'departmentFk':
            return { [`c.${param}`]: value };
@ -229,10 +229,10 @@ function exprBuilder(param, value) {
                <DepartmentDescriptorProxy :id="row.departmentFk" />
            </span>
        </template>
-        <template #column-workerFk="{ row }">
+        <template #column-userFk="{ row }">
            <span class="link" @click.stop>
                {{ row.workerName }}
-                <WorkerDescriptorProxy :id="row.workerFk" />
+                <WorkerDescriptorProxy :id="row.userFk" />
            </span>
        </template>
    </VnTable>
--- a/src/pages/Customer/components/CustomerFileManagementCreate.vue
+++ b/src/pages/Customer/components/CustomerFileManagementCreate.vue
@ -224,7 +224,7 @@ const toCustomerFileManagement = () => {
                                    <QTooltip max-width="30rem">
                                        {{
                                            `${t(
-                                                'Allowed content types'
+                                                'Allowed content types',
                                            )}: ${allowedContentTypes.join(', ')}`
                                        }}
                                    </QTooltip>
--- a/src/pages/Customer/components/CustomerFileManagementEdit.vue
+++ b/src/pages/Customer/components/CustomerFileManagementEdit.vue
@ -200,7 +200,7 @@ const toCustomerFileManagement = () => {
                                    <QTooltip max-width="30rem">
                                        {{
                                            `${t(
-                                                'Allowed content types'
+                                                'Allowed content types',
                                            )}: ${allowedContentTypes.join(', ')}`
                                        }}
                                    </QTooltip>
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@ -130,20 +130,22 @@ async function onDataSaved(formData, { id }) {
    }
 }
-async function getSupplierClientReferences(value) {
+async function getSupplierClientReferences(data) {
-    if (!value) return (initialData.description = '');
+    if (!data) return (initialData.description = '');
-    const params = { bankAccount: value };
+    const params = { bankAccount: data.compensationAccount };
-    const { data } = await axios(`Clients/getClientOrSupplierReference`, { params });
+    const { data: reference } = await axios(`Clients/getClientOrSupplierReference`, {
-    if (!data.clientId) {
+        params,
-        initialData.description = t('Supplier Compensation Reference', {
+    });
-            supplierId: data.supplierId,
+    if (reference.supplierId) {
-            supplierName: data.supplierName,
+        data.description = t('Supplier Compensation Reference', {
            supplierId: reference.supplierId,
            supplierName: reference.supplierName,
        });
        return;
    }
-    initialData.description = t('Client Compensation Reference', {
+    data.description = t('Client Compensation Reference', {
-        clientId: data.clientId,
+        clientId: reference.clientId,
-        clientName: data.clientName,
+        clientName: reference.clientName,
    });
 }
@ -222,6 +224,7 @@ async function getAmountPaid() {
                        clearable
                        v-model.number="data.amountPaid"
                        data-cy="paymentAmount"
                        :positive="false"
                    />
                </VnRow>
                <VnRow>
@ -251,7 +254,7 @@ async function getAmountPaid() {
                            :label="t('Compensation account')"
                            clearable
                            v-model="data.compensationAccount"
-                            @blur="getSupplierClientReferences(data.compensationAccount)"
+                            @blur="getSupplierClientReferences(data)"
                        />
                    </VnRow>
                </div>
@ -287,6 +290,9 @@ async function getAmountPaid() {
 </template>
 <i18n>
 en:
    Supplier Compensation Reference: ({supplierId}) Ntro Proveedor {supplierName}
    Client Compensation Reference: ({clientId}) Ntro Cliente {clientName}
 es:
    New payment: Añadir pago
    Date: Fecha
--- a/src/pages/Customer/composables/getClient.js
+++ b/src/pages/Customer/composables/getClient.js
@ -13,4 +13,4 @@ export async function getClient(clientId, _filter = {}) {
    };
    const params = { filter: JSON.stringify(filter) };
    return await axios.get('Clients', { params });
-};
+}
--- a/src/pages/Customer/locale/en.yml
+++ b/src/pages/Customer/locale/en.yml
@ -123,3 +123,4 @@ customer:
        ticketFk: Ticket Id
        description: Description
        quantity: Quantity
        ticketId: Ticket
--- a/src/pages/Customer/locale/es.yml
+++ b/src/pages/Customer/locale/es.yml
@ -123,3 +123,4 @@ customer:
        ticketFk: Id Ticket
        description: Descripción
        quantity: Cantidad
        ticketId: Ticket
--- a/src/pages/Entry/Card/EntryBuysImport.vue
+++ b/src/pages/Entry/Card/EntryBuysImport.vue
@ -126,7 +126,7 @@ const fetchBuys = async (buys) => {
    const params = { buys };
    const { data } = await axios.post(
        `Entries/${route.params.id}/importBuysPreview`,
-        params
+        params,
    );
    importData.value.buys = data;
 };
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@ -73,6 +73,7 @@ const columns = computed(() => [
            optionLabel: 'code',
            options: companies.value,
        },
        orderBy: false,
    },
    {
        name: 'warehouse',
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@ -90,6 +90,7 @@ const columns = computed(() => [
            auto-load
            :data-required="{ invoiceInFk: invoiceInId }"
            :filter="filter"
            :insert-on-load="true"
            v-model:selected="rowsSelected"
            @on-fetch="(data) => (invoceInIntrastat = data)"
        >
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@ -1,21 +1,16 @@
 <script setup>
-import { ref, computed, nextTick } from 'vue';
+import { ref, computed, markRaw } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import { getTotal } from 'src/composables/getTotal';
 import { toCurrency } from 'src/filters';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import CrudModel from 'src/components/CrudModel.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CreateNewExpenseForm from 'src/components/CreateNewExpenseForm.vue';
 import { getExchange } from 'src/composables/getExchange';
-import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnSelectExpense from 'src/components/common/VnSelectExpense.vue';
 const { t } = useI18n();
 const arrayData = useArrayData();
 const route = useRoute();
 const invoiceIn = computed(() => arrayData.store.data);
@ -24,100 +19,142 @@ const expenses = ref([]);
 const sageTaxTypes = ref([]);
 const sageTransactionTypes = ref([]);
 const rowsSelected = ref([]);
-const invoiceInFormRef = ref();
+const invoiceInVatTableRef = ref();
-defineProps({
+defineProps({ actionIcon: { type: String, default: 'add' } });
-    actionIcon: {
+
-        type: String,
+function taxRate(invoiceInTax) {
-        default: 'add',
+    const sageTaxTypeId = invoiceInTax.taxTypeSageFk;
-    },
+    const taxRateSelection = sageTaxTypes.value.find(
-});
+        (transaction) => transaction.id == sageTaxTypeId,
    );
    const taxTypeSage = taxRateSelection?.rate ?? 0;
    const taxableBase = invoiceInTax?.taxableBase ?? 0;
    return (taxTypeSage / 100) * taxableBase;
 }
 const columns = computed(() => [
    {
-        name: 'expense',
+        name: 'expenseFk',
        label: t('Expense'),
-        field: (row) => row.expenseFk,
+        component: markRaw(VnSelectExpense),
-        options: expenses.value,
+        format: (row) => {
-        model: 'expenseFk',
+            const expense = expenses.value.find((e) => e.id === row.expenseFk);
-        optionValue: 'id',
+            return expense ? `${expense.id}: ${expense.name}` : row.expenseFk;
-        optionLabel: (row) => `${row.id}: ${row.name}`,
+        },
        sortable: true,
        align: 'left',
        isEditable: true,
        create: true,
        width: '250px',
    },
    {
-        name: 'taxablebase',
+        name: 'taxableBase',
        label: t('Taxable base'),
-        field: (row) => row.taxableBase,
+        component: 'number',
-        model: 'taxableBase',
+        attrs: {
            clearable: true,
            'clear-icon': 'close',
        },
        sortable: true,
        align: 'left',
        isEditable: true,
        create: true,
    },
    {
        name: 'isDeductible',
        label: t('invoiceIn.isDeductible'),
-        field: (row) => row.isDeductible,
+        component: 'checkbox',
        model: 'isDeductible',
        align: 'center',
        isEditable: true,
        create: true,
        createAttrs: {
            defaultValue: true,
        },
        width: '100px',
    },
    {
-        name: 'sageiva',
+        name: 'taxTypeSageFk',
        label: t('Sage iva'),
-        field: (row) => row.taxTypeSageFk,
+        component: 'select',
-        options: sageTaxTypes.value,
+        attrs: {
-        model: 'taxTypeSageFk',
+            options: sageTaxTypes.value,
-        optionValue: 'id',
+            optionValue: 'id',
-        optionLabel: (row) => `${row.id}: ${row.vat}`,
+            optionLabel: (row) => `${row.id}: ${row.vat}`,
            filterOptions: ['id', 'vat'],
            'data-cy': 'vat-sageiva',
        },
        format: (row) => {
            const taxType = sageTaxTypes.value.find((t) => t.id === row.taxTypeSageFk);
            return taxType ? `${taxType.id}: ${taxType.vat}` : row.taxTypeSageFk;
        },
        sortable: true,
        align: 'left',
        isEditable: true,
        create: true,
    },
    {
-        name: 'sagetransaction',
+        name: 'transactionTypeSageFk',
        label: t('Sage transaction'),
-        field: (row) => row.transactionTypeSageFk,
+        component: 'select',
-        options: sageTransactionTypes.value,
+        attrs: {
-        model: 'transactionTypeSageFk',
+            options: sageTransactionTypes.value,
-        optionValue: 'id',
+            optionValue: 'id',
-        optionLabel: (row) => `${row.id}: ${row.transaction}`,
+            optionLabel: (row) => `${row.id}: ${row.transaction}`,
            filterOptions: ['id', 'transaction'],
        },
        format: (row) => {
            const transType = sageTransactionTypes.value.find(
                (t) => t.id === row.transactionTypeSageFk,
            );
            return transType
                ? `${transType.id}: ${transType.transaction}`
                : row.transactionTypeSageFk;
        },
        sortable: true,
        align: 'left',
        isEditable: true,
        create: true,
    },
    {
        name: 'rate',
        label: t('Rate'),
-        sortable: true,
+        sortable: false,
-        field: (row) => taxRate(row, row.taxTypeSageFk),
+        format: (row) => taxRate(row).toFixed(2),
        align: 'left',
    },
    {
-        name: 'foreignvalue',
+        name: 'foreignValue',
        label: t('Foreign value'),
        component: 'number',
        sortable: true,
        field: (row) => row.foreignValue,
        align: 'left',
        create: true,
        disable: !isNotEuro(currency.value),
    },
    {
        name: 'total',
-        label: 'Total',
+        label: t('Total'),
        align: 'left',
        format: (row) => (Number(row.taxableBase || 0) + Number(taxRate(row))).toFixed(2),
    },
 ]);
 const tableRows = computed(
    () => invoiceInVatTableRef.value?.CrudModelRef?.formData || [],
 );
 const taxableBaseTotal = computed(() => {
-    return getTotal(invoiceInFormRef.value.formData, 'taxableBase');
+    return getTotal(tableRows.value, 'taxableBase');
 });
 const taxRateTotal = computed(() => {
-    return getTotal(invoiceInFormRef.value.formData, null, {
+    return tableRows.value.reduce((sum, row) => sum + Number(taxRate(row)), 0);
        cb: taxRate,
    });
 });
 const combinedTotal = computed(() => {
    return +taxableBaseTotal.value + +taxRateTotal.value;
 });
-const filter = {
+const filter = computed(() => ({
    fields: [
        'id',
        'invoiceInFk',
@ -131,388 +168,75 @@ const filter = {
    where: {
        invoiceInFk: route.params.id,
    },
-};
+}));
 const isNotEuro = (code) => code != 'EUR';
-function taxRate(invoiceInTax) {
+async function handleForeignValueUpdate(val, row) {
-    const sageTaxTypeId = invoiceInTax.taxTypeSageFk;
+    if (!isNotEuro(currency.value)) return;
-    const taxRateSelection = sageTaxTypes.value.find(
+    row.taxableBase = await getExchange(
-        (transaction) => transaction.id == sageTaxTypeId,
+        val,
        invoiceIn.value?.currencyFk,
        invoiceIn.value?.issued,
    );
    const taxTypeSage = taxRateSelection?.rate ?? 0;
    const taxableBase = invoiceInTax?.taxableBase ?? 0;
    return ((taxTypeSage / 100) * taxableBase).toFixed(2);
 }
 function autocompleteExpense(evt, row, col, ref) {
    const val = evt.target.value;
    if (!val) return;
    const param = isNaN(val) ? row[col.model] : val;
    const lookup = expenses.value.find(
        ({ id }) => id == useAccountShortToStandard(param),
    );
    ref.vnSelectDialogRef.vnSelectRef.toggleOption(lookup);
 }
 function setCursor(ref) {
    nextTick(() => {
        const select = ref.vnSelectDialogRef
            ? ref.vnSelectDialogRef.vnSelectRef
            : ref.vnSelectRef;
        select.$el.querySelector('input').setSelectionRange(0, 0);
    });
 }
 </script>
 <template>
-    <FetchData
+    <FetchData url="Expenses" auto-load @on-fetch="(data) => (expenses = data)" />
        ref="expensesRef"
        url="Expenses"
        auto-load
        @on-fetch="(data) => (expenses = data)"
    />
    <FetchData url="SageTaxTypes" auto-load @on-fetch="(data) => (sageTaxTypes = data)" />
    <FetchData
        url="sageTransactionTypes"
        auto-load
        @on-fetch="(data) => (sageTransactionTypes = data)"
    />
-    <CrudModel
+    <VnTable
        ref="invoiceInFormRef"
        v-if="invoiceIn"
        ref="invoiceInVatTableRef"
        data-key="InvoiceInTaxes"
        url="InvoiceInTaxes"
        save-url="InvoiceInTaxes/crud"
        :filter="filter"
        :data-required="{ invoiceInFk: $route.params.id }"
        :insert-on-load="true"
        auto-load
        v-model:selected="rowsSelected"
-        :go-to="`/invoice-in/${$route.params.id}/due-day`"
+        :columns="columns"
        :is-editable="true"
        :table="{ selection: 'multiple', 'row-key': '$index' }"
        footer
        :right-search="false"
        :column-search="false"
        :disable-option="{ card: true }"
        class="q-pa-none"
        :create="{
            urlCreate: 'InvoiceInTaxes',
            title: t('Add tax'),
            formInitialData: { invoiceInFk: $route.params.id, isDeductible: true },
            onDataSaved: () => invoiceInVatTableRef.reload(),
        }"
        :crud-model="{ goTo: `/invoice-in/${$route.params.id}/due-day` }"
    >
-        <template #body="{ rows }">
+        <template #column-footer-taxableBase>
-            <QTable
+            {{ toCurrency(taxableBaseTotal) }}
                v-model:selected="rowsSelected"
                selection="multiple"
                :columns="columns"
                :rows="rows"
                row-key="$index"
                :grid="$q.screen.lt.sm"
            >
                <template #body-cell-expense="{ row, col }">
                    <QTd>
                        <VnSelectDialog
                            :ref="`expenseRef-${row.$index}`"
                            v-model="row[col.model]"
                            :options="col.options"
                            :option-value="col.optionValue"
                            :option-label="col.optionLabel"
                            :filter-options="['id', 'name']"
                            :tooltip="t('Create a new expense')"
                            :acls="[
                                { model: 'Expense', props: '*', accessType: 'WRITE' },
                            ]"
                            @keydown.tab.prevent="
                                autocompleteExpense(
                                    $event,
                                    row,
                                    col,
                                    $refs[`expenseRef-${row.$index}`],
                                )
                            "
                            @update:model-value="
                                setCursor($refs[`expenseRef-${row.$index}`])
                            "
                        >
                            <template #option="scope">
                                <QItem v-bind="scope.itemProps">
                                    {{ `${scope.opt.id}: ${scope.opt.name}` }}
                                </QItem>
                            </template>
                            <template #form>
                                <CreateNewExpenseForm
                                    @on-data-saved="$refs.expensesRef.fetch()"
                                />
                            </template>
                        </VnSelectDialog>
                    </QTd>
                </template>
                <template #body-cell-isDeductible="{ row }">
                    <QTd align="center">
                        <QCheckbox
                            v-model="row.isDeductible"
                            data-cy="isDeductible_checkbox"
                        />
                    </QTd>
                </template>
                <template #body-cell-taxablebase="{ row }">
                    <QTd shrink>
                        <VnInputNumber
                            clear-icon="close"
                            v-model="row.taxableBase"
                            clearable
                        />
                    </QTd>
                </template>
                <template #body-cell-sageiva="{ row, col }">
                    <QTd>
                        <VnSelect
                            :ref="`sageivaRef-${row.$index}`"
                            v-model="row[col.model]"
                            :options="col.options"
                            :option-value="col.optionValue"
                            :option-label="col.optionLabel"
                            :filter-options="['id', 'vat']"
                            data-cy="vat-sageiva"
                            @update:model-value="
                                setCursor($refs[`sageivaRef-${row.$index}`])
                            "
                        >
                            <template #option="scope">
                                <QItem v-bind="scope.itemProps">
                                    <QItemSection>
                                        <QItemLabel>{{ scope.opt.vat }}</QItemLabel>
                                        <QItemLabel>
                                            {{ `#${scope.opt.id}` }}
                                        </QItemLabel>
                                    </QItemSection>
                                </QItem>
                            </template>
                        </VnSelect>
                    </QTd>
                </template>
                <template #body-cell-sagetransaction="{ row, col }">
                    <QTd>
                        <VnSelect
                            :ref="`sagetransactionRef-${row.$index}`"
                            v-model="row[col.model]"
                            :options="col.options"
                            :option-value="col.optionValue"
                            :option-label="col.optionLabel"
                            :filter-options="['id', 'transaction']"
                            @update:model-value="
                                setCursor($refs[`sagetransactionRef-${row.$index}`])
                            "
                        >
                            <template #option="scope">
                                <QItem v-bind="scope.itemProps">
                                    <QItemSection>
                                        <QItemLabel>{{
                                            scope.opt.transaction
                                        }}</QItemLabel>
                                        <QItemLabel>
                                            {{ `#${scope.opt.id}` }}
                                        </QItemLabel>
                                    </QItemSection>
                                </QItem>
                            </template>
                        </VnSelect>
                    </QTd>
                </template>
                <template #body-cell-foreignvalue="{ row }">
                    <QTd shrink>
                        <VnInputNumber
                            :class="{
                                'no-pointer-events': !isNotEuro(currency),
                            }"
                            :disable="!isNotEuro(currency)"
                            v-model="row.foreignValue"
                            @update:model-value="
                                async (val) => {
                                    if (!isNotEuro(currency)) return;
                                    row.taxableBase = await getExchange(
                                        val,
                                        row.currencyFk,
                                        invoiceIn.issued,
                                    );
                                }
                            "
                        />
                    </QTd>
                </template>
                <template #bottom-row>
                    <QTr class="bg">
                        <QTd />
                        <QTd />
                        <QTd>
                            {{ toCurrency(taxableBaseTotal) }}
                        </QTd>
                        <QTd />
                        <QTd />
                        <QTd />
                        <QTd>
                            {{ toCurrency(taxRateTotal) }}
                        </QTd>
                        <QTd />
                        <QTd>
                            {{ toCurrency(combinedTotal) }}
                        </QTd>
                    </QTr>
                </template>
                <template #item="props">
                    <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
                        <QCard bordered flat class="q-my-xs">
                            <QCardSection>
                                <QCheckbox v-model="props.selected" dense />
                            </QCardSection>
                            <QSeparator />
                            <QList>
                                <QItem>
                                    <VnSelectDialog
                                        :label="t('Expense')"
                                        class="full-width"
                                        v-model="props.row['expenseFk']"
                                        :options="expenses"
                                        option-value="id"
                                        :option-label="(row) => `${row.id}:${row.name}`"
                                        :filter-options="['id', 'name']"
                                        :tooltip="t('Create a new expense')"
                                    >
                                        <template #option="scope">
                                            <QItem v-bind="scope.itemProps">
                                                {{ `${scope.opt.id}: ${scope.opt.name}` }}
                                            </QItem>
                                        </template>
                                        <template #form>
                                            <CreateNewExpenseForm />
                                        </template>
                                    </VnSelectDialog>
                                </QItem>
                                <QItem>
                                    <VnInputNumber
                                        :label="t('Taxable base')"
                                        :class="{
                                            'no-pointer-events': isNotEuro(currency),
                                        }"
                                        class="full-width"
                                        :disable="isNotEuro(currency)"
                                        clear-icon="close"
                                        v-model="props.row.taxableBase"
                                        clearable
                                    />
                                </QItem>
                                <QItem>
                                    <VnSelect
                                        :label="t('Sage iva')"
                                        class="full-width"
                                        v-model="props.row['taxTypeSageFk']"
                                        :options="sageTaxTypes"
                                        option-value="id"
                                        :option-label="(row) => `${row.id}:${row.vat}`"
                                        :filter-options="['id', 'vat']"
                                    >
                                        <template #option="scope">
                                            <QItem v-bind="scope.itemProps">
                                                <QItemSection>
                                                    <QItemLabel>{{
                                                        scope.opt.vat
                                                    }}</QItemLabel>
                                                    <QItemLabel>
                                                        {{ `#${scope.opt.id}` }}
                                                    </QItemLabel>
                                                </QItemSection>
                                            </QItem>
                                        </template>
                                    </VnSelect>
                                </QItem>
                                <QItem>
                                    <VnSelect
                                        class="full-width"
                                        v-model="props.row['transactionTypeSageFk']"
                                        :options="sageTransactionTypes"
                                        option-value="id"
                                        :option-label="
                                            (row) => `${row.id}:${row.transaction}`
                                        "
                                        :filter-options="['id', 'transaction']"
                                    >
                                        <template #option="scope">
                                            <QItem v-bind="scope.itemProps">
                                                <QItemSection>
                                                    <QItemLabel>{{
                                                        scope.opt.transaction
                                                    }}</QItemLabel>
                                                    <QItemLabel>
                                                        {{ `#${scope.opt.id}` }}
                                                    </QItemLabel>
                                                </QItemSection>
                                            </QItem>
                                        </template>
                                    </VnSelect>
                                </QItem>
                                <QItem>
                                    {{ toCurrency(taxRate(props.row), currency) }}
                                </QItem>
                                <QItem>
                                    <VnInputNumber
                                        :label="t('Foreign value')"
                                        class="full-width"
                                        :class="{
                                            'no-pointer-events': !isNotEuro(currency),
                                        }"
                                        :disable="!isNotEuro(currency)"
                                        v-model="props.row.foreignValue"
                                    />
                                </QItem>
                            </QList>
                        </QCard>
                    </div>
                </template>
            </QTable>
        </template>
-    </CrudModel>
+        <template #column-footer-rate>
-    <QPageSticky position="bottom-right" :offset="[25, 25]">
+            {{ toCurrency(taxRateTotal) }}
-        <QBtn
+        </template>
-            color="primary"
+        <template #column-footer-total>
-            icon="add"
+            {{ toCurrency(combinedTotal) }}
-            size="lg"
+        </template>
-            v-shortcut="'+'"
+    </VnTable>
            round
            @click="invoiceInFormRef.insert()"
        >
            <QTooltip>{{ t('Add tax') }}</QTooltip>
        </QBtn>
    </QPageSticky>
 </template>
 <style lang="scss" scoped>
 .bg {
    background-color: var(--vn-light-gray);
 }
@media (max-width: $breakpoint-xs) {
    .q-dialog {
        .q-card {
            &__section:not(:first-child) {
                .q-item {
                    flex-direction: column;
                    .q-checkbox {
                        margin-top: 2rem;
                    }
                }
            }
        }
    }
 }
 .q-item {
    min-height: 0;
 }
 .default-icon {
    cursor: pointer;
    border-radius: 50px;
    background-color: $primary;
 }
 </style>
 <i18n>
 es:
    Expense: Gasto
    Create a new expense: Crear nuevo gasto
-    Add tax: Crear gasto
+    Add tax: Añadir Gasto/IVA # Changed label slightly
    Taxable base: Base imp.
-    Sage tax: Sage iva
+    Sage iva: Sage iva # Kept original label
    Sage transaction: Sage transacción
-    Rate: Tasa
+    Rate: Cuota # Changed label
    Foreign value: Divisa
    Total: Total
    invoiceIn.isDeductible: Deducible
 </i18n>
--- a/src/pages/InvoiceIn/composables/setRectificative.js
+++ b/src/pages/InvoiceIn/composables/setRectificative.js
@ -3,7 +3,7 @@ import axios from 'axios';
 export async function setRectificative(route) {
    const card = route.matched.find((route) => route.name === 'InvoiceInCard');
    const corrective = card.children.find(
-        (route) => route.name === 'InvoiceInCorrective'
+        (route) => route.name === 'InvoiceInCorrective',
    );
    corrective.meta.hidden = !(
--- a/src/pages/Item/Card/ItemBarcode.vue
+++ b/src/pages/Item/Card/ItemBarcode.vue
@ -51,6 +51,7 @@ const submit = async (rows) => {
            <CrudModel
                :data-required="{ itemFk: route.params.id }"
                :default-remove="false"
                :insert-on-load="true"
                :filter="{
                    fields: ['id', 'itemFk', 'code'],
                    where: { itemFk: route.params.id },
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@ -76,15 +76,22 @@ const insertTag = (rows) => {
                model="ItemTags"
                url="ItemTags"
                :data-required="{
                    $index: undefined,
                    itemFk: route.params.id,
                    priority: undefined,
                    tag: {
-                        isFree: undefined,
+                        isFree: true,
                        value: undefined,
                        name: undefined,
                    },
                }"
                :data-default="{
                    tag: {
                        isFree: true,
                        value: undefined,
                        name: undefined,
                    },
                    tagFk: undefined,
                    priority: undefined,
                }"
                :default-remove="false"
                :user-filter="{
--- a/src/pages/Login/LoginMain.vue
+++ b/src/pages/Login/LoginMain.vue
@ -1,12 +1,11 @@
 <script setup>
 import { ref } from 'vue';
 import { Notify } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 import { useSession } from 'src/composables/useSession';
 import { useLogin } from 'src/composables/useLogin';
-
+import useNotify from 'src/composables/useNotify';
 import VnLogo from 'components/ui/VnLogo.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import axios from 'axios';
@ -15,16 +14,14 @@ const session = useSession();
 const loginCache = useLogin();
 const router = useRouter();
 const { t } = useI18n();
 const { notify } = useNotify();
 const username = ref('');
 const password = ref('');
 const keepLogin = ref(true);
 async function onSubmit() {
-    const params = {
+    const params = { user: username.value, password: password.value };
        user: username.value,
        password: password.value,
    };
    try {
        const { data } = await axios.post('Accounts/login', params);
        if (!data) return;
@ -33,11 +30,7 @@ async function onSubmit() {
        await session.setLogin(data);
    } catch (res) {
        if (res.response?.data?.error?.code === 'REQUIRES_2FA') {
-            Notify.create({
+            notify(t('login.twoFactorRequired'), 'warning', 'phoneLink_lock');
                message: t('login.twoFactorRequired'),
                icon: 'phoneLink_lock',
                type: 'warning',
            });
            params.keepLogin = keepLogin.value;
            loginCache.setUser(params);
            return router.push({
@ -45,10 +38,7 @@ async function onSubmit() {
                query: router.currentRoute.value?.query,
            });
        }
-        Notify.create({
+        throw res;
            message: t('login.loginError'),
            type: 'negative',
        });
    }
 }
 </script>
--- a/src/pages/Login/ResetPassword.vue
+++ b/src/pages/Login/ResetPassword.vue
@ -37,7 +37,7 @@ async function onSubmit() {
        await axios.post(
            'VnUsers/reset-password',
            { newPassword: newPassword.value },
-            { headers }
+            { headers },
        );
        router.push('Login');
        quasar.notify({
--- a/src/pages/Order/Card/OrderVolume.vue
+++ b/src/pages/Order/Card/OrderVolume.vue
@ -71,9 +71,7 @@ onMounted(async () => (stateStore.rightDrawer = false));
        auto-load
    />
    <QCard v-if="volumeSummary" class="order-volume-summary q-pa-lg">
-        <VnLv 
+        <VnLv :label="`${t('total')}: `" :value="`${volumeSummary?.totalVolume} m³`" />
        :label="`${t('total')}: `" 
        :value="`${volumeSummary?.totalVolume} m³`" />
        <VnLv
            :label="`${t('boxes')}: `"
            :value="`${dashIfEmpty(volumeSummary?.totalBoxes)} U`"
--- a/Show More
+++ b/Show More