Merge pull request 'Add mapper fn beforeSave' (!1368 ) from formModel_mapper into dev

Reviewed-on: #1368 Reviewed-by: Alex Moreno <alexm@verdnatura.es>
Merge branch 'dev' into formModel_mapper
2025-02-21 13:35:01 +00:00 · 2025-02-21 13:18:52 +00:00 · 2025-02-21 12:41:36 +00:00 · 2025-02-21 13:23:32 +01:00 · 2025-02-21 13:23:31 +01:00 · 2025-02-21 12:09:49 +00:00
413 changed files with 13017 additions and 6544 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -0,0 +1 @@
+node_modules
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/90
+++ b/90
@ -1,6 +1,7 @@
 #!/usr/bin/env groovy

 def PROTECTED_BRANCH
+def IS_LATEST

 def BRANCH_ENV = [
    test: 'test',
@ -10,16 +11,18 @@ def BRANCH_ENV = [

 node {
    stage('Setup') {
-        env.FRONT_REPLICAS = 1
        env.NODE_ENV = BRANCH_ENV[env.BRANCH_NAME] ?: 'dev'

        PROTECTED_BRANCH = [
            'dev',
            'test',
            'master',
+            'main',
            'beta'
        ].contains(env.BRANCH_NAME)

+        IS_LATEST = ['master', 'main'].contains(env.BRANCH_NAME)
+
        // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
        echo "NODE_NAME: ${env.NODE_NAME}"
        echo "WORKSPACE: ${env.WORKSPACE}"
@ -58,6 +61,19 @@ pipeline {
        PROJECT_NAME = 'lilium'
    }
    stages {
+        stage('Version') {
+            when {
+                expression { PROTECTED_BRANCH }
+            }
+            steps {
+                script {
+                    def packageJson = readJSON file: 'package.json'
+                    def version = "${packageJson.version}-build${env.BUILD_ID}"
+                    writeFile(file: 'VERSION.txt', text: version)
+                    echo "VERSION: ${version}"
+                }
+            }
+        }
        stage('Install') {
            environment {
                NODE_ENV = ""
@ -71,17 +87,48 @@ pipeline {
                expression { !PROTECTED_BRANCH }
            }
            environment {
-                NODE_ENV = ""
+                NODE_ENV = ''
+                CI = 'true'
+                TZ = 'Europe/Madrid'
            }
-            steps {
-                sh 'pnpm run test:unit:ci'
-            }
-              post {
-                always {
-                    junit(
-                        testResults: 'junitresults.xml',
-                        allowEmptyResults: true
-                    )
+            parallel {
+                stage('Unit') {
+                    steps {
+                        sh 'pnpm run test:unit:ci'
+                    }
+                    post {
+                        always {
+                            junit(
+                                testResults: 'junit/vitest.xml',
+                                allowEmptyResults: true
+                            )
+                        }
+                    }
+                }
+                stage('E2E') {
+                    environment {
+                        CREDENTIALS = credentials('docker-registry')
+                        COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}"
+                        COMPOSE_PARAMS = "-p ${env.COMPOSE_PROJECT} -f test/cypress/docker-compose.yml --project-directory ."
+                    }
+                    steps {
+                        script {
+                            def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
+                            sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
+                            image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ") {
+                                sh 'cypress run --browser chromium'
+                            }
+                        }
+                    }
+                    post {
+                        always {
+                            sh "docker-compose ${env.COMPOSE_PARAMS} down"
+                            junit(
+                                testResults: 'junit/e2e.xml',
+                                allowEmptyResults: true
+                            )
+                        }
+                    }
                }
            }
        }
@ -91,25 +138,30 @@ pipeline {
            }
            environment {
                CREDENTIALS = credentials('docker-registry')
+                VERSION = readFile 'VERSION.txt'
            }
            steps {
-                sh 'quasar build'
                script {
-                    def packageJson = readJSON file: 'package.json'
-                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
+                    sh 'quasar build'
+
+                    def baseImage = "salix-frontend:${env.VERSION}"
+                    def image = docker.build(baseImage, ".")
+                    docker.withRegistry("https://${env.REGISTRY}", 'docker-registry') {
+                        image.push()
+                        image.push(env.BRANCH_NAME)
+                        if (IS_LATEST) image.push('latest')
+                    }
                }
-                dockerBuild()
            }
        }
        stage('Deploy') {
            when {
                expression { PROTECTED_BRANCH }
            }
+            environment {
+                VERSION = readFile 'VERSION.txt'
+            }
            steps {
-                script {
-                    def packageJson = readJSON file: 'package.json'
-                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
-                }
                withKubeConfig([
                    serverUrl: "$KUBERNETES_API",
                    credentialsId: 'kubernetes',
--- a/cypress.config.js
+++ b/cypress.config.js
@ -3,10 +3,39 @@ import { defineConfig } from 'cypress';
 // https://docs.cypress.io/app/references/configuration
 // https://www.npmjs.com/package/cypress-mochawesome-reporter

+let urlHost,
+    reporter,
+    reporterOptions;
+
+if (process.env.CI) {
+    urlHost = 'front';
+    reporter = 'junit';
+    reporterOptions = {
+        mochaFile: 'junit/e2e.xml',
+        toConsole: false,
+    };
+} else {
+    urlHost = 'localhost';
+    reporter = 'cypress-mochawesome-reporter';
+    reporterOptions = {
+        charts: true,
+        reportPageTitle: 'Cypress Inline Reporter',
+        reportFilename: '[status]_[datetime]-report',
+        embeddedScreenshots: true,
+        reportDir: 'test/cypress/reports',
+        inlineAssets: true,
+    };
+}
+
 export default defineConfig({
    e2e: {
-        baseUrl: 'http://localhost:9000/',
-        experimentalStudio: true,
+        baseUrl: `http://${urlHost}:9000`,
+        experimentalStudio: false, // Desactivado para evitar tiempos de espera innecesarios
+        defaultCommandTimeout: 10000,
+        trashAssetsBeforeRuns: false,
+        requestTimeout: 10000,
+        responseTimeout: 30000,
+        pageLoadTimeout: 60000,
        fixturesFolder: 'test/cypress/fixtures',
        screenshotsFolder: 'test/cypress/screenshots',
        supportFile: 'test/cypress/support/index.js',
@ -16,27 +45,33 @@ export default defineConfig({
        specPattern: 'test/cypress/integration/**/*.spec.js',
        experimentalRunAllSpecs: true,
        watchForFileChanges: true,
-        reporter: 'cypress-mochawesome-reporter',
-        reporterOptions: {
-            charts: true,
-            reportPageTitle: 'Cypress Inline Reporter',
-            reportFilename: '[status]_[datetime]-report',
-            embeddedScreenshots: true,
-            reportDir: 'test/cypress/reports',
-            inlineAssets: true,
-        },
+        reporter,
+        reporterOptions,
        component: {
            componentFolder: 'src',
            testFiles: '**/*.spec.js',
            supportFile: 'test/cypress/support/unit.js',
-        },
+        },/*
        setupNodeEvents: async (on, config) => {
            const plugin = await import('cypress-mochawesome-reporter/plugin');
            plugin.default(on);
+            const fs = await import('fs');
+            on('task', {
+                deleteFile(filePath) {
+                    if (fs.existsSync(filePath)) {
+                        fs.unlinkSync(filePath);
+                        return true;
+                    }
+                    return false;
+                },
+            });

            return config;
-        },
+        },*/
        viewportWidth: 1280,
        viewportHeight: 720,
    },
+    experimentalMemoryManagement: true,
+    defaultCommandTimeout: 10000,
+    numTestsKeptInMemory: 2,
 });
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -1,7 +0,0 @@
-version: '3.7'
-services:
-  main:
-    image: registry.verdnatura.es/salix-frontend:${VERSION:?}
-    build:
-      context: .
-      dockerfile: ./Dockerfile
--- a/docs/Dockerfile.dev
+++ b/docs/Dockerfile.dev
@ -0,0 +1,45 @@
+FROM debian:12.9-slim
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends \
+        ca-certificates \
+        curl \
+        gnupg2 \
+    && curl -fsSL https://deb.nodesource.com/setup_20.x | bash - \
+    && apt-get install -y --no-install-recommends nodejs \
+    && npm install -g corepack@0.31.0 \
+    && corepack enable pnpm \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN apt-get update \
+    && apt-get -y --no-install-recommends install \
+        apt-utils \
+        chromium \
+        libasound2 \
+        libgbm-dev \
+        libgtk-3-0 \
+        libgtk2.0-0 \
+        libnotify-dev \
+        libnss3 \
+        libxss1 \
+        libxtst6 \
+        xauth \
+        xvfb \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN groupadd -r -g 1000 app \
+    && useradd -r -u 1000 -g app -m -d /home/app app
+USER app
+
+ENV SHELL=bash
+ENV PNPM_HOME="/home/app/.local/share/pnpm"
+ENV PATH="$PNPM_HOME:$PATH"
+
+RUN pnpm setup \
+    && pnpm install --global cypress@13.6.6 \
+    && cypress install
+
+WORKDIR /app
--- a/package.json
+++ b/package.json
@ -1,74 +1,74 @@
 {
-  "name": "salix-front",
-  "version": "25.06.0",
-  "description": "Salix frontend",
-  "productName": "Salix",
-  "author": "Verdnatura",
-  "private": true,
-  "packageManager": "pnpm@8.15.1",
-  "type": "module",
-  "scripts": {
-    "resetDatabase": "cd ../salix && gulp docker",
-    "lint": "eslint --ext .js,.vue ./",
-    "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
-    "test:e2e": "cypress open",
-    "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
-    "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
-    "test:unit": "vitest",
-    "test:unit:ci": "vitest run",
-    "commitlint": "commitlint --edit",
-    "prepare": "npx husky install",
-    "addReferenceTag": "node .husky/addReferenceTag.js",
-    "docs:dev": "vitepress dev docs",
-    "docs:build": "vitepress build docs",
-    "docs:preview": "vitepress preview docs"
-  },
-  "dependencies": {
-    "@quasar/cli": "^2.4.1",
-    "@quasar/extras": "^1.16.16",
-    "axios": "^1.4.0",
-    "chromium": "^3.0.3",
-    "croppie": "^2.6.5",
-    "moment": "^2.30.1",
-    "pinia": "^2.1.3",
-    "quasar": "^2.17.7",
-    "validator": "^13.9.0",
-    "vue": "^3.5.13",
-    "vue-i18n": "^9.3.0",
-    "vue-router": "^4.2.5"
-  },
-  "devDependencies": {
-    "@commitlint/cli": "^19.2.1",
-    "@commitlint/config-conventional": "^19.1.0",
-    "@intlify/unplugin-vue-i18n": "^0.8.2",
-    "@pinia/testing": "^0.1.2",
-    "@quasar/app-vite": "^2.0.8",
-    "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
-    "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
-    "@vue/test-utils": "^2.4.4",
-    "autoprefixer": "^10.4.14",
-    "cypress": "^13.6.6",
-    "cypress-mochawesome-reporter": "^3.8.2",
-    "eslint": "^9.18.0",
-    "eslint-config-prettier": "^10.0.1",
-    "eslint-plugin-cypress": "^4.1.0",
-    "eslint-plugin-vue": "^9.32.0",
-    "husky": "^8.0.0",
-    "postcss": "^8.4.23",
-    "prettier": "^3.4.2",
-    "sass": "^1.83.4",
-    "vitepress": "^1.6.3",
-    "vitest": "^0.34.0"
-  },
-  "engines": {
-    "node": "^20 || ^18 || ^16",
-    "npm": ">= 8.1.2",
-    "yarn": ">= 1.21.1",
-    "bun": ">= 1.0.25"
-  },
-  "overrides": {
-    "@vitejs/plugin-vue": "^5.2.1",
-    "vite": "^6.0.11",
-    "vitest": "^0.31.1"
-  }
-}
+    "name": "salix-front",
+    "version": "25.10.0",
+    "description": "Salix frontend",
+    "productName": "Salix",
+    "author": "Verdnatura",
+    "private": true,
+    "packageManager": "pnpm@8.15.1",
+    "type": "module",
+    "scripts": {
+        "resetDatabase": "cd ../salix && gulp docker",
+        "lint": "eslint --ext .js,.vue ./",
+        "format": "prettier --write \"**/*.{js,vue,scss,html,md,json}\" --ignore-path .gitignore",
+        "test:e2e": "cypress open",
+        "test:e2e:ci": "npm run resetDatabase && cd ../salix-front && cypress run",
+        "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
+        "test:unit": "vitest",
+        "test:unit:ci": "vitest run",
+        "commitlint": "commitlint --edit",
+        "prepare": "npx husky install",
+        "addReferenceTag": "node .husky/addReferenceTag.js",
+        "docs:dev": "vitepress dev docs",
+        "docs:build": "vitepress build docs",
+        "docs:preview": "vitepress preview docs"
+    },
+    "dependencies": {
+        "@quasar/cli": "^2.4.1",
+        "@quasar/extras": "^1.16.16",
+        "axios": "^1.4.0",
+        "chromium": "^3.0.3",
+        "croppie": "^2.6.5",
+        "moment": "^2.30.1",
+        "pinia": "^2.1.3",
+        "quasar": "^2.17.7",
+        "validator": "^13.9.0",
+        "vue": "^3.5.13",
+        "vue-i18n": "^9.3.0",
+        "vue-router": "^4.2.5"
+    },
+    "devDependencies": {
+        "@commitlint/cli": "^19.2.1",
+        "@commitlint/config-conventional": "^19.1.0",
+        "@intlify/unplugin-vue-i18n": "^0.8.2",
+        "@pinia/testing": "^0.1.2",
+        "@quasar/app-vite": "^2.0.8",
+        "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
+        "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
+        "@vue/test-utils": "^2.4.4",
+        "autoprefixer": "^10.4.14",
+        "cypress": "^13.6.6",
+        "cypress-mochawesome-reporter": "^3.8.2",
+        "eslint": "^9.18.0",
+        "eslint-config-prettier": "^10.0.1",
+        "eslint-plugin-cypress": "^4.1.0",
+        "eslint-plugin-vue": "^9.32.0",
+        "husky": "^8.0.0",
+        "postcss": "^8.4.23",
+        "prettier": "^3.4.2",
+        "sass": "^1.83.4",
+        "vitepress": "^1.6.3",
+        "vitest": "^0.34.0"
+    },
+    "engines": {
+        "node": "^20 || ^18 || ^16",
+        "npm": ">= 8.1.2",
+        "yarn": ">= 1.21.1",
+        "bun": ">= 1.0.25"
+    },
+    "overrides": {
+        "@vitejs/plugin-vue": "^5.2.1",
+        "vite": "^6.0.11",
+        "vitest": "^0.31.1"
+    }
+}
--- a/proxy-serve.js
+++ b/proxy-serve.js
@ -1,6 +1,6 @@
 export default [
    {
        path: '/api',
-        rule: { target: 'http://0.0.0.0:3000' },
+        rule: { target: 'http://127.0.0.1:3000' },
    },
 ];
--- a/quasar.config.js
+++ b/quasar.config.js
@ -11,6 +11,7 @@
 import { configure } from 'quasar/wrappers';
 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 */) {
    return {
@ -30,7 +31,6 @@ export default configure(function (/* ctx */) {
        // --> boot files are part of "main.js"
        // https://v2.quasar.dev/quasar-cli/boot-files
        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'],
-
        // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
        css: ['app.scss'],

@ -109,13 +109,17 @@ export default configure(function (/* ctx */) {
            },
            proxy: {
                '/api': {
-                    target: 'http://0.0.0.0:3000',
+                    target: target,
                    logLevel: 'debug',
                    changeOrigin: true,
                    secure: false,
                },
            },
            open: false,
+            allowedHosts: [
+                'front', // Agrega este nombre de host
+                'localhost', // Opcional, para pruebas locales
+            ],
        },

        // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#framework
--- a/src/boot/defaults/constants.js
+++ b/src/boot/defaults/constants.js
@ -0,0 +1,2 @@
+export const langs = ['en', 'es'];
+export const decimalPlaces = 2;
--- a/src/boot/keyShortcut.js
+++ b/src/boot/keyShortcut.js
@ -1,6 +1,6 @@
 export default {
-    mounted: function (el, binding) {
-        const shortcut = binding.value ?? '+';
+    mounted(el, binding) {
+        const shortcut = binding.value || '+';

        const { key, ctrl, alt, callback } =
            typeof shortcut === 'string'
@ -8,25 +8,24 @@ export default {
                      key: shortcut,
                      ctrl: true,
                      alt: true,
-                      callback: () =>
-                          document
-                              .querySelector(`button[shortcut="${shortcut}"]`)
-                              ?.click(),
+                      callback: () => el?.click(),
                  }
                : binding.value;

+        if (!el.hasAttribute('shortcut')) {
+            el.setAttribute('shortcut', key);
+        }
+
        const handleKeydown = (event) => {
            if (event.key === key && (!ctrl || event.ctrlKey) && (!alt || event.altKey)) {
                callback();
            }
        };

-        // Attach the event listener to the window
        window.addEventListener('keydown', handleKeydown);
-
        el._handleKeydown = handleKeydown;
    },
-    unmounted: function (el) {
+    unmounted(el) {
        if (el._handleKeydown) {
            window.removeEventListener('keydown', el._handleKeydown);
        }
--- a/src/boot/qformMixin.js
+++ b/src/boot/qformMixin.js
@ -9,19 +9,19 @@ export default {
        if (!form) return;
        try {
            const inputsFormCard = form.querySelectorAll(
-                `input:not([disabled]):not([type="checkbox"])`
+                `input:not([disabled]):not([type="checkbox"])`,
            );
            if (inputsFormCard.length) {
                focusFirstInput(inputsFormCard[0]);
            }
            const textareas = document.querySelectorAll(
-                'textarea:not([disabled]), [contenteditable]:not([disabled])'
+                'textarea:not([disabled]), [contenteditable]:not([disabled])',
            );
            if (textareas.length) {
                focusFirstInput(textareas[textareas.length - 1]);
            }
            const inputs = document.querySelectorAll(
-                'form#formModel input:not([disabled]):not([type="checkbox"])'
+                'form#formModel input:not([disabled]):not([type="checkbox"])',
            );
            const input = inputs[0];
            if (!input) return;
@ -30,22 +30,5 @@ export default {
        } catch (error) {
            console.error(error);
        }
-        form.addEventListener('keyup', function (evt) {
-            if (evt.key === 'Enter' && !that.$attrs['prevent-submit']) {
-                const input = evt.target;
-                if (input.type == 'textarea' && evt.shiftKey) {
-                    evt.preventDefault();
-                    let { selectionStart, selectionEnd } = input;
-                    input.value =
-                        input.value.substring(0, selectionStart) +
-                        '\n' +
-                        input.value.substring(selectionEnd);
-                    selectionStart = selectionEnd = selectionStart + 1;
-                    return;
-                }
-                evt.preventDefault();
-                that.onSubmit();
-            }
-        });
    },
 };
--- a/src/boot/quasar.js
+++ b/src/boot/quasar.js
@ -51,4 +51,5 @@ export default boot(({ app }) => {

        await useCau(response, message);
    };
+    app.provide('app', app);
 });
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@ -14,7 +14,7 @@ const { t } = useI18n();
 const bicInputRef = ref(null);
 const state = useState();

-const customer = computed(() => state.get('customer'));
+const customer = computed(() => state.get('Customer'));

 const countriesFilter = {
    fields: ['id', 'name', 'code'],
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@ -2,7 +2,6 @@
 import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';

-import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectProvince from 'src/components/VnSelectProvince.vue';
@ -21,14 +20,11 @@ const postcodeFormData = reactive({
    provinceFk: null,
    townFk: null,
 });
-const townsFetchDataRef = ref(false);
 const townFilter = ref({});

 const countriesRef = ref(false);
 const provincesOptions = ref([]);
-const townsOptions = ref([]);
 const town = ref({});
-const countryFilter = ref({});

 function onDataSaved(formData) {
    const newPostcode = {
@ -51,7 +47,6 @@ async function setCountry(countryFk, data) {
    data.townFk = null;
    data.provinceFk = null;
    data.countryFk = countryFk;
-    await fetchTowns();
 }

 // Province
@ -60,22 +55,11 @@ async function setProvince(id, data) {
    const newProvince = provincesOptions.value.find((province) => province.id == id);
    if (newProvince) data.countryFk = newProvince.countryFk;
    postcodeFormData.provinceFk = id;
-    await fetchTowns();
 }

 async function onProvinceCreated(data) {
    postcodeFormData.provinceFk = data.id;
 }
-function provinceByCountry(countryFk = postcodeFormData.countryFk) {
-    return provincesOptions.value
-        .filter((province) => province.countryFk === countryFk)
-        .map(({ id }) => id);
-}
-
-// Town
-async function handleTowns(data) {
-    townsOptions.value = data;
-}
 function setTown(newTown, data) {
    town.value = newTown;
    data.provinceFk = newTown?.provinceFk ?? newTown;
@ -88,18 +72,6 @@ async function onCityCreated(newTown, formData) {
    formData.townFk = newTown;
    setTown(newTown, formData);
 }
-async function fetchTowns(countryFk = postcodeFormData.countryFk) {
-    if (!countryFk) return;
-    const provinces = postcodeFormData.provinceFk
-        ? [postcodeFormData.provinceFk]
-        : provinceByCountry();
-    townFilter.value.where = {
-        provinceFk: {
-            inq: provinces,
-        },
-    };
-    await townsFetchDataRef.value?.fetch();
-}

 async function filterTowns(name) {
    if (name !== '') {
@ -108,22 +80,11 @@ async function filterTowns(name) {
                like: `%${name}%`,
            },
        };
-        await townsFetchDataRef.value?.fetch();
    }
 }
 </script>

 <template>
-    <FetchData
-        ref="townsFetchDataRef"
-        :sort-by="['name ASC']"
-        :limit="30"
-        :filter="townFilter"
-        @on-fetch="handleTowns"
-        auto-load
-        url="Towns/location"
-    />
-
    <FormModelPopup
        url-create="postcodes"
        model="postcode"
@ -149,14 +110,13 @@ async function filterTowns(name) {
                    @filter="filterTowns"
                    :tooltip="t('Create city')"
                    v-model="data.townFk"
-                    :options="townsOptions"
-                    option-label="name"
-                    option-value="id"
+                    url="Towns/location"
                    :rules="validate('postcode.city')"
                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                    :emit-value="false"
                    required
                    data-cy="locationTown"
+                    sort-by="name ASC"
                >
                    <template #option="{ itemProps, opt }">
                        <QItem v-bind="itemProps">
@ -197,16 +157,12 @@ async function filterTowns(name) {
                />
                <VnSelect
                    ref="countriesRef"
-                    :limit="30"
-                    :filter="countryFilter"
                    :sort-by="['name ASC']"
                    auto-load
                    url="Countries"
                    required
                    :label="t('Country')"
                    hide-selected
-                    option-label="name"
-                    option-value="id"
                    v-model="data.countryFk"
                    :rules="validate('postcode.countryFk')"
                    @update:model-value="(value) => setCountry(value, data)"
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@ -62,12 +62,9 @@ const where = computed(() => {
                    auto-load
                    :where="where"
                    url="Autonomies/location"
-                    :sort-by="['name ASC']"
-                    :limit="30"
+                    sort-by="name ASC"
                    :label="t('Autonomy')"
                    hide-selected
-                    option-label="name"
-                    option-value="id"
                    v-model="data.autonomyFk"
                    :rules="validate('province.autonomyFk')"
                >
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@ -64,6 +64,10 @@ const $props = defineProps({
        type: Function,
        default: null,
    },
+    beforeSaveFn: {
+        type: Function,
+        default: null,
+    },
    goTo: {
        type: String,
        default: '',
@ -176,7 +180,11 @@ async function saveChanges(data) {
        hasChanges.value = false;
        return;
    }
-    const changes = data || getChanges();
+    let changes = data || getChanges();
+    if ($props.beforeSaveFn) {
+        changes = await $props.beforeSaveFn(changes, getChanges);
+    }
+
    try {
        await axios.post($props.saveUrl || $props.url + '/crud', changes);
    } finally {
@ -229,12 +237,12 @@ async function remove(data) {
                componentProps: {
                    title: t('globals.confirmDeletion'),
                    message: t('globals.confirmDeletionMessage'),
-                    newData,
+                    data: { deletes: ids },
                    ids,
+                    promise: saveChanges,
                },
            })
            .onOk(async () => {
-                await saveChanges({ deletes: ids });
                newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
                fetch(newData);
            });
@ -374,6 +382,8 @@ watch(formUrl, async () => {
                @click="onSubmit"
                :disable="!hasChanges"
                :title="t('globals.save')"
+                v-shortcut="'s'"
+                shortcut="s"
                data-cy="crudModelDefaultSaveBtn"
            />
            <slot name="moreAfterActions" />
--- a/src/components/FilterItemForm.vue
+++ b/src/components/FilterItemForm.vue
@ -42,7 +42,6 @@ const itemFilter = {
 const itemFilterParams = reactive({});
 const closeButton = ref(null);
 const isLoading = ref(false);
-const producersOptions = ref([]);
 const ItemTypesOptions = ref([]);
 const InksOptions = ref([]);
 const tableRows = ref([]);
@ -121,23 +120,17 @@ const selectItem = ({ id }) => {
 </script>

 <template>
-    <FetchData
-        url="Producers"
-        @on-fetch="(data) => (producersOptions = data)"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-        auto-load
-    />
    <FetchData
        url="ItemTypes"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-        order="name"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        order="name ASC"
        @on-fetch="(data) => (ItemTypesOptions = data)"
        auto-load
    />
    <FetchData
        url="Inks"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-        order="name"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        order="name ASC"
        @on-fetch="(data) => (InksOptions = data)"
        auto-load
    />
@ -152,11 +145,11 @@ const selectItem = ({ id }) => {
                <VnInput :label="t('entry.buys.size')" v-model="itemFilterParams.size" />
                <VnSelect
                    :label="t('globals.producer')"
-                    :options="producersOptions"
                    hide-selected
-                    option-label="name"
-                    option-value="id"
                    v-model="itemFilterParams.producerFk"
+                    url="Producers"
+                    :fields="['id', 'name']"
+                    sort-by="name ASC"
                />
                <VnSelect
                    :label="t('globals.type')"
--- a/src/components/FilterTravelForm.vue
+++ b/src/components/FilterTravelForm.vue
@ -124,7 +124,7 @@ const selectTravel = ({ id }) => {
    <FetchData
        url="AgencyModes"
        @on-fetch="(data) => (agenciesOptions = data)"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
        auto-load
    />
    <FetchData
@ -181,6 +181,7 @@ const selectTravel = ({ id }) => {
                    color="primary"
                    :disabled="isLoading"
                    :loading="isLoading"
+                    data-cy="save-filter-travel-form"
                />
            </div>
            <QTable
@ -191,9 +192,10 @@ const selectTravel = ({ id }) => {
                :no-data-label="t('Enter a new search')"
                class="q-mt-lg"
                @row-click="(_, row) => selectTravel(row)"
+                data-cy="table-filter-travel-form"
            >
                <template #body-cell-id="{ row }">
-                    <QTd auto-width @click.stop>
+                    <QTd auto-width @click.stop data-cy="travelFk-travel-form">
                        <QBtn flat color="blue">{{ row.id }}</QBtn>
                        <TravelDescriptorProxy :id="row.id" />
                    </QTd>
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { onMounted, onUnmounted, computed, ref, watch, nextTick } from 'vue';
+import { onMounted, onUnmounted, computed, ref, watch, nextTick, useAttrs } from 'vue';
 import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@ -12,6 +12,7 @@ import SkeletonForm from 'components/ui/SkeletonForm.vue';
 import VnConfirm from './ui/VnConfirm.vue';
 import { tMobile } from 'src/composables/tMobile';
 import { useArrayData } from 'src/composables/useArrayData';
+import { getDifferences, getUpdatedValues } from 'src/filters';

 const { push } = useRouter();
 const quasar = useQuasar();
@ -22,6 +23,7 @@ const { validate } = useValidator();
 const { notify } = useNotify();
 const route = useRoute();
 const myForm = ref(null);
+const attrs = useAttrs();
 const $props = defineProps({
    url: {
        type: String,
@ -84,7 +86,7 @@ const $props = defineProps({
    },
    reload: {
        type: Boolean,
-        default: false,
+        default: true,
    },
    defaultTrim: {
        type: Boolean,
@ -97,7 +99,7 @@ const $props = defineProps({
 });
 const emit = defineEmits(['onFetch', 'onDataSaved']);
 const modelValue = computed(
-    () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`
+    () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
 ).value;
 const componentIsRendered = ref(false);
 const arrayData = useArrayData(modelValue);
@ -105,15 +107,15 @@ const isLoading = ref(false);
 // Si elegimos observar los cambios del form significa que inicialmente las actions estaran deshabilitadas
 const isResetting = ref(false);
 const hasChanges = ref(!$props.observeFormChanges);
-const originalData = ref({});
-const formData = computed(() => state.get(modelValue));
+const originalData = computed(() => state.get(modelValue));
+const formData = ref();
 const defaultButtons = computed(() => ({
    save: {
        dataCy: 'saveDefaultBtn',
        color: 'primary',
        icon: 'save',
        label: 'globals.save',
-        click: () => myForm.value.submit(),
+        click: async () => await save(),
        type: 'submit',
    },
    reset: {
@ -127,8 +129,6 @@ const defaultButtons = computed(() => ({
 }));

 onMounted(async () => {
-    originalData.value = JSON.parse(JSON.stringify($props.formInitialData ?? {}));
-
    nextTick(() => (componentIsRendered.value = true));

    // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
@ -136,7 +136,8 @@ onMounted(async () => {

    if (!$props.formInitialData) {
        if ($props.autoLoad && $props.url) await fetch();
-        else if (arrayData.store.data) updateAndEmit('onFetch', arrayData.store.data);
+        else if (arrayData.store.data)
+            updateAndEmit('onFetch', { val: arrayData.store.data });
    }
    if ($props.observeFormChanges) {
        watch(
@ -148,7 +149,7 @@ onMounted(async () => {
                    JSON.stringify(newVal) !== JSON.stringify(originalData.value);
                isResetting.value = false;
            },
-            { deep: true }
+            { deep: true },
        );
    }
 });
@ -156,16 +157,24 @@ onMounted(async () => {
 if (!$props.url)
    watch(
        () => arrayData.store.data,
-        (val) => updateAndEmit('onFetch', val)
+        (val) => updateAndEmit('onFetch', { val }),
    );

+watch(
+    originalData,
+    (val) => {
+        if (val) formData.value = JSON.parse(JSON.stringify(val));
+    },
+    { immediate: true },
+);
+
 watch(
    () => [$props.url, $props.filter],
    async () => {
-        originalData.value = null;
+        state.set(modelValue, null);
        reset();
        await fetch();
-    }
+    },
 );

 onBeforeRouteLeave((to, from, next) => {
@ -194,10 +203,9 @@ async function fetch() {
        });
        if (Array.isArray(data)) data = data[0] ?? {};

-        updateAndEmit('onFetch', data);
+        updateAndEmit('onFetch', { val: data });
    } catch (e) {
        state.set(modelValue, {});
-        originalData.value = {};
        throw e;
    }
 }
@ -222,7 +230,11 @@ async function save() {

        if ($props.urlCreate) notify('globals.dataCreated', 'positive');

-        updateAndEmit('onDataSaved', formData.value, response?.data);
+        updateAndEmit('onDataSaved', {
+            val: formData.value,
+            res: response?.data,
+            old: originalData.value,
+        });
        if ($props.reload) await arrayData.fetch({});
        hasChanges.value = false;
    } finally {
@ -236,7 +248,8 @@ async function saveAndGo() {
 }

 function reset() {
-    updateAndEmit('onFetch', originalData.value);
+    formData.value = JSON.parse(JSON.stringify(originalData.value));
+    updateAndEmit('onFetch', { val: originalData.value });
    if ($props.observeFormChanges) {
        hasChanges.value = false;
        isResetting.value = true;
@ -254,16 +267,15 @@ function filter(value, update, filterOptions) {
        (ref) => {
            ref.setOptionIndex(-1);
            ref.moveOptionSelection(1, true);
-        }
+        },
    );
 }

-function updateAndEmit(evt, val, res) {
+function updateAndEmit(evt, { val, res, old } = { val: null, res: null, old: null }) {
    state.set(modelValue, val);
-    originalData.value = val && JSON.parse(JSON.stringify(val));
    if (!$props.url) arrayData.store.data = val;

-    emit(evt, state.get(modelValue), res);
+    emit(evt, state.get(modelValue), res, old);
 }

 function trimData(data) {
@ -273,6 +285,27 @@ function trimData(data) {
    }
    return data;
 }
+function onBeforeSave(formData, originalData) {
+    return getUpdatedValues(
+        Object.keys(getDifferences(formData, originalData)),
+        formData,
+    );
+}
+async function onKeyup(evt) {
+    if (evt.key === 'Enter' && !('prevent-submit' in attrs)) {
+        const input = evt.target;
+        if (input.type == 'textarea' && evt.shiftKey) {
+            let { selectionStart, selectionEnd } = input;
+            input.value =
+                input.value.substring(0, selectionStart) +
+                '\n' +
+                input.value.substring(selectionEnd);
+            selectionStart = selectionEnd = selectionStart + 1;
+            return;
+        }
+        await save();
+    }
+}

 defineExpose({
    save,
@ -288,12 +321,13 @@ defineExpose({
        <QForm
            ref="myForm"
            v-if="formData"
-            @submit="save"
+            @submit.prevent
+            @keyup.prevent="onKeyup"
            @reset="reset"
            class="q-pa-md"
            :style="maxWidth ? 'max-width: ' + maxWidth : ''"
            id="formModel"
-            :prevent-submit="$attrs['prevent-submit']"
+            :mapper="onBeforeSave"
        >
            <QCard>
                <slot
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@ -15,23 +15,35 @@ defineProps({
        type: String,
        default: '',
    },
+    showSaveAndContinueBtn: {
+        type: Boolean,
+        default: false,
+    },
 });

 const { t } = useI18n();

 const formModelRef = ref(null);
 const closeButton = ref(null);
-
+const isSaveAndContinue = ref(false);
 const onDataSaved = (formData, requestResponse) => {
-    if (closeButton.value) closeButton.value.click();
+    if (closeButton.value && !isSaveAndContinue.value) closeButton.value.click();
    emit('onDataSaved', formData, requestResponse);
 };

+const onClick = async (saveAndContinue) => {
+    isSaveAndContinue.value = saveAndContinue;
+    await formModelRef.value.save();
+};
+
 const isLoading = computed(() => formModelRef.value?.isLoading);
+const reset = computed(() => formModelRef.value?.reset);

 defineExpose({
    isLoading,
    onDataSaved,
+    isSaveAndContinue,
+    reset,
 });
 </script>

@ -59,15 +71,19 @@ defineExpose({
                    flat
                    :disabled="isLoading"
                    :loading="isLoading"
-                    @click="emit('onDataCanceled')"
-                    v-close-popup
                    data-cy="FormModelPopup_cancel"
+                    v-close-popup
                    z-max
+                    @click="
+                        isSaveAndContinue = false;
+                        emit('onDataCanceled');
+                    "
                />
                <QBtn
+                    :flat="showSaveAndContinueBtn"
                    :label="t('globals.save')"
                    :title="t('globals.save')"
-                    type="submit"
+                    @click="onClick(false)"
                    color="primary"
                    class="q-ml-sm"
                    :disabled="isLoading"
@ -75,6 +91,18 @@ defineExpose({
                    data-cy="FormModelPopup_save"
                    z-max
                />
+                <QBtn
+                    v-if="showSaveAndContinueBtn"
+                    :label="t('globals.isSaveAndContinue')"
+                    :title="t('globals.isSaveAndContinue')"
+                    color="primary"
+                    class="q-ml-sm"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                    data-cy="FormModelPopup_isSaveAndContinue"
+                    z-max
+                    @click="onClick(true)"
+                />
            </div>
        </template>
    </FormModel>
--- a/src/components/ItemsFilterPanel.vue
+++ b/src/components/ItemsFilterPanel.vue
@ -121,23 +121,25 @@ const removeTag = (index, params, search) => {
    applyTags(params, search);
 };
 const setCategoryList = (data) => {
-    categoryList.value = (data || [])
-        .filter((category) => category.display)
-        .map((category) => ({
-            ...category,
-            icon: `vn:${(category.icon || '').split('-')[1]}`,
-        }));
+    categoryList.value = (data || []).map((category) => ({
+        ...category,
+        icon: `vn:${(category.icon || '').split('-')[1]}`,
+    }));
    fetchItemTypes();
 };
 </script>

 <template>
-    <FetchData url="ItemCategories" limit="30" auto-load @on-fetch="setCategoryList" />
+    <FetchData
+        url="ItemCategories"
+        auto-load
+        @on-fetch="setCategoryList"
+        :where="{ display: { neq: 0 } }"
+    />
    <FetchData
        url="Tags"
        :filter="{ fields: ['id', 'name', 'isFree'] }"
        auto-load
-        limit="30"
        @on-fetch="(data) => (tagOptions = data)"
    />
    <VnFilterPanel
@ -195,8 +197,6 @@ const setCategoryList = (data) => {
                        :label="t('components.itemsFilterPanel.typeFk')"
                        v-model="params.typeFk"
                        :options="itemTypesOptions"
-                        option-value="id"
-                        option-label="name"
                        dense
                        outlined
                        rounded
@ -234,7 +234,6 @@ const setCategoryList = (data) => {
                        :label="t('globals.tag')"
                        v-model="value.selectedTag"
                        :options="tagOptions"
-                        option-label="name"
                        dense
                        outlined
                        rounded
@ -282,7 +281,7 @@ const setCategoryList = (data) => {
            <QItem class="q-mt-lg">
                <QBtn
                    icon="add_circle"
-                    shortcut="+"
+                    v-shortcut="'+'"
                    flat
                    class="fill-icon-on-hover q-px-xs"
                    color="primary"
@ -328,7 +327,6 @@ en:
        active: Is active
        visible: Is visible
        floramondo: Is floramondo
-        salesPersonFk: Buyer
        categoryFk: Category

 es:
@ -339,7 +337,6 @@ es:
        active: Activo
        visible: Visible
        floramondo: Floramondo
-        salesPersonFk: Comprador
        categoryFk: Categoría
    Plant: Planta natural
    Flower: Flor fresca
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@ -41,7 +41,6 @@ const filteredItems = computed(() => {
        return locale.includes(normalizedSearch);
    });
 });
-
 const filteredPinnedModules = computed(() => {
    if (!search.value) return pinnedModules.value;
    const normalizedSearch = search.value
@ -72,7 +71,7 @@ watch(
        items.value = [];
        getRoutes();
    },
-    { deep: true }
+    { deep: true },
 );

 function findMatches(search, item) {
@ -104,33 +103,40 @@ function addChildren(module, route, parent) {
 }

 function getRoutes() {
-    if (props.source === 'main') {
-        const modules = Object.assign([], navigation.getModules().value);
-
-        for (const item of modules) {
-            const moduleDef = routes.find(
-                (route) => toLowerCamel(route.name) === item.module
-            );
-            if (!moduleDef) continue;
-            item.children = [];
-
-            addChildren(item.module, moduleDef, item.children);
-        }
-
-        items.value = modules;
+    const handleRoutes = {
+        main: getMainRoutes,
+        card: getCardRoutes,
+    };
+    try {
+        handleRoutes[props.source]();
+    } catch (error) {
+        throw new Error(`Method is not defined`);
    }
+}
+function getMainRoutes() {
+    const modules = Object.assign([], navigation.getModules().value);

-    if (props.source === 'card') {
-        const currentRoute = route.matched[1];
-        const currentModule = toLowerCamel(currentRoute.name);
-        let moduleDef = routes.find(
-            (route) => toLowerCamel(route.name) === currentModule
+    for (const item of modules) {
+        const moduleDef = routes.find(
+            (route) => toLowerCamel(route.name) === item.module,
        );
+        if (!moduleDef) continue;
+        item.children = [];

-        if (!moduleDef) return;
-        if (!moduleDef?.menus) moduleDef = betaGetRoutes();
-        addChildren(currentModule, moduleDef, items.value);
+        addChildren(item.module, moduleDef, item.children);
    }
+
+    items.value = modules;
+}
+
+function getCardRoutes() {
+    const currentRoute = route.matched[1];
+    const currentModule = toLowerCamel(currentRoute.name);
+    let moduleDef = routes.find((route) => toLowerCamel(route.name) === currentModule);
+
+    if (!moduleDef) return;
+    if (!moduleDef?.menus) moduleDef = betaGetRoutes();
+    addChildren(currentModule, moduleDef, items.value);
 }

 function betaGetRoutes() {
@ -223,9 +229,16 @@ const searchModule = () => {
                </template>
                <template v-for="(item, index) in filteredItems" :key="item.name">
                    <template
-                        v-if="search ||item.children && !filteredPinnedModules.has(item.name)"
+                        v-if="
+                            search ||
+                            (item.children && !filteredPinnedModules.has(item.name))
+                        "
                    >
-                        <LeftMenuItem :item="item" group="modules" :class="search && index === 0 ? 'searched' : ''">
+                        <LeftMenuItem
+                            :item="item"
+                            group="modules"
+                            :class="search && index === 0 ? 'searched' : ''"
+                        >
                            <template #side>
                                <QBtn
                                    v-if="item.isPinned === true"
@ -342,7 +355,7 @@ const searchModule = () => {
 .header {
    color: var(--vn-label-color);
 }
-.searched{
+.searched {
    background-color: var(--vn-section-hover-color);
 }
 </style>
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@ -26,6 +26,7 @@ const itemComputed = computed(() => {
        :to="{ name: itemComputed.name }"
        clickable
        v-ripple
+        :data-cy="`${itemComputed.name}-menu-item`"
    >
        <QItemSection avatar v-if="itemComputed.icon">
            <QIcon :name="itemComputed.icon" />
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@ -85,7 +85,15 @@ const refresh = () => window.location.reload();
                    </QTooltip>
                    <PinnedModules ref="pinnedModulesRef" />
                </QBtn>
-                <QBtn class="q-pa-none" rounded dense flat no-wrap id="user">
+                <QBtn
+                    class="q-pa-none"
+                    rounded
+                    dense
+                    flat
+                    no-wrap
+                    id="user"
+                    data-cy="userPanel_btn"
+                >
                    <VnAvatar
                        :worker-id="user.id"
                        :title="user.name"
--- a/src/components/RefundInvoiceForm.vue
+++ b/src/components/RefundInvoiceForm.vue
@ -9,6 +9,7 @@ import VnSelect from 'components/common/VnSelect.vue';
 import FormPopup from './FormPopup.vue';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
+import VnCheckbox from 'src/components/common/VnCheckbox.vue';

 const $props = defineProps({
    invoiceOutData: {
@ -131,15 +132,11 @@ const refund = async () => {
                        :required="true"
                    /> </VnRow
                ><VnRow>
-                    <div>
-                        <QCheckbox
-                            :label="t('Inherit warehouse')"
-                            v-model="invoiceParams.inheritWarehouse"
-                        />
-                        <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
-                            <QTooltip>{{ t('Inherit warehouse tooltip') }}</QTooltip>
-                        </QIcon>
-                    </div>
+                    <VnCheckbox
+                        v-model="invoiceParams.inheritWarehouse"
+                        :label="t('Inherit warehouse')"
+                        :info="t('Inherit warehouse tooltip')"
+                    />
                </VnRow>
            </template>
        </FormPopup>
--- a/src/components/TicketProblems.vue
+++ b/src/components/TicketProblems.vue
@ -1,39 +1,84 @@
 <script setup>
+import { toCurrency } from 'src/filters';
+
 defineProps({ row: { type: Object, required: true } });
 </script>
 <template>
-    <span>
+    <span class="q-gutter-x-xs">
+        <router-link
+            v-if="row.claim?.claimFk"
+            :to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
+            class="link"
+        >
+            <QIcon name="vn:claims" size="xs">
+                <QTooltip>
+                    {{ t('ticketSale.claim') }}:
+                    {{ row.claim?.claimFk }}
+                </QTooltip>
+            </QIcon>
+        </router-link>
        <QIcon
-            v-if="row.isTaxDataChecked === 0"
+            v-if="row?.risk"
+            name="vn:risk"
+            :color="row.hasHighRisk ? 'negative' : 'primary'"
+            size="xs"
+        >
+            <QTooltip>
+                {{ $t('salesTicketsTable.risk') }}:
+                {{ toCurrency(row.risk - row.credit) }}
+            </QTooltip>
+        </QIcon>
+        <QIcon
+            v-if="row?.hasComponentLack"
+            name="vn:components"
+            color="primary"
+            size="xs"
+        >
+            <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row?.hasItemDelay" color="primary" size="xs" name="vn:hasItemDelay">
+            <QTooltip>
+                {{ $t('ticket.summary.hasItemDelay') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon v-if="row?.hasItemLost" color="primary" size="xs" name="vn:hasItemLost">
+            <QTooltip>
+                {{ $t('salesTicketsTable.hasItemLost') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon
+            v-if="row?.hasItemShortage"
+            name="vn:unavailable"
+            color="primary"
+            size="xs"
+        >
+            <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row?.hasRounding" color="primary" name="sync_problem" size="xs">
+            <QTooltip>
+                {{ $t('ticketList.rounding') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon
+            v-if="row?.hasTicketRequest"
+            name="vn:buyrequest"
+            color="primary"
+            size="xs"
+        >
+            <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
+        </QIcon>
+        <QIcon
+            v-if="row?.isTaxDataChecked !== 0"
            name="vn:no036"
            color="primary"
            size="xs"
        >
            <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
        </QIcon>
-        <QIcon v-if="row.hasTicketRequest" name="vn:buyrequest" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.itemShortage" name="vn:unavailable" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.isFreezed" name="vn:frozen" color="primary" size="xs">
+        <QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs">
            <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
        </QIcon>
-        <QIcon
-            v-if="row.risk"
-            name="vn:risk"
-            :color="row.hasHighRisk ? 'negative' : 'primary'"
-            size="xs"
-        >
-            <QTooltip>
-                {{ $t('salesTicketsTable.risk') }}: {{ row.risk - row.credit }}
-            </QTooltip>
-        </QIcon>
-        <QIcon v-if="row.hasComponentLack" name="vn:components" color="primary" size="xs">
-            <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
-        </QIcon>
-        <QIcon v-if="row.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
+        <QIcon v-if="row?.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
            <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
        </QIcon>
    </span>
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@ -10,6 +10,7 @@ import VnSelect from 'components/common/VnSelect.vue';
 import FormPopup from './FormPopup.vue';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
+import VnCheckbox from './common/VnCheckbox.vue';

 const $props = defineProps({
    invoiceOutData: {
@ -186,15 +187,11 @@ const makeInvoice = async () => {
                    />
                </VnRow>
                <VnRow>
-                    <div>
-                        <QCheckbox
-                            :label="t('Bill destination client')"
-                            v-model="checked"
-                        />
-                        <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
-                            <QTooltip>{{ t('transferInvoiceInfo') }}</QTooltip>
-                        </QIcon>
-                    </div>
+                    <VnCheckbox
+                        v-model="checked"
+                        :label="t('Bill destination client')"
+                        :info="t('transferInvoiceInfo')"
+                    />
                </VnRow>
            </template>
        </FormPopup>
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@ -1,9 +1,8 @@
 <script setup>
 import { markRaw, computed } from 'vue';
-import { QIcon, QCheckbox } from 'quasar';
+import { QIcon, QToggle } from 'quasar';
 import { dashIfEmpty } from 'src/filters';

-/* basic input */
 import VnSelect from 'components/common/VnSelect.vue';
 import VnSelectCache from 'components/common/VnSelectCache.vue';
 import VnInput from 'components/common/VnInput.vue';
@ -12,8 +11,11 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 import VnComponent from 'components/common/VnComponent.vue';
 import VnUserLink from 'components/ui/VnUserLink.vue';
+import VnSelectEnum from '../common/VnSelectEnum.vue';
+import VnCheckbox from '../common/VnCheckbox.vue';

 const model = defineModel(undefined, { required: true });
+const emit = defineEmits(['blur']);
 const $props = defineProps({
    column: {
        type: Object,
@ -39,10 +41,18 @@ const $props = defineProps({
        type: Object,
        default: null,
    },
+    autofocus: {
+        type: Boolean,
+        default: false,
+    },
    showLabel: {
        type: Boolean,
        default: null,
    },
+    eventHandlers: {
+        type: Object,
+        default: null,
+    },
 });

 const defaultSelect = {
@ -99,7 +109,8 @@ const defaultComponents = {
        },
    },
    checkbox: {
-        component: markRaw(QCheckbox),
+        ref: 'checkbox',
+        component: markRaw(VnCheckbox),
        attrs: ({ model }) => {
            const defaultAttrs = {
                disable: !$props.isEditable,
@ -115,6 +126,10 @@ const defaultComponents = {
        },
        forceAttrs: {
            label: $props.showLabel && $props.column.label,
+            autofocus: true,
+        },
+        events: {
+            blur: () => emit('blur'),
        },
    },
    select: {
@ -125,12 +140,19 @@ const defaultComponents = {
        component: markRaw(VnSelect),
        ...defaultSelect,
    },
+    selectEnum: {
+        component: markRaw(VnSelectEnum),
+        ...defaultSelect,
+    },
    icon: {
        component: markRaw(QIcon),
    },
    userLink: {
        component: markRaw(VnUserLink),
    },
+    toggle: {
+        component: markRaw(QToggle),
+    },
 };

 const value = computed(() => {
@ -160,7 +182,28 @@ const col = computed(() => {
    return newColumn;
 });

-const components = computed(() => $props.components ?? defaultComponents);
+const components = computed(() => {
+    const sourceComponents = $props.components ?? defaultComponents;
+
+    return Object.keys(sourceComponents).reduce((acc, key) => {
+        const component = sourceComponents[key];
+
+        if (!component || typeof component !== 'object') {
+            acc[key] = component;
+            return acc;
+        }
+
+        acc[key] = {
+            ...component,
+            attrs: {
+                ...(component.attrs || {}),
+                autofocus: $props.autofocus,
+            },
+            event: { ...component?.event, ...$props?.eventHandlers },
+        };
+        return acc;
+    }, {});
+});
 </script>
 <template>
    <div class="row no-wrap">
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@ -1,14 +1,12 @@
 <script setup>
 import { markRaw, computed } from 'vue';
-import { QCheckbox } from 'quasar';
+import { QCheckbox, QToggle } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
-
-/* basic input */
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
-import VnTableColumn from 'components/VnTable/VnColumn.vue';
+import VnColumn from 'components/VnTable/VnColumn.vue';

 const $props = defineProps({
    column: {
@ -27,6 +25,10 @@ const $props = defineProps({
        type: String,
        default: 'table',
    },
+    customClass: {
+        type: String,
+        default: '',
+    },
 });

 defineExpose({ addFilter, props: $props });
@ -34,7 +36,7 @@ defineExpose({ addFilter, props: $props });
 const model = defineModel(undefined, { required: true });
 const arrayData = useArrayData(
    $props.dataKey,
-    $props.searchUrl ? { searchUrl: $props.searchUrl } : null
+    $props.searchUrl ? { searchUrl: $props.searchUrl } : null,
 );
 const columnFilter = computed(() => $props.column?.columnFilter);

@ -46,19 +48,18 @@ const enterEvent = {

 const defaultAttrs = {
    filled: !$props.showTitle,
-    class: 'q-px-xs q-pb-xs q-pt-none fit',
    dense: true,
 };

 const forceAttrs = {
-    label: $props.showTitle ? '' : columnFilter.value?.label ?? $props.column.label,
+    label: $props.showTitle ? '' : (columnFilter.value?.label ?? $props.column.label),
 };

 const selectComponent = {
    component: markRaw(VnSelect),
    event: updateEvent,
    attrs: {
-        class: 'q-px-sm q-pb-xs q-pt-none fit',
+        class: `q-pt-none fit ${$props.customClass}`,
        dense: true,
        filled: !$props.showTitle,
    },
@ -109,14 +110,24 @@ const components = {
        component: markRaw(QCheckbox),
        event: updateEvent,
        attrs: {
-            dense: true,
-            class: $props.showTitle ? 'q-py-sm q-mt-md' : 'q-px-md q-py-xs fit',
+            class: $props.showTitle ? 'q-py-sm' : 'q-px-md q-py-xs fit',
            'toggle-indeterminate': true,
+            size: 'sm',
        },
        forceAttrs,
    },
    select: selectComponent,
    rawSelect: selectComponent,
+    toggle: {
+        component: markRaw(QToggle),
+        event: updateEvent,
+        attrs: {
+            class: $props.showTitle ? 'q-py-sm' : 'q-px-md q-py-xs fit',
+            'toggle-indeterminate': true,
+            size: 'sm',
+        },
+        forceAttrs,
+    },
 };

 async function addFilter(value, name) {
@ -132,19 +143,8 @@ async function addFilter(value, name) {
    await arrayData.addFilter({ params: { [field]: value } });
 }

-function alignRow() {
-    switch ($props.column.align) {
-        case 'left':
-            return 'justify-start items-start';
-        case 'right':
-            return 'justify-end items-end';
-        default:
-            return 'flex-center';
-    }
-}
-
 const showFilter = computed(
-    () => $props.column?.columnFilter !== false && $props.column.name != 'tableActions'
+    () => $props.column?.columnFilter !== false && $props.column.name != 'tableActions',
 );

 const onTabPressed = async () => {
@ -152,13 +152,8 @@ const onTabPressed = async () => {
 };
 </script>
 <template>
-    <div
-        v-if="showFilter"
-        class="full-width"
-        :class="alignRow()"
-        style="max-height: 45px; overflow: hidden"
-    >
-        <VnTableColumn
+    <div v-if="showFilter" class="full-width" style="overflow: hidden">
+        <VnColumn
            :column="$props.column"
            default="input"
            v-model="model"
@ -168,3 +163,8 @@ const onTabPressed = async () => {
        />
    </div>
 </template>
+<style lang="scss" scoped>
+label.vn-label-padding > .q-field__inner > .q-field__control {
+    padding: inherit !important;
+}
+</style>
--- a/src/components/VnTable/VnOrder.vue
+++ b/src/components/VnTable/VnOrder.vue
@ -23,6 +23,10 @@ const $props = defineProps({
        type: Boolean,
        default: false,
    },
+    align: {
+        type: String,
+        default: 'end',
+    },
 });
 const hover = ref();
 const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
@ -41,55 +45,78 @@ async function orderBy(name, direction) {
            break;
    }
    if (!direction) return await arrayData.deleteOrder(name);
+
    await arrayData.addOrder(name, direction);
 }

 defineExpose({ orderBy });
+
+function textAlignToFlex(textAlign) {
+    return `justify-content: ${
+        {
+            'text-center': 'center',
+            'text-left': 'start',
+            'text-right': 'end',
+        }[textAlign] || 'start'
+    };`;
+}
 </script>
 <template>
    <div
        @mouseenter="hover = true"
        @mouseleave="hover = false"
        @click="orderBy(name, model?.direction)"
-        class="row items-center no-wrap cursor-pointer"
+        class="items-center no-wrap cursor-pointer title"
+        :style="textAlignToFlex(align)"
    >
        <span :title="label">{{ label }}</span>
-        <QChip
-            v-if="name"
-            :label="!vertical ? model?.index : ''"
-            :icon="
-                (model?.index || hover) && !vertical
-                    ? model?.direction == 'DESC'
-                        ? 'arrow_downward'
-                        : 'arrow_upward'
-                    : undefined
-            "
-            :size="vertical ? '' : 'sm'"
-            :class="[
-                model?.index ? 'color-vn-text' : 'bg-transparent',
-                vertical ? 'q-px-none' : '',
-            ]"
-            class="no-box-shadow"
-            :clickable="true"
-            style="min-width: 40px"
-        >
-            <div
-                class="column flex-center"
-                v-if="vertical"
-                :style="!model?.index && 'color: #5d5d5d'"
+        <div v-if="name && model?.index">
+            <QChip
+                :label="!vertical ? model?.index : ''"
+                :icon="
+                    (model?.index || hover) && !vertical
+                        ? model?.direction == 'DESC'
+                            ? 'arrow_downward'
+                            : 'arrow_upward'
+                        : undefined
+                "
+                :size="vertical ? '' : 'sm'"
+                :class="[
+                    model?.index ? 'color-vn-text' : 'bg-transparent',
+                    vertical ? 'q-px-none' : '',
+                ]"
+                class="no-box-shadow"
+                :clickable="true"
+                style="min-width: 40px; max-height: 30px"
            >
-                {{ model?.index }}
-                <QIcon
-                    :name="
-                        model?.index
-                            ? model?.direction == 'DESC'
-                                ? 'arrow_downward'
-                                : 'arrow_upward'
-                            : 'swap_vert'
-                    "
-                    size="xs"
-                />
-            </div>
-        </QChip>
+                <div
+                    class="column flex-center"
+                    v-if="vertical"
+                    :style="!model?.index && 'color: #5d5d5d'"
+                >
+                    {{ model?.index }}
+                    <QIcon
+                        :name="
+                            model?.index
+                                ? model?.direction == 'DESC'
+                                    ? 'arrow_downward'
+                                    : 'arrow_upward'
+                                : 'swap_vert'
+                        "
+                        size="xs"
+                    />
+                </div>
+            </QChip>
+        </div>
    </div>
 </template>
+<style lang="scss" scoped>
+.title {
+    display: flex;
+    align-items: center;
+    height: 30px;
+    width: 100%;
+    color: var(--vn-label-color);
+    white-space: nowrap;
+}
+</style>
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@ -1,22 +1,38 @@
 <script setup>
-import { ref, onBeforeMount, onMounted, computed, watch, useAttrs } from 'vue';
+import {
+    ref,
+    onBeforeMount,
+    onMounted,
+    onUnmounted,
+    computed,
+    watch,
+    h,
+    render,
+    inject,
+    useAttrs,
+    nextTick,
+} from 'vue';
+import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-import { useQuasar } from 'quasar';
+import { useQuasar, date } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
 import { useFilterParams } from 'src/composables/useFilterParams';
+import { dashIfEmpty, toDate } from 'src/filters';

 import CrudModel from 'src/components/CrudModel.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';

-import VnTableColumn from 'components/VnTable/VnColumn.vue';
+import VnColumn from 'components/VnTable/VnColumn.vue';
 import VnFilter from 'components/VnTable/VnFilter.vue';
 import VnTableChip from 'components/VnTable/VnChip.vue';
 import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
 import VnTableFilter from './VnTableFilter.vue';
+import { getColAlign } from 'src/composables/getColAlign';

+const arrayData = useArrayData(useAttrs()['data-key']);
 const $props = defineProps({
    columns: {
        type: Array,
@ -42,10 +58,6 @@ const $props = defineProps({
        type: [Function, Boolean],
        default: null,
    },
-    rowCtrlClick: {
-        type: [Function, Boolean],
-        default: null,
-    },
    redirect: {
        type: String,
        default: null,
@ -114,7 +126,19 @@ const $props = defineProps({
        type: Boolean,
        default: false,
    },
+    withFilters: {
+        type: Boolean,
+        default: true,
+    },
+    overlay: {
+        type: Boolean,
+        default: false,
+    },
+    createComplement: {
+        type: Object,
+    },
 });
+
 const { t } = useI18n();
 const stateStore = useStateStore();
 const route = useRoute();
@ -132,10 +156,17 @@ const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
 const columnsVisibilitySkipped = ref();
 const createForm = ref();
+const createRef = ref(null);
 const tableRef = ref();
 const params = ref(useFilterParams($attrs['data-key']).params);
 const orders = ref(useFilterParams($attrs['data-key']).orders);
+const app = inject('app');

+const editingRow = ref(null);
+const editingField = ref(null);
+const isTableMode = computed(() => mode.value == TABLE_MODE);
+const selectRegex = /select/;
+const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
 const tableModes = [
    {
        icon: 'view_column',
@ -156,7 +187,8 @@ onBeforeMount(() => {
    hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
 });

-onMounted(() => {
+onMounted(async () => {
+    if ($props.isEditable) document.addEventListener('click', clickHandler);
    mode.value =
        quasar.platform.is.mobile && !$props.disableOption?.card
            ? CARD_MODE
@ -178,14 +210,25 @@ onMounted(() => {
    }
 });

+onUnmounted(async () => {
+    if ($props.isEditable) document.removeEventListener('click', clickHandler);
+});
+
 watch(
    () => $props.columns,
    (value) => splitColumns(value),
    { immediate: true },
 );

-const isTableMode = computed(() => mode.value == TABLE_MODE);
-const showRightIcon = computed(() => $props.rightSearch || $props.rightSearchIcon);
+defineExpose({
+    create: createForm,
+    reload,
+    redirect: redirectFn,
+    selected,
+    CrudModelRef,
+    params,
+    tableRef,
+});

 function splitColumns(columns) {
    splittedColumns.value = {
@ -231,16 +274,6 @@ const rowClickFunction = computed(() => {
    return () => {};
 });

-const rowCtrlClickFunction = computed(() => {
-    if ($props.rowCtrlClick != undefined) return $props.rowCtrlClick;
-    if ($props.redirect)
-        return (evt, { id }) => {
-            stopEventPropagation(evt);
-            window.open(`/#/${$props.redirect}/${id}`, '_blank');
-        };
-    return () => {};
-});
-
 function redirectFn(id) {
    router.push({ path: `/${$props.redirect}/${id}` });
 }
@ -262,21 +295,6 @@ function columnName(col) {
    return name;
 }

-function getColAlign(col) {
-    return 'text-' + (col.align ?? 'left');
-}
-
-const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
-defineExpose({
-    create: createForm,
-    reload,
-    redirect: redirectFn,
-    selected,
-    CrudModelRef,
-    params,
-    tableRef,
-});
-
 function handleOnDataSaved(_) {
    if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
    else $props.create.onDataSaved(_);
@ -305,6 +323,237 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
    }
 }

+function isEditableColumn(column) {
+    const isEditableCol = column?.isEditable ?? true;
+    const isVisible = column?.visible ?? true;
+    const hasComponent = column?.component;
+
+    return $props.isEditable && isVisible && hasComponent && isEditableCol;
+}
+
+function hasEditableFormat(column) {
+    if (isEditableColumn(column)) return 'editable-text';
+}
+
+const clickHandler = async (event) => {
+    const clickedElement = event.target.closest('td');
+
+    const isDateElement = event.target.closest('.q-date');
+    const isTimeElement = event.target.closest('.q-time');
+    const isQselectDropDown = event.target.closest('.q-select__dropdown-icon');
+
+    if (isDateElement || isTimeElement || isQselectDropDown) return;
+
+    if (clickedElement === null) {
+        await destroyInput(editingRow.value, editingField.value);
+        return;
+    }
+    const rowIndex = clickedElement.getAttribute('data-row-index');
+    const colField = clickedElement.getAttribute('data-col-field');
+    const column = $props.columns.find((col) => col.name === colField);
+
+    if (editingRow.value !== null && editingField.value !== null) {
+        if (editingRow.value == rowIndex && editingField.value == colField) return;
+
+        await destroyInput(editingRow.value, editingField.value);
+    }
+
+    if (isEditableColumn(column)) {
+        await renderInput(Number(rowIndex), colField, clickedElement);
+    }
+};
+
+async function handleTabKey(event, rowIndex, colField) {
+    if (editingRow.value == rowIndex && editingField.value == colField)
+        await destroyInput(editingRow.value, editingField.value);
+
+    const direction = event.shiftKey ? -1 : 1;
+    const { nextRowIndex, nextColumnName } = await handleTabNavigation(
+        rowIndex,
+        colField,
+        direction,
+    );
+
+    if (nextRowIndex < 0 || nextRowIndex >= arrayData.store.data.length) return;
+
+    event.preventDefault();
+    await renderInput(nextRowIndex, nextColumnName, null);
+}
+
+async function renderInput(rowId, field, clickedElement) {
+    editingField.value = field;
+    editingRow.value = rowId;
+
+    const originalColumn = $props.columns.find((col) => col.name === field);
+    const column = { ...originalColumn, ...{ label: '' } };
+    const row = CrudModelRef.value.formData[rowId];
+    const oldValue = CrudModelRef.value.formData[rowId][column?.name];
+
+    if (!clickedElement)
+        clickedElement = document.querySelector(
+            `[data-row-index="${rowId}"][data-col-field="${field}"]`,
+        );
+
+    Array.from(clickedElement.childNodes).forEach((child) => {
+        child.style.visibility = 'hidden';
+        child.style.position = 'relative';
+    });
+
+    const isSelect = selectRegex.test(column?.component);
+    if (isSelect) column.attrs = { ...column.attrs, 'emit-value': false };
+
+    const node = h(VnColumn, {
+        row: row,
+        class: 'temp-input',
+        column: column,
+        modelValue: row[column.name],
+        componentProp: 'columnField',
+        autofocus: true,
+        focusOnMount: true,
+        eventHandlers: {
+            'update:modelValue': async (value) => {
+                if (isSelect && value) {
+                    row[column.name] = value[column.attrs?.optionValue ?? 'id'];
+                    row[column?.name + 'TextValue'] =
+                        value[column.attrs?.optionLabel ?? 'name'];
+                    await column?.cellEvent?.['update:modelValue']?.(
+                        value,
+                        oldValue,
+                        row,
+                    );
+                } else row[column.name] = value;
+                await column?.cellEvent?.['update:modelValue']?.(value, oldValue, row);
+            },
+            keyup: async (event) => {
+                if (event.key === 'Enter')
+                    await destroyInput(rowIndex, field, clickedElement);
+            },
+            keydown: async (event) => {
+                switch (event.key) {
+                    case 'Tab':
+                        await handleTabKey(event, rowId, field);
+                        event.stopPropagation();
+                        break;
+                    case 'Escape':
+                        await destroyInput(rowId, field, clickedElement);
+                        break;
+                    default:
+                        break;
+                }
+            },
+            click: (event) => {
+                column?.cellEvent?.['click']?.(event, row);
+            },
+        },
+    });
+
+    node.appContext = app._context;
+    render(node, clickedElement);
+
+    if (['toggle'].includes(column?.component))
+        node.el?.querySelector('span > div').focus();
+
+    if (['checkbox', undefined].includes(column?.component))
+        node.el?.querySelector('span > div > div').focus();
+}
+
+async function destroyInput(rowIndex, field, clickedElement) {
+    if (!clickedElement)
+        clickedElement = document.querySelector(
+            `[data-row-index="${rowIndex}"][data-col-field="${field}"]`,
+        );
+    if (clickedElement) {
+        await nextTick();
+        render(null, clickedElement);
+        Array.from(clickedElement.childNodes).forEach((child) => {
+            child.style.visibility = 'visible';
+            child.style.position = '';
+        });
+    }
+    if (editingRow.value !== rowIndex || editingField.value !== field) return;
+    editingRow.value = null;
+    editingField.value = null;
+}
+
+async function handleTabNavigation(rowIndex, colName, direction) {
+    const columns = $props.columns;
+    const totalColumns = columns.length;
+    let currentColumnIndex = columns.findIndex((col) => col.name === colName);
+
+    let iterations = 0;
+    let newColumnIndex = currentColumnIndex;
+
+    do {
+        iterations++;
+        newColumnIndex = (newColumnIndex + direction + totalColumns) % totalColumns;
+
+        if (isEditableColumn(columns[newColumnIndex])) break;
+    } while (iterations < totalColumns);
+
+    if (iterations >= totalColumns + 1) return;
+
+    if (direction === 1 && newColumnIndex <= currentColumnIndex) {
+        rowIndex++;
+    } else if (direction === -1 && newColumnIndex >= currentColumnIndex) {
+        rowIndex--;
+    }
+    return { nextRowIndex: rowIndex, nextColumnName: columns[newColumnIndex].name };
+}
+
+function getCheckboxIcon(value) {
+    switch (typeof value) {
+        case 'boolean':
+            return value ? 'check' : 'close';
+        case 'number':
+            return value === 0 ? 'close' : 'check';
+        case 'undefined':
+            return 'indeterminate_check_box';
+        default:
+            return 'indeterminate_check_box';
+    }
+}
+
+function getToggleIcon(value) {
+    if (value === null) return 'help_outline';
+    return value ? 'toggle_on' : 'toggle_off';
+}
+
+function formatColumnValue(col, row, dashIfEmpty) {
+    if (col?.format || row[col?.name + 'TextValue']) {
+        if (selectRegex.test(col?.component) && row[col?.name + 'TextValue']) {
+            return dashIfEmpty(row[col?.name + 'TextValue']);
+        } else {
+            return col.format(row, dashIfEmpty);
+        }
+    }
+
+    if (col?.component === 'date') return dashIfEmpty(toDate(row[col?.name]));
+
+    if (col?.component === 'time')
+        return row[col?.name] >= 5
+            ? dashIfEmpty(date.formatDate(new Date(row[col?.name]), 'HH:mm'))
+            : row[col?.name];
+
+    if (selectRegex.test(col?.component) && $props.isEditable) {
+        const { find, url } = col.attrs;
+        const urlRelation = url?.charAt(0)?.toLocaleLowerCase() + url?.slice(1, -1);
+
+        if (col?.attrs.options) {
+            const find = col?.attrs.options.find((option) => option.id === row[col.name]);
+            if (!col.attrs?.optionLabel || !find) return dashIfEmpty(row[col?.name]);
+            return dashIfEmpty(find[col.attrs?.optionLabel ?? 'name']);
+        }
+
+        if (typeof row[urlRelation] == 'object') {
+            if (typeof find == 'object')
+                return dashIfEmpty(row[urlRelation][find?.label ?? 'name']);
+
+            return dashIfEmpty(row[urlRelation][col?.attrs.optionLabel ?? 'name']);
+        }
+        if (typeof row[urlRelation] == 'string') return dashIfEmpty(row[urlRelation]);
+    }
+    return dashIfEmpty(row[col?.name]);
+}
 function cardClick(_, row) {
    if ($props.redirect) router.push({ path: `/${$props.redirect}/${row.id}` });
 }
@ -315,7 +564,7 @@ function cardClick(_, row) {
        v-model="stateStore.rightDrawer"
        side="right"
        :width="256"
-        show-if-above
+        :overlay="$props.overlay"
    >
        <QScrollArea class="fit">
            <VnTableFilter
@ -336,7 +585,7 @@ function cardClick(_, row) {
    <CrudModel
        v-bind="$attrs"
        :class="$attrs['class'] ?? 'q-px-md'"
-        :limit="$attrs['limit'] ?? 20"
+        :limit="$attrs['limit'] ?? 100"
        ref="CrudModelRef"
        @on-fetch="(...args) => emit('onFetch', ...args)"
        :search-url="searchUrl"
@ -352,8 +601,12 @@ function cardClick(_, row) {
            <QTable
                ref="tableRef"
                v-bind="table"
-                class="vnTable"
-                :class="{ 'last-row-sticky': $props.footer }"
+                :class="[
+                    'vnTable',
+                    table ? 'selection-cell' : '',
+                    $props.footer ? 'last-row-sticky' : '',
+                ]"
+                wrap-cells
                :columns="splittedColumns.columns"
                :rows="rows"
                v-model:selected="selected"
@ -367,11 +620,13 @@ function cardClick(_, row) {
                @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
                @update:selected="emit('update:selected', $event)"
                @selection="(details) => handleSelection(details, rows)"
+                :hide-selected-banner="true"
            >
                <template #top-left v-if="!$props.withoutHeader">
-                    <slot name="top-left"></slot>
+                    <slot name="top-left"> </slot>
                </template>
                <template #top-right v-if="!$props.withoutHeader">
+                    <slot name="top-right"></slot>
                    <VnVisibleColumn
                        v-if="isTableMode"
                        v-model="splittedColumns.columns"
@ -385,43 +640,43 @@ function cardClick(_, row) {
                        dense
                        :options="tableModes.filter((mode) => !mode.disable)"
                    />
-                    <QBtn
-                        v-if="showRightIcon"
-                        icon="filter_alt"
-                        class="bg-vn-section-color q-ml-sm"
-                        dense
-                        @click="stateStore.toggleRightDrawer()"
-                    />
                </template>
                <template #header-cell="{ col }">
                    <QTh
                        v-if="col.visible ?? true"
-                        :style="col.headerStyle"
-                        :class="col.headerClass"
+                        v-bind:class="col.headerClass"
+                        class="body-cell"
+                        :style="col?.width ? `max-width: ${col?.width}` : ''"
                    >
                        <div
-                            class="column ellipsis"
-                            :class="`text-${col?.align ?? 'left'}`"
-                            :style="$props.columnSearch ? 'height: 75px' : ''"
+                            class="no-padding"
+                            :style="[
+                                withFilters && $props.columnSearch ? 'height: 75px' : '',
+                            ]"
                        >
-                            <div class="row items-center no-wrap" style="height: 30px">
+                            <div style="height: 30px">
                                <QTooltip v-if="col.toolTip">{{ col.toolTip }}</QTooltip>
                                <VnTableOrder
                                    v-model="orders[col.orderBy ?? col.name]"
                                    :name="col.orderBy ?? col.name"
-                                    :label="col?.label"
+                                    :label="col?.labelAbbreviation ?? col?.label"
                                    :data-key="$attrs['data-key']"
                                    :search-url="searchUrl"
+                                    :align="getColAlign(col)"
                                />
                            </div>
                            <VnFilter
-                                v-if="$props.columnSearch"
+                                v-if="
+                                    $props.columnSearch &&
+                                    col.columnSearch !== false &&
+                                    withFilters
+                                "
                                :column="col"
                                :show-title="true"
                                :data-key="$attrs['data-key']"
                                v-model="params[columnName(col)]"
                                :search-url="searchUrl"
-                                class="full-width"
+                                customClass="header-filter"
                            />
                        </div>
                    </QTh>
@ -439,32 +694,67 @@ function cardClick(_, row) {
                    </QTd>
                </template>
                <template #body-cell="{ col, row, rowIndex }">
-                    <!-- Columns -->
                    <QTd
-                        auto-width
-                        class="no-margin"
-                        :class="[getColAlign(col), col.columnClass]"
-                        :style="col.style"
+                        class="no-margin q-px-xs"
                        v-if="col.visible ?? true"
-                        @click.ctrl="
-                            ($event) =>
-                                rowCtrlClickFunction && rowCtrlClickFunction($event, row)
-                        "
+                        :style="{
+                            'max-width': col?.width ?? false,
+                            position: 'relative',
+                        }"
+                        :class="[
+                            col.columnClass,
+                            'body-cell no-margin no-padding',
+                            getColAlign(col),
+                        ]"
+                        :data-row-index="rowIndex"
+                        :data-col-field="col?.name"
                    >
-                        <slot
-                            :name="`column-${col.name}`"
-                            :col="col"
-                            :row="row"
-                            :row-index="rowIndex"
+                        <div
+                            class="no-padding no-margin peter"
+                            style="
+                                overflow: hidden;
+                                text-overflow: ellipsis;
+                                white-space: nowrap;
+                            "
                        >
-                            <VnTableColumn
-                                :column="col"
+                            <slot
+                                :name="`column-${col.name}`"
+                                :col="col"
                                :row="row"
-                                :is-editable="col.isEditable ?? isEditable"
-                                v-model="row[col.name]"
-                                component-prop="columnField"
-                            />
-                        </slot>
+                                :row-index="rowIndex"
+                            >
+                                <QIcon
+                                    v-if="col?.component === 'toggle'"
+                                    :name="
+                                        col?.getIcon
+                                            ? col.getIcon(row[col?.name])
+                                            : getToggleIcon(row[col?.name])
+                                    "
+                                    style="color: var(--vn-text-color)"
+                                    :class="hasEditableFormat(col)"
+                                    size="14px"
+                                />
+                                <QIcon
+                                    v-else-if="col?.component === 'checkbox'"
+                                    :name="getCheckboxIcon(row[col?.name])"
+                                    style="color: var(--vn-text-color)"
+                                    :class="hasEditableFormat(col)"
+                                    size="14px"
+                                />
+                                <span
+                                    v-else
+                                    :class="hasEditableFormat(col)"
+                                    :style="
+                                        typeof col?.style == 'function'
+                                            ? col.style(row)
+                                            : col?.style
+                                    "
+                                    style="bottom: 0"
+                                >
+                                    {{ formatColumnValue(col, row, dashIfEmpty) }}
+                                </span>
+                            </slot>
+                        </div>
                    </QTd>
                </template>
                <template #body-cell-tableActions="{ col, row }">
@ -485,7 +775,7 @@ function cardClick(_, row) {
                            flat
                            dense
                            :class="
-                                btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
+                                btn.isPrimary ? 'text-primary-light' : 'color-vn-label'
                            "
                            :style="`visibility: ${
                                ((btn.show && btn.show(row)) ?? true)
@ -493,6 +783,7 @@ function cardClick(_, row) {
                                    : 'hidden'
                            }`"
                            @click="btn.action(row)"
+                            :data-cy="btn?.name ?? `tableAction-${index}`"
                        />
                    </QTd>
                </template>
@ -541,7 +832,7 @@ function cardClick(_, row) {
                                </QCardSection>
                                <!-- Fields -->
                                <QCardSection
-                                    class="q-pl-sm q-pr-lg q-py-xs"
+                                    class="q-pl-sm q-py-xs"
                                    :class="$props.cardClass"
                                >
                                    <div
@ -562,7 +853,7 @@ function cardClick(_, row) {
                                                        :row="row"
                                                        :row-index="index"
                                                    >
-                                                        <VnTableColumn
+                                                        <VnColumn
                                                            :column="col"
                                                            :row="row"
                                                            :is-editable="false"
@ -588,13 +879,14 @@ function cardClick(_, row) {
                                    :key="index"
                                    :title="btn.title"
                                    :icon="btn.icon"
+                                    data-cy="cardBtn"
                                    class="q-pa-xs"
-                                    flat
                                    :class="
                                        btn.isPrimary
                                            ? 'text-primary-light'
-                                            : 'color-vn-text '
+                                            : 'color-vn-label'
                                    "
+                                    flat
                                    @click="btn.action(row)"
                                />
                            </QCardSection>
@ -602,14 +894,17 @@ function cardClick(_, row) {
                    </component>
                </template>
                <template #bottom-row="{ cols }" v-if="$props.footer">
-                    <QTr v-if="rows.length" style="height: 30px">
+                    <QTr v-if="rows.length" style="height: 45px">
+                        <QTh v-if="table.selection" />
                        <QTh
                            v-for="col of cols.filter((cols) => cols.visible ?? true)"
                            :key="col?.id"
-                            class="text-center"
                            :class="getColAlign(col)"
                        >
-                            <slot :name="`column-footer-${col.name}`" />
+                            <slot
+                                :name="`column-footer-${col.name}`"
+                                :isEditableColumn="isEditableColumn(col)"
+                            />
                        </QTh>
                    </QTr>
                </template>
@ -628,7 +923,7 @@ function cardClick(_, row) {
                    size="md"
                    round
                    flat
-                    shortcut="+"
+                    v-shortcut="'+'"
                    :disabled="!disabledAttr"
                />
                <QTooltip>
@ -646,39 +941,60 @@ function cardClick(_, row) {
            color="primary"
            fab
            icon="add"
-            shortcut="+"
+            v-shortcut="'+'"
            data-cy="vnTableCreateBtn"
        />
        <QTooltip self="top right">
            {{ createForm?.title }}
        </QTooltip>
    </QPageSticky>
-    <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
+    <QDialog
+        v-model="showForm"
+        transition-show="scale"
+        transition-hide="scale"
+        :full-width="createComplement?.isFullWidth ?? false"
+        @before-hide="
+            () => {
+                if (createRef.isSaveAndContinue) {
+                    showForm = true;
+                    createForm.formInitialData = { ...create.formInitialData };
+                }
+            }
+        "
+        data-cy="vn-table-create-dialog"
+    >
        <FormModelPopup
+            ref="createRef"
            v-bind="createForm"
            :model="$attrs['data-key'] + 'Create'"
            @on-data-saved="(_, res) => createForm.onDataSaved(res)"
        >
            <template #form-inputs="{ data }">
-                <div class="grid-create">
-                    <slot
-                        v-for="column of splittedColumns.create"
-                        :key="column.name"
-                        :name="`column-create-${column.name}`"
-                        :data="data"
-                        :column-name="column.name"
-                        :label="column.label"
-                    >
-                        <VnTableColumn
-                            :column="column"
-                            :row="{}"
-                            default="input"
-                            v-model="data[column.name]"
-                            :show-label="true"
-                            component-prop="columnCreate"
-                        />
-                    </slot>
-                    <slot name="more-create-dialog" :data="data" />
+                <div :style="createComplement?.containerStyle">
+                    <div>
+                        <slot name="previous-create-dialog" :data="data" />
+                    </div>
+                    <div class="grid-create" :style="createComplement?.columnGridStyle">
+                        <slot
+                            v-for="column of splittedColumns.create"
+                            :key="column.name"
+                            :name="`column-create-${column.name}`"
+                            :data="data"
+                            :column-name="column.name"
+                            :label="column.label"
+                        >
+                            <VnColumn
+                                :column="column"
+                                :row="{}"
+                                default="input"
+                                v-model="data[column.name]"
+                                :show-label="true"
+                                component-prop="columnCreate"
+                                :data-cy="`${column.name}-create-popup`"
+                            />
+                        </slot>
+                        <slot name="more-create-dialog" :data="data" />
+                    </div>
                </div>
            </template>
        </FormModelPopup>
@ -696,6 +1012,42 @@ es:
 </i18n>

 <style lang="scss">
+.selection-cell {
+    table td:first-child {
+        padding: 0px;
+    }
+}
+.side-padding {
+    padding-left: 1px;
+    padding-right: 1px;
+}
+.editable-text:hover {
+    border-bottom: 1px dashed var(--q-primary);
+    @extend .side-padding;
+}
+.editable-text {
+    border-bottom: 1px dashed var(--vn-label-color);
+    @extend .side-padding;
+}
+.cell-input {
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    padding-top: 0px !important;
+}
+.q-field--labeled .q-field__native,
+.q-field--labeled .q-field__prefix,
+.q-field--labeled .q-field__suffix {
+    padding-top: 20px;
+}
+
+.body-cell {
+    padding-left: 4px !important;
+    padding-right: 4px !important;
+    position: relative;
+}
 .bg-chip-secondary {
    background-color: var(--vn-page-color);
    color: var(--vn-text-color);
@ -712,8 +1064,8 @@ es:

 .grid-three {
    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(350px, max-content));
-    max-width: 100%;
+    grid-template-columns: repeat(auto-fit, minmax(300px, max-content));
+    width: 100%;
    grid-gap: 20px;
    margin: 0 auto;
 }
@ -721,7 +1073,6 @@ es:
 .grid-create {
    display: grid;
    grid-template-columns: repeat(auto-fit, minmax(150px, max-content));
-    max-width: 100%;
    grid-gap: 20px;
    margin: 0 auto;
 }
@ -737,7 +1088,9 @@ es:
        }
    }
 }
-
+.q-table tbody tr td {
+    position: relative;
+}
 .q-table {
    th {
        padding: 0;
@ -786,6 +1139,7 @@ es:
 .vn-label-value {
    display: flex;
    flex-direction: row;
+    align-items: center;
    color: var(--vn-text-color);
    .value {
        overflow: hidden;
@ -837,4 +1191,15 @@ es:
 .q-table__middle.q-virtual-scroll.q-virtual-scroll--vertical.scroll {
    background-color: var(--vn-section-color);
 }
+.temp-input {
+    top: 0;
+    position: absolute;
+    width: 100%;
+    height: 100%;
+    display: flex;
+}
+
+label.header-filter > .q-field__inner > .q-field__control {
+    padding: inherit;
+}
 </style>
--- a/src/components/VnTable/VnTableFilter.vue
+++ b/src/components/VnTable/VnTableFilter.vue
@ -27,31 +27,36 @@ function columnName(col) {
 </script>
 <template>
    <VnFilterPanel v-bind="$attrs" :search-button="true" :disable-submit-event="true">
-        <template #body="{ params, orders }">
+        <template #body="{ params, orders, searchFn }">
            <div
-                class="row no-wrap flex-center"
+                class="container"
                v-for="col of columns.filter((c) => c.columnFilter ?? true)"
                :key="col.id"
            >
-                <VnFilter
-                    ref="tableFilterRef"
-                    :column="col"
-                    :data-key="$attrs['data-key']"
-                    v-model="params[columnName(col)]"
-                    :search-url="searchUrl"
-                />
-                <VnTableOrder
-                    v-if="col?.columnFilter !== false && col?.name !== 'tableActions'"
-                    v-model="orders[col.orderBy ?? col.name]"
-                    :name="col.orderBy ?? col.name"
-                    :data-key="$attrs['data-key']"
-                    :search-url="searchUrl"
-                    :vertical="true"
-                />
+                <div class="filter">
+                    <VnFilter
+                        ref="tableFilterRef"
+                        :column="col"
+                        :data-key="$attrs['data-key']"
+                        v-model="params[columnName(col)]"
+                        :search-url="searchUrl"
+                    />
+                </div>
+                <div class="order">
+                    <VnTableOrder
+                        v-if="col?.columnFilter !== false && col?.name !== 'tableActions'"
+                        v-model="orders[col.orderBy ?? col.name]"
+                        :name="col.orderBy ?? col.name"
+                        :data-key="$attrs['data-key']"
+                        :search-url="searchUrl"
+                        :vertical="true"
+                    />
+                </div>
            </div>
            <slot
                name="moreFilterPanel"
                :params="params"
+                :search-fn="searchFn"
                :orders="orders"
                :columns="columns"
            />
@ -67,3 +72,21 @@ function columnName(col) {
        </template>
    </VnFilterPanel>
 </template>
+<style lang="scss" scoped>
+.container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 45px;
+    gap: 10px;
+}
+
+.filter {
+    width: 70%;
+    height: 40px;
+    text-align: center;
+}
+.order {
+    width: 10%;
+}
+</style>
--- a/src/components/VnTable/VnVisibleColumn.vue
+++ b/src/components/VnTable/VnVisibleColumn.vue
@ -32,16 +32,21 @@ const areAllChecksMarked = computed(() => {

 function setUserConfigViewData(data, isLocal) {
    if (!data) return;
-    // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
    if (!isLocal) localColumns.value = [];
-    // Array to Object
+
    const skippeds = $props.skip.reduce((a, v) => ({ ...a, [v]: v }), {});

    for (let column of columns.value) {
-        const { label, name } = column;
+        const { label, name, labelAbbreviation } = column;
        if (skippeds[name]) continue;
        column.visible = data[name] ?? true;
-        if (!isLocal) localColumns.value.push({ name, label, visible: column.visible });
+        if (!isLocal)
+            localColumns.value.push({
+                name,
+                label,
+                labelAbbreviation,
+                visible: column.visible,
+            });
    }
 }

@ -152,7 +157,11 @@ onMounted(async () => {
                    <QCheckbox
                        v-for="col in localColumns"
                        :key="col.name"
-                        :label="col.label ?? col.name"
+                        :label="
+                            col?.labelAbbreviation
+                                ? col.labelAbbreviation + ` (${col.label ?? col.name})`
+                                : (col.label ?? col.name)
+                        "
                        v-model="col.visible"
                    />
                </div>
--- a/src/components/tests/FormModel.spec.js
+++ b/src/components/tests/FormModel.spec.js
@ -57,6 +57,7 @@ describe('FormModel', () => {
            vm.state.set(model, formInitialData);
            expect(vm.hasChanges).toBe(false);

+            await vm.$nextTick();
            vm.formData.mockKey = 'newVal';
            await vm.$nextTick();
            expect(vm.hasChanges).toBe(true);
@ -93,9 +94,13 @@ describe('FormModel', () => {

        it('should call axios.patch with the right data', async () => {
            const spy = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
-            const { vm } = mount({ propsData: { url, model, formInitialData } });
-            vm.formData.mockKey = 'newVal';
+            const { vm } = mount({ propsData: { url, model } });
+
+            vm.formData = {};
            await vm.$nextTick();
+            vm.formData = { mockKey: 'newVal' };
+            await vm.$nextTick();
+
            await vm.save();
            expect(spy).toHaveBeenCalled();
            vm.formData.mockKey = 'mockVal';
@ -106,6 +111,7 @@ describe('FormModel', () => {
            const { vm } = mount({
                propsData: { url, model, formInitialData, urlCreate: 'mockUrlCreate' },
            });
+            await vm.$nextTick();
            vm.formData.mockKey = 'newVal';
            await vm.$nextTick();
            await vm.save();
@ -119,7 +125,7 @@ describe('FormModel', () => {
            });
            const spyPatch = vi.spyOn(axios, 'patch').mockResolvedValue({ data: {} });
            const spySaveFn = vi.spyOn(vm.$props, 'saveFn');
-
+            await vm.$nextTick();
            vm.formData.mockKey = 'newVal';
            await vm.$nextTick();
            await vm.save();
--- a/src/components/tests/Leftmenu.spec.js
+++ b/src/components/tests/Leftmenu.spec.js
@ -1,9 +1,12 @@
-import { vi, describe, expect, it, beforeAll } from 'vitest';
+import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
 import { createWrapper, axios } from 'app/test/vitest/helper';
 import Leftmenu from 'components/LeftMenu.vue';
-
+import * as vueRouter from 'vue-router';
 import { useNavigationStore } from 'src/stores/useNavigationStore';

+let vm;
+let navigation;
+
 vi.mock('src/router/modules', () => ({
    default: [
        {
@ -21,6 +24,16 @@ vi.mock('src/router/modules', () => ({
                {
                    path: '',
                    name: 'CustomerMain',
+                    meta: {
+                        menu: 'Customer',
+                        menuChildren: [
+                            {
+                                name: 'CustomerCreditContracts',
+                                title: 'creditContracts',
+                                icon: 'vn:solunion',
+                            },
+                        ],
+                    },
                    children: [
                        {
                            path: 'list',
@ -28,6 +41,13 @@ vi.mock('src/router/modules', () => ({
                            meta: {
                                title: 'list',
                                icon: 'view_list',
+                                menuChildren: [
+                                    {
+                                        name: 'CustomerCreditContracts',
+                                        title: 'creditContracts',
+                                        icon: 'vn:solunion',
+                                    },
+                                ],
                            },
                        },
                        {
@ -44,51 +64,325 @@ vi.mock('src/router/modules', () => ({
        },
    ],
 }));
-
-describe('Leftmenu', () => {
-    let vm;
-    let navigation;
-    beforeAll(() => {
-        vi.spyOn(axios, 'get').mockResolvedValue({
-            data: [],
-        });
-
-        vm = createWrapper(Leftmenu, {
-            propsData: {
-                source: 'main',
+vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
+    matched: [
+        {
+            path: '/',
+            redirect: {
+                name: 'Dashboard',
            },
-        }).vm;
-
-        navigation = useNavigationStore();
-        navigation.fetchPinned = vi.fn().mockReturnValue(Promise.resolve(true));
-        navigation.getModules = vi.fn().mockReturnValue({
-            value: [
+            name: 'Main',
+            meta: {},
+            props: {
+                default: false,
+            },
+            children: [
                {
-                    name: 'customer',
-                    title: 'customer.pageTitles.customers',
-                    icon: 'vn:customer',
-                    module: 'customer',
+                    path: '/dashboard',
+                    name: 'Dashboard',
+                    meta: {
+                        title: 'dashboard',
+                        icon: 'dashboard',
+                    },
                },
            ],
+        },
+        {
+            path: '/customer',
+            redirect: {
+                name: 'CustomerMain',
+            },
+            name: 'Customer',
+            meta: {
+                title: 'customers',
+                icon: 'vn:client',
+                moduleName: 'Customer',
+                keyBinding: 'c',
+                menu: 'customer',
+            },
+        },
+    ],
+    query: {},
+    params: {},
+    meta: { moduleName: 'mockName' },
+    path: 'mockName/1',
+    name: 'Customer',
+});
+function mount(source = 'main') {
+    vi.spyOn(axios, 'get').mockResolvedValue({
+        data: [],
+    });
+    const wrapper = createWrapper(Leftmenu, {
+        propsData: {
+            source,
+        },
+    });
+
+    navigation = useNavigationStore();
+    navigation.fetchPinned = vi.fn().mockReturnValue(Promise.resolve(true));
+    navigation.getModules = vi.fn().mockReturnValue({
+        value: [
+            {
+                name: 'customer',
+                title: 'customer.pageTitles.customers',
+                icon: 'vn:customer',
+                module: 'customer',
+            },
+        ],
+    });
+    return wrapper;
+}
+
+describe('getRoutes', () => {
+    afterEach(() => vi.clearAllMocks());
+    const getRoutes = vi.fn().mockImplementation((props, getMethodA, getMethodB) => {
+        const handleRoutes = {
+            methodA: getMethodA,
+            methodB: getMethodB,
+        };
+        try {
+            handleRoutes[props.source]();
+        } catch (error) {
+            throw Error('Method not defined');
+        }
+    });
+
+    const getMethodA = vi.fn();
+    const getMethodB = vi.fn();
+    const fn = (props) => getRoutes(props, getMethodA, getMethodB);
+
+    it('should call getMethodB when source is card', () => {
+        let props = { source: 'methodB' };
+        fn(props);
+
+        expect(getMethodB).toHaveBeenCalled();
+        expect(getMethodA).not.toHaveBeenCalled();
+    });
+    it('should call getMethodA when source is main', () => {
+        let props = { source: 'methodA' };
+        fn(props);
+
+        expect(getMethodA).toHaveBeenCalled();
+        expect(getMethodB).not.toHaveBeenCalled();
+    });
+
+    it('should call getMethodA when source is not exists or undefined', () => {
+        let props = { source: 'methodC' };
+        expect(() => fn(props)).toThrowError('Method not defined');
+
+        expect(getMethodA).not.toHaveBeenCalled();
+        expect(getMethodB).not.toHaveBeenCalled();
+    });
+});
+
+describe('Leftmenu as card', () => {
+    beforeAll(() => {
+        vm = mount('card').vm;
+    });
+
+    it('should get routes for card source', async () => {
+        vm.getRoutes();
+    });
+});
+describe('Leftmenu as main', () => {
+    beforeEach(() => {
+        vm = mount().vm;
+    });
+
+    it('should initialize with default props', () => {
+        expect(vm.source).toBe('main');
+    });
+
+    it('should filter items based on search input', async () => {
+        vm.search = 'cust';
+        await vm.$nextTick();
+        expect(vm.filteredItems[0].name).toEqual('customer');
+        expect(vm.filteredItems[0].module).toEqual('customer');
+    });
+    it('should filter items based on search input', async () => {
+        vm.search = 'Rou';
+        await vm.$nextTick();
+        expect(vm.filteredItems).toEqual([]);
+    });
+
+    it('should return pinned items', () => {
+        vm.items = [
+            { name: 'Item 1', isPinned: false },
+            { name: 'Item 2', isPinned: true },
+        ];
+        expect(vm.pinnedModules).toEqual(
+            new Map([['Item 2', { name: 'Item 2', isPinned: true }]]),
+        );
+    });
+
+    it('should find matches in routes', () => {
+        const search = 'child1';
+        const item = {
+            children: [
+                { name: 'child1', children: [] },
+                { name: 'child2', children: [] },
+            ],
+        };
+        const matches = vm.findMatches(search, item);
+        expect(matches).toEqual([{ name: 'child1', children: [] }]);
+    });
+    it('should not proceed if event is already prevented', async () => {
+        const item = { module: 'testModule', isPinned: false };
+        const event = {
+            preventDefault: vi.fn(),
+            stopPropagation: vi.fn(),
+            defaultPrevented: true,
+        };
+
+        await vm.togglePinned(item, event);
+
+        expect(event.preventDefault).not.toHaveBeenCalled();
+        expect(event.stopPropagation).not.toHaveBeenCalled();
+    });
+
+    it('should call quasar.notify with success message', async () => {
+        const item = { module: 'testModule', isPinned: false };
+        const event = {
+            preventDefault: vi.fn(),
+            stopPropagation: vi.fn(),
+            defaultPrevented: false,
+        };
+        const response = { data: { id: 1 } };
+
+        vi.spyOn(axios, 'post').mockResolvedValue(response);
+        vi.spyOn(vm.quasar, 'notify');
+
+        await vm.togglePinned(item, event);
+
+        expect(vm.quasar.notify).toHaveBeenCalledWith({
+            message: 'Data saved',
+            type: 'positive',
        });
    });

-    it('should return a proper formated object with two child items', async () => {
-        const expectedMenuItem = [
-            {
-                children: null,
-                name: 'CustomerList',
-                title: 'globals.pageTitles.list',
-                icon: 'view_list',
-            },
-            {
-                children: null,
-                name: 'CustomerCreate',
-                title: 'globals.pageTitles.createCustomer',
-                icon: 'vn:addperson',
-            },
-        ];
-        const firstMenuItem = vm.items[0];
-        expect(firstMenuItem.children).toEqual(expect.arrayContaining(expectedMenuItem));
+    it('should handle a single matched route with a menu', () => {
+        const route = {
+            matched: [{ meta: { menu: 'customer' } }],
+        };
+
+        const result = vm.betaGetRoutes();
+
+        expect(result.meta.menu).toEqual(route.matched[0].meta.menu);
+    });
+    it('should get routes for main source', () => {
+        vm.props.source = 'main';
+        vm.getRoutes();
+        expect(navigation.getModules).toHaveBeenCalled();
+    });
+
+    it('should find direct child matches', () => {
+        const search = 'child1';
+        const item = {
+            children: [{ name: 'child1' }, { name: 'child2' }],
+        };
+        const result = vm.findMatches(search, item);
+        expect(result).toEqual([{ name: 'child1' }]);
+    });
+
+    it('should find nested child matches', () => {
+        const search = 'child3';
+        const item = {
+            children: [
+                { name: 'child1' },
+                {
+                    name: 'child2',
+                    children: [{ name: 'child3' }],
+                },
+            ],
+        };
+        const result = vm.findMatches(search, item);
+        expect(result).toEqual([{ name: 'child3' }]);
+    });
+});
+
+describe('normalize', () => {
+    beforeAll(() => {
+        vm = mount('card').vm;
+    });
+    it('should normalize and lowercase text', () => {
+        const input = 'ÁÉÍÓÚáéíóú';
+        const expected = 'aeiouaeiou';
+        expect(vm.normalize(input)).toBe(expected);
+    });
+
+    it('should handle empty string', () => {
+        const input = '';
+        const expected = '';
+        expect(vm.normalize(input)).toBe(expected);
+    });
+
+    it('should handle text without diacritics', () => {
+        const input = 'hello';
+        const expected = 'hello';
+        expect(vm.normalize(input)).toBe(expected);
+    });
+
+    it('should handle mixed text', () => {
+        const input = 'Héllo Wórld!';
+        const expected = 'hello world!';
+        expect(vm.normalize(input)).toBe(expected);
+    });
+});
+
+describe('addChildren', () => {
+    const module = 'testModule';
+    beforeEach(() => {
+        vm = mount().vm;
+        vi.clearAllMocks();
+    });
+
+    it('should add menu items to parent if matches are found', () => {
+        const parent = 'testParent';
+        const route = {
+            meta: {
+                menu: 'testMenu',
+            },
+            children: [{ name: 'child1' }, { name: 'child2' }],
+        };
+        vm.addChildren(module, route, parent);
+
+        expect(navigation.addMenuItem).toHaveBeenCalled();
+    });
+
+    it('should handle routes with no meta menu', () => {
+        const route = {
+            meta: {},
+            menus: {},
+        };
+
+        const parent = [];
+
+        vm.addChildren(module, route, parent);
+        expect(navigation.addMenuItem).toHaveBeenCalled();
+    });
+
+    it('should handle empty parent array', () => {
+        const parent = [];
+        const route = {
+            meta: {
+                menu: 'child11',
+            },
+            children: [
+                {
+                    name: 'child1',
+                    meta: {
+                        menuChildren: [
+                            {
+                                name: 'CustomerCreditContracts',
+                                title: 'creditContracts',
+                                icon: 'vn:solunion',
+                            },
+                        ],
+                    },
+                },
+            ],
+        };
+        vm.addChildren(module, route, parent);
+        expect(navigation.addMenuItem).toHaveBeenCalled();
    });
 });
--- a/src/components/tests/UserPanel.spec.js
+++ b/src/components/tests/UserPanel.spec.js
@ -1,61 +1,65 @@
-import { vi, describe, expect, it, beforeEach, beforeAll, afterEach } from 'vitest';
+import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
 import { createWrapper } from 'app/test/vitest/helper';
 import UserPanel from 'src/components/UserPanel.vue';
 import axios from 'axios';
 import { useState } from 'src/composables/useState';

+vi.mock('src/utils/quasarLang', () => ({
+  default: vi.fn(),
+}));
+
 describe('UserPanel', () => {
-    let wrapper;
-    let vm;
-    let state;
+  let wrapper;
+  let vm;
+  let state;

-    beforeEach(() => {
-        wrapper = createWrapper(UserPanel, {});
-        state = useState();
-        state.setUser({
-            id: 115,
-            name: 'itmanagement',
-            nickname: 'itManagementNick',
-            lang: 'en',
-            darkMode: false,
-            companyFk: 442,
-            warehouseFk: 1,
-        });
-        wrapper = wrapper.wrapper;
-        vm = wrapper.vm;
+  beforeEach(() => {
+    wrapper = createWrapper(UserPanel, {});
+    state = useState();
+    state.setUser({
+      id: 115,
+      name: 'itmanagement',
+      nickname: 'itManagementNick',
+      lang: 'en',
+      darkMode: false,
+      companyFk: 442,
+      warehouseFk: 1,
    });
+    wrapper = wrapper.wrapper;
+    vm = wrapper.vm;
+  });

-    afterEach(() => {
-        vi.clearAllMocks();
-    });
+  afterEach(() => {
+    vi.clearAllMocks();
+  });

-    it('should fetch warehouses data on mounted', async () => {
-        const fetchData = wrapper.findComponent({ name: 'FetchData' });
-        expect(fetchData.props('url')).toBe('Warehouses');
-        expect(fetchData.props('autoLoad')).toBe(true);
-    });
+  it('should fetch warehouses data on mounted', async () => {
+    const fetchData = wrapper.findComponent({ name: 'FetchData' });
+    expect(fetchData.props('url')).toBe('Warehouses');
+    expect(fetchData.props('autoLoad')).toBe(true);
+  });

-    it('should toggle dark mode correctly and update preferences', async () => {
-        await vm.saveDarkMode(true);
-        expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
-        expect(vm.user.darkMode).toBe(true);
-        vm.updatePreferences();
-        expect(vm.darkMode).toBe(true);
-    });
+  it('should toggle dark mode correctly and update preferences', async () => {
+    await vm.saveDarkMode(true);
+    expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
+    expect(vm.user.darkMode).toBe(true);
+    await vm.updatePreferences();
+    expect(vm.darkMode).toBe(true);
+  });

-    it('should change user language and update preferences', async () => {
-        const userLanguage = 'es';
-        await vm.saveLanguage(userLanguage);
-        expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
-        expect(vm.user.lang).toBe(userLanguage);
-        vm.updatePreferences();
-        expect(vm.locale).toBe(userLanguage);
-    });
+  it('should change user language and update preferences', async () => {
+    const userLanguage = 'es';
+    await vm.saveLanguage(userLanguage);
+    expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
+    expect(vm.user.lang).toBe(userLanguage);
+    await vm.updatePreferences();
+    expect(vm.locale).toBe(userLanguage);
+  });

-    it('should update user data', async () => {
-        const key = 'name';
-        const value = 'itboss';
-        await vm.saveUserData(key, value);
-        expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', { [key]: value });
-    });
-});
+  it('should update user data', async () => {
+    const key = 'name';
+    const value = 'itboss';
+    await vm.saveUserData(key, value);
+    expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', { [key]: value });
+  });
+});
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@ -10,11 +10,11 @@ import LeftMenu from 'components/LeftMenu.vue';
 import RightMenu from 'components/common/RightMenu.vue';
 const props = defineProps({
    dataKey: { type: String, required: true },
-    baseUrl: { type: String, default: undefined },
-    customUrl: { type: String, default: undefined },
+    url: { type: String, default: undefined },
    filter: { type: Object, default: () => {} },
    descriptor: { type: Object, required: true },
    filterPanel: { type: Object, default: undefined },
+    idInWhere: { type: Boolean, default: false },
    searchDataKey: { type: String, default: undefined },
    searchbarProps: { type: Object, default: undefined },
    redirectOnError: { type: Boolean, default: false },
@ -23,25 +23,20 @@ const props = defineProps({
 const stateStore = useStateStore();
 const route = useRoute();
 const router = useRouter();
-const url = computed(() => {
-    if (props.baseUrl) {
-        return `${props.baseUrl}/${route.params.id}`;
-    }
-    return props.customUrl;
-});
 const searchRightDataKey = computed(() => {
    if (!props.searchDataKey) return route.name;
    return props.searchDataKey;
 });
+
 const arrayData = useArrayData(props.dataKey, {
-    url: url.value,
-    filter: props.filter,
+    url: props.url,
+    userFilter: props.filter,
+    oneRecord: true,
 });

 onBeforeMount(async () => {
    try {
-        if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
-        await arrayData.fetch({ append: false, updateRouter: false });
+        await fetch(route.params.id);
    } catch {
        const { matched: matches } = router.currentRoute.value;
        const { path } = matches.at(-1);
@ -49,13 +44,17 @@ onBeforeMount(async () => {
    }
 });

-if (props.baseUrl) {
-    onBeforeRouteUpdate(async (to, from) => {
-        if (to.params.id !== from.params.id) {
-            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
-            await arrayData.fetch({ append: false, updateRouter: false });
-        }
-    });
+onBeforeRouteUpdate(async (to, from) => {
+    const id = to.params.id;
+    if (id !== from.params.id) await fetch(id, true);
+});
+
+async function fetch(id, append = false) {
+    const regex = /\/(\d+)/;
+    if (props.idInWhere) arrayData.store.filter.where = { id };
+    else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
+    else arrayData.store.url = props.url.replace(regex, `/${id}`);
+    await arrayData.fetch({ append, updateRouter: false });
 }
 </script>
 <template>
@ -83,7 +82,7 @@ if (props.baseUrl) {
        <QPage>
            <VnSubToolbar />
            <div :class="[useCardSize(), $attrs.class]">
-                <RouterView :key="route.path" />
+                <RouterView :key="$route.path" />
            </div>
        </QPage>
    </QPageContainer>
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@ -1,6 +1,6 @@
 <script setup>
-import { onBeforeMount, computed } from 'vue';
-import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
+import { onBeforeMount } from 'vue';
+import { useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
@ -9,10 +9,9 @@ import VnSubToolbar from '../ui/VnSubToolbar.vue';

 const props = defineProps({
    dataKey: { type: String, required: true },
-    baseUrl: { type: String, default: undefined },
-    customUrl: { type: String, default: undefined },
+    url: { type: String, default: undefined },
+    idInWhere: { type: Boolean, default: false },
    filter: { type: Object, default: () => {} },
-    userFilter: { type: Object, default: () => {} },
    descriptor: { type: Object, required: true },
    filterPanel: { type: Object, default: undefined },
    searchDataKey: { type: String, default: undefined },
@ -21,39 +20,45 @@ const props = defineProps({
 });

 const stateStore = useStateStore();
-const route = useRoute();
 const router = useRouter();
-const url = computed(() => {
-    if (props.baseUrl) {
-        return `${props.baseUrl}/${route.params.id}`;
-    }
-    return props.customUrl;
-});
-
 const arrayData = useArrayData(props.dataKey, {
-    url: url.value,
-    filter: props.filter,
-    userFilter: props.userFilter,
+    url: props.url,
+    userFilter: props.filter,
+    oneRecord: true,
 });

 onBeforeMount(async () => {
+    const route = router.currentRoute.value;
    try {
-        if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
-        await arrayData.fetch({ append: false, updateRouter: false });
+        await fetch(route.params.id);
    } catch {
-        const { matched: matches } = router.currentRoute.value;
+        const { matched: matches } = route;
        const { path } = matches.at(-1);
        router.push({ path: path.replace(/:id.*/, '') });
    }
 });

-if (props.baseUrl) {
-    onBeforeRouteUpdate(async (to, from) => {
-        if (to.params.id !== from.params.id) {
-            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
-            await arrayData.fetch({ append: false, updateRouter: false });
+onBeforeRouteUpdate(async (to, from) => {
+    if (hasRouteParam(to.params)) {
+        const { matched } = router.currentRoute.value;
+        const { name } = matched.at(-3);
+        if (name) {
+            router.push({ name, params: to.params });
        }
-    });
+    }
+    const id = to.params.id;
+    if (id !== from.params.id) await fetch(id, true);
+});
+
+async function fetch(id, append = false) {
+    const regex = /\/(\d+)/;
+    if (props.idInWhere) arrayData.store.filter.where = { id };
+    else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
+    else arrayData.store.url = props.url.replace(regex, `/${id}`);
+    await arrayData.fetch({ append, updateRouter: false });
+}
+function hasRouteParam(params, valueToCheck = ':addressId') {
+    return Object.values(params).includes(valueToCheck);
 }
 </script>
 <template>
@ -64,6 +69,6 @@ if (props.baseUrl) {
    </Teleport>
    <VnSubToolbar />
    <div :class="[useCardSize(), $attrs.class]">
-        <RouterView :key="route.path" />
+        <RouterView :key="$route.path" />
    </div>
 </template>
--- a/src/components/common/VnCheckbox.vue
+++ b/src/components/common/VnCheckbox.vue
@ -0,0 +1,43 @@
+<script setup>
+import { computed } from 'vue';
+
+const model = defineModel({ type: [Number, Boolean] });
+const $props = defineProps({
+    info: {
+        type: String,
+        default: null,
+    },
+});
+
+const checkboxModel = computed({
+    get() {
+        if (typeof model.value === 'number') {
+            return model.value !== 0;
+        }
+        return model.value;
+    },
+    set(value) {
+        if (typeof model.value === 'number') {
+            model.value = value ? 1 : 0;
+        } else {
+            model.value = value;
+        }
+    },
+});
+</script>
+<template>
+    <div>
+        <QCheckbox v-bind="$attrs" v-on="$attrs" v-model="checkboxModel" />
+        <QIcon
+            v-if="info"
+            v-bind="$attrs"
+            class="cursor-info q-ml-sm"
+            name="info"
+            size="sm"
+        >
+            <QTooltip>
+                {{ info }}
+            </QTooltip>
+        </QIcon>
+    </div>
+</template>
--- a/src/components/common/VnColor.vue
+++ b/src/components/common/VnColor.vue
@ -0,0 +1,32 @@
+<script setup>
+const $props = defineProps({
+    colors: {
+        type: String,
+        default: '{"value": []}',
+    },
+});
+
+const colorArray = JSON.parse($props.colors)?.value;
+const maxHeight = 30;
+const colorHeight = maxHeight / colorArray?.length;
+</script>
+<template>
+    <div v-if="colors" class="color-div" :style="{ height: `${maxHeight}px` }">
+        <div
+            v-for="(color, index) in colorArray"
+            :key="index"
+            :style="{
+                backgroundColor: `#${color}`,
+                height: `${colorHeight}px`,
+            }"
+        >
+            &nbsp;
+        </div>
+    </div>
+</template>
+<style scoped>
+.color-div {
+    display: flex;
+    flex-direction: column;
+}
+</style>
--- a/src/components/common/VnComponent.vue
+++ b/src/components/common/VnComponent.vue
@ -17,6 +17,8 @@ const $props = defineProps({
    },
 });

+const emit = defineEmits(['blur']);
+
 const componentArray = computed(() => {
    if (typeof $props.prop === 'object') return [$props.prop];
    return $props.prop;
@ -46,7 +48,8 @@ function toValueAttrs(attrs) {
    <span
        v-for="toComponent of componentArray"
        :key="toComponent.name"
-        class="column flex-center fit"
+        class="column fit"
+        :class="toComponent?.component == 'checkbox' ? 'flex-center' : ''"
    >
        <component
            v-if="toComponent?.component"
@ -54,6 +57,7 @@ function toValueAttrs(attrs) {
            v-bind="mix(toComponent).attrs"
            v-on="mix(toComponent).event ?? {}"
            v-model="model"
+            @blur="emit('blur')"
        />
    </span>
 </template>
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@ -17,7 +17,7 @@ import { useSession } from 'src/composables/useSession';
 const route = useRoute();
 const quasar = useQuasar();
 const { t } = useI18n();
-const rows = ref();
+const rows = ref([]);
 const dmsRef = ref();
 const formDialog = ref({});
 const token = useSession().getTokenMultimedia();
@ -389,6 +389,14 @@ defineExpose({
                    </div>
                </template>
            </QTable>
+            <div 
+                v-else 
+                class="info-row q-pa-md text-center"
+            >
+                <h5>
+                    {{ t('No data to display') }}
+                </h5>
+            </div>
        </template>
    </VnPaginate>
    <QDialog v-model="formDialog.show">
@ -405,7 +413,7 @@ defineExpose({
            fab
            color="primary"
            icon="add"
-            shortcut="+"
+            v-shortcut
            @click="showFormDialog()"
            class="fill-icon"
        >
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@ -11,6 +11,7 @@ const emit = defineEmits([
    'update:options',
    'keyup.enter',
    'remove',
+    'blur',
 ]);

 const $props = defineProps({
@ -136,6 +137,7 @@ const handleUppercase = () => {
            :type="$attrs.type"
            :class="{ required: isRequired }"
            @keyup.enter="emit('keyup.enter')"
+            @blur="emit('blur')"
            @keydown="handleKeydown"
            :clearable="false"
            :rules="mixinRules"
@ -143,7 +145,7 @@ const handleUppercase = () => {
            hide-bottom-space
            :data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
        >
-            <template #prepend>
+            <template #prepend v-if="$slots.prepend">
                <slot name="prepend" />
            </template>
            <template #append>
@ -168,11 +170,11 @@ const handleUppercase = () => {
                        }
                    "
                ></QIcon>
-                
+
                <QIcon
                    name="match_case"
                    size="xs"
-                    v-if="!$attrs.disabled && !($attrs.readonly) && $props.uppercase"
+                    v-if="!$attrs.disabled && !$attrs.readonly && $props.uppercase"
                    @click="handleUppercase"
                    class="uppercase-icon"
                >
@ -180,7 +182,7 @@ const handleUppercase = () => {
                        {{ t('Convert to uppercase') }}
                    </QTooltip>
                </QIcon>
-                
+
                <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                <QIcon v-if="info" name="info">
                    <QTooltip max-width="350px">
@ -194,13 +196,15 @@ const handleUppercase = () => {

 <style>
 .uppercase-icon {
-  transition: color 0.3s, transform 0.2s;
-  cursor: pointer;
+    transition:
+        color 0.3s,
+        transform 0.2s;
+    cursor: pointer;
 }

 .uppercase-icon:hover {
-  color: #ed9937;
-  transform: scale(1.2);
+    color: #ed9937;
+    transform: scale(1.2);
 }
 </style>
 <i18n>
@ -214,4 +218,4 @@ const handleUppercase = () => {
        maxLength: El valor excede los {value} carácteres
        inputMax: Debe ser menor a {value}
        Convert to uppercase: Convertir a mayúsculas
-</i18n>
+</i18n>
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@ -42,7 +42,7 @@ const formattedDate = computed({
                if (value.at(2) == '/') value = value.split('/').reverse().join('/');
                value = date.formatDate(
                    new Date(value).toISOString(),
-                    'YYYY-MM-DDTHH:mm:ss.SSSZ'
+                    'YYYY-MM-DDTHH:mm:ss.SSSZ',
                );
            }
            const [year, month, day] = value.split('-').map((e) => parseInt(e));
@ -55,7 +55,7 @@ const formattedDate = computed({
                    orgDate.getHours(),
                    orgDate.getMinutes(),
                    orgDate.getSeconds(),
-                    orgDate.getMilliseconds()
+                    orgDate.getMilliseconds(),
                );
            }
        }
@ -64,7 +64,7 @@ const formattedDate = computed({
 });

 const popupDate = computed(() =>
-    model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value
+    model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value,
 );
 onMounted(() => {
    // fix quasar bug
@ -73,7 +73,7 @@ onMounted(() => {
 watch(
    () => model.value,
    (val) => (formattedDate.value = val),
-    { immediate: true }
+    { immediate: true },
 );

 const styleAttrs = computed(() => {
@ -107,6 +107,7 @@ const manageDate = (date) => {
            @click="isPopupOpen = !isPopupOpen"
            @keydown="isPopupOpen = false"
            hide-bottom-space
+            :data-cy="$attrs.dataCy ?? $attrs.label + '_inputDate'"
        >
            <template #append>
                <QIcon
--- a/src/components/common/VnInputNumber.vue
+++ b/src/components/common/VnInputNumber.vue
@ -8,6 +8,7 @@ defineProps({
 });

 const model = defineModel({ type: [Number, String] });
+const emit = defineEmits(['blur']);
 </script>
 <template>
    <VnInput
@ -24,5 +25,6 @@ const model = defineModel({ type: [Number, String] });
                    model = parseFloat(val).toFixed(decimalPlaces);
            }
        "
+        @blur="emit('blur')"
    />
 </template>
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@ -85,6 +85,7 @@ const handleModelValue = (data) => {
        :tooltip="t('Create new location')"
        :rules="mixinRules"
        :lazy-rules="true"
+        required
    >
        <template #form>
            <CreateNewPostcode
--- a/src/components/common/VnPopupProxy.vue
+++ b/src/components/common/VnPopupProxy.vue
@ -0,0 +1,38 @@
+<script setup>
+import { ref } from 'vue';
+
+defineProps({
+    label: {
+        type: String,
+        default: '',
+    },
+    icon: {
+        type: String,
+        required: true,
+        default: null,
+    },
+    color: {
+        type: String,
+        default: 'primary',
+    },
+    tooltip: {
+        type: String,
+        default: null,
+    },
+});
+const popupProxyRef = ref(null);
+</script>
+
+<template>
+    <QBtn :color="$props.color" :icon="$props.icon" :label="$t($props.label)">
+        <template #default>
+            <slot name="extraIcon"></slot>
+            <QPopupProxy ref="popupProxyRef" style="max-width: none">
+                <QCard>
+                    <slot :popup="popupProxyRef"></slot>
+                </QCard>
+            </QPopupProxy>
+            <QTooltip>{{ $t($props.tooltip) }}</QTooltip>
+        </template>
+    </QBtn>
+</template>
--- a/src/components/common/VnSection.vue
+++ b/src/components/common/VnSection.vue
@ -106,7 +106,14 @@ function checkIsMain() {
                    :data-key="dataKey"
                    :array-data="arrayData"
                    :columns="columns"
-                />
+                >
+                    <template #moreFilterPanel="{ params, orders, searchFn }">
+                        <slot
+                            name="moreFilterPanel"
+                            v-bind="{ params, orders, searchFn }"
+                        />
+                    </template>
+                </VnTableFilter>
            </slot>
        </template>
    </RightAdvancedMenu>
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@ -171,7 +171,8 @@ onMounted(() => {
 });

 const arrayDataKey =
-    $props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
+    $props.dataKey ??
+    ($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));

 const arrayData = useArrayData(arrayDataKey, {
    url: $props.url,
@ -220,7 +221,7 @@ async function fetchFilter(val) {
        optionFilterValue.value ??
        (new RegExp(/\d/g).test(val)
            ? optionValue.value
-            : optionFilter.value ?? optionLabel.value);
+            : (optionFilter.value ?? optionLabel.value));

    let defaultWhere = {};
    if ($props.filterOptions.length) {
@ -239,7 +240,7 @@ async function fetchFilter(val) {

    const { data } = await arrayData.applyFilter(
        { filter: filterOptions },
-        { updateRouter: false }
+        { updateRouter: false },
    );
    setOptions(data);
    return data;
@ -272,7 +273,7 @@ async function filterHandler(val, update) {
                ref.setOptionIndex(-1);
                ref.moveOptionSelection(1, true);
            }
-        }
+        },
    );
 }

@ -308,7 +309,7 @@ function handleKeyDown(event) {
        if (inputValue) {
            const matchingOption = myOptions.value.find(
                (option) =>
-                    option[optionLabel.value].toLowerCase() === inputValue.toLowerCase()
+                    option[optionLabel.value].toLowerCase() === inputValue.toLowerCase(),
            );

            if (matchingOption) {
@ -320,11 +321,11 @@ function handleKeyDown(event) {
        }

        const focusableElements = document.querySelectorAll(
-            'a:not([disabled]), button:not([disabled]), input:not([disabled]), textarea:not([disabled]), select:not([disabled]), details:not([disabled]), [tabindex]:not([tabindex="-1"]):not([disabled])'
+            'a:not([disabled]), button:not([disabled]), input:not([disabled]), textarea:not([disabled]), select:not([disabled]), details:not([disabled]), [tabindex]:not([tabindex="-1"]):not([disabled])',
        );
        const currentIndex = Array.prototype.indexOf.call(
            focusableElements,
-            event.target
+            event.target,
        );
        if (currentIndex >= 0 && currentIndex < focusableElements.length - 1) {
            focusableElements[currentIndex + 1].focus();
--- a/src/components/common/VnSelectCache.vue
+++ b/src/components/common/VnSelectCache.vue
@ -14,7 +14,7 @@ const $props = defineProps({
    },
 });
 const options = ref([]);
-
+const emit = defineEmits(['blur']);
 onBeforeMount(async () => {
    const { url, optionValue, optionLabel } = useAttrs();
    const findBy = $props.find ?? url?.charAt(0)?.toLocaleLowerCase() + url?.slice(1, -1);
@ -35,5 +35,5 @@ onBeforeMount(async () => {
 });
 </script>
 <template>
-    <VnSelect v-bind="$attrs" :options="$attrs.options ?? options" />
+    <VnSelect v-bind="$attrs" :options="$attrs.options ?? options" @blur="emit('blur')" />
 </template>
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@ -37,7 +37,6 @@ const isAllowedToCreate = computed(() => {

 defineExpose({ vnSelectDialogRef: select });
 </script>
-
 <template>
    <VnSelect
        ref="select"
@ -67,7 +66,6 @@ defineExpose({ vnSelectDialogRef: select });
        </template>
    </VnSelect>
 </template>
-
 <style lang="scss" scoped>
 .default-icon {
    cursor: pointer;
--- a/src/components/common/VnSelectSupplier.vue
+++ b/src/components/common/VnSelectSupplier.vue
@ -1,9 +1,7 @@
 <script setup>
-import { computed } from 'vue';
 import VnSelect from 'components/common/VnSelect.vue';

 const model = defineModel({ type: [String, Number, Object] });
-const url = 'Suppliers';
 </script>

 <template>
@ -11,11 +9,13 @@ const url = 'Suppliers';
        :label="$t('globals.supplier')"
        v-bind="$attrs"
        v-model="model"
-        :url="url"
+        url="Suppliers"
        option-value="id"
        option-label="nickname"
        :fields="['id', 'name', 'nickname', 'nif']"
+        :filter-options="['id', 'name', 'nickname', 'nif']"
        sort-by="name ASC"
+        data-cy="vnSupplierSelect"
    >
        <template #option="scope">
            <QItem v-bind="scope.itemProps">
--- a/src/components/common/VnSelectTravelExtended.vue
+++ b/src/components/common/VnSelectTravelExtended.vue
@ -0,0 +1,50 @@
+<script setup>
+import VnSelectDialog from './VnSelectDialog.vue';
+import FilterTravelForm from 'src/components/FilterTravelForm.vue';
+import { useI18n } from 'vue-i18n';
+import { toDate } from 'src/filters';
+const { t } = useI18n();
+
+const $props = defineProps({
+    data: {
+        type: Object,
+        required: true,
+    },
+    onFilterTravelSelected: {
+        type: Function,
+        required: true,
+    },
+});
+</script>
+<template>
+    <VnSelectDialog
+        :label="t('entry.basicData.travel')"
+        v-bind="$attrs"
+        url="Travels/filter"
+        :fields="['id', 'warehouseInName']"
+        option-value="id"
+        option-label="warehouseInName"
+        map-options
+        hide-selected
+        :required="true"
+        action-icon="filter_alt"
+        :roles-allowed-to-create="['buyer']"
+    >
+        <template #form>
+            <FilterTravelForm @travel-selected="onFilterTravelSelected(data, $event)" />
+        </template>
+        <template #option="scope">
+            <QItem v-bind="scope.itemProps">
+                <QItemSection>
+                    <QItemLabel>
+                        {{ scope.opt?.agencyModeName }} -
+                        {{ scope.opt?.warehouseInName }}
+                        ({{ toDate(scope.opt?.shipped) }}) →
+                        {{ scope.opt?.warehouseOutName }}
+                        ({{ toDate(scope.opt?.landed) }})
+                    </QItemLabel>
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnSelectDialog>
+</template>
--- a/src/components/common/tests/VnNotes.spec.js
+++ b/src/components/common/tests/VnNotes.spec.js
@ -1,51 +1,78 @@
-import { describe, it, expect, vi, beforeAll, afterEach, beforeEach } from 'vitest';
+import {
+    describe,
+    it,
+    expect,
+    vi,
+    beforeAll,
+    afterEach,
+    beforeEach,
+    afterAll,
+} from 'vitest';
 import { createWrapper, axios } from 'app/test/vitest/helper';
 import VnNotes from 'src/components/ui/VnNotes.vue';
+import vnDate from 'src/boot/vnDate';

 describe('VnNotes', () => {
    let vm;
    let wrapper;
    let spyFetch;
    let postMock;
-    let expectedBody;
-    const mockData= {name: 'Tony', lastName: 'Stark', text: 'Test Note', observationTypeFk: 1};
-
-    function generateExpectedBody() {
-        expectedBody = {...vm.$props.body, ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk }};
-    }
-
-    async function setTestParams(text, observationType, type){
-        vm.newNote.text = text;
-        vm.newNote.observationTypeFk = observationType;
-        wrapper.setProps({ selectType: type });
-    }
-
-    beforeAll(async () => {        
-        vi.spyOn(axios, 'get').mockReturnValue({ data: [] });
-
+    let patchMock;
+    let expectedInsertBody;
+    let expectedUpdateBody;
+    const defaultOptions = {
+        url: '/test',
+        body: { name: 'Tony', lastName: 'Stark' },
+        selectType: false,
+        saveUrl: null,
+        justInput: false,
+    };
+    function generateWrapper(
+        options = defaultOptions,
+        text = null,
+        observationType = null,
+    ) {
+        vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
        wrapper = createWrapper(VnNotes, {
-            propsData: {
-                url: '/test',
-                body: { name: 'Tony', lastName: 'Stark' },
-            }
+            propsData: options,
        });
        wrapper = wrapper.wrapper;
        vm = wrapper.vm;
-    });
+        vm.newNote.text = text;
+        vm.newNote.observationTypeFk = observationType;
+    }
+
+    function createSpyFetch() {
+        spyFetch = vi.spyOn(vm.$refs.vnPaginateRef, 'fetch');
+    }
+
+    function generateExpectedBody() {
+        expectedInsertBody = {
+            ...vm.$props.body,
+            ...{ text: vm.newNote.text, observationTypeFk: vm.newNote.observationTypeFk },
+        };
+        expectedUpdateBody = { ...vm.$props.body, ...{ notes: vm.newNote.text } };
+    }

    beforeEach(() => {
-        postMock = vi.spyOn(axios, 'post').mockResolvedValue(mockData);
-        spyFetch = vi.spyOn(vm.vnPaginateRef, 'fetch').mockImplementation(() => vi.fn());
+        postMock = vi.spyOn(axios, 'post');
+        patchMock = vi.spyOn(axios, 'patch');
    });

    afterEach(() => {
        vi.clearAllMocks();
-        expectedBody = {};
+        expectedInsertBody = {};
+        expectedUpdateBody = {};
+    });
+
+    afterAll(() => {
+        vi.restoreAllMocks();
    });

    describe('insert', () => {
-        it('should not call axios.post and vnPaginateRef.fetch if newNote.text is null', async () => {
-            await setTestParams( null, null, true );
+        it('should not call axios.post and vnPaginateRef.fetch when newNote.text is null', async () => {
+            generateWrapper({ selectType: true });
+            createSpyFetch();

            await vm.insert();

@ -53,8 +80,9 @@ describe('VnNotes', () => {
            expect(spyFetch).not.toHaveBeenCalled();
        });

-        it('should not call axios.post and vnPaginateRef.fetch if newNote.text is empty', async () => {
-            await setTestParams( "", null, false );
+        it('should not call axios.post and vnPaginateRef.fetch when newNote.text is empty', async () => {
+            generateWrapper(null, '');
+            createSpyFetch();

            await vm.insert();

@ -62,8 +90,9 @@ describe('VnNotes', () => {
            expect(spyFetch).not.toHaveBeenCalled();
        });

-        it('should not call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is true', async () => {
-            await setTestParams( "Test Note", null, true );
+        it('should not call axios.post and vnPaginateRef.fetch when observationTypeFk is null and selectType is true', async () => {
+            generateWrapper({ selectType: true }, 'Test Note');
+            createSpyFetch();

            await vm.insert();

@ -71,37 +100,57 @@ describe('VnNotes', () => {
            expect(spyFetch).not.toHaveBeenCalled();
        });

-        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is missing and selectType is false', async () => {
-            await setTestParams( "Test Note", null, false );
-
+        it('should call axios.post and vnPaginateRef.fetch when observationTypeFk is missing and selectType is false', async () => {
+            generateWrapper(null, 'Test Note');
+            createSpyFetch();
            generateExpectedBody();

            await vm.insert();

-            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
-            expect(spyFetch).toHaveBeenCalled();
-        });
-
-        it('should call axios.post and vnPaginateRef.fetch if observationTypeFk is setted and selectType is false', async () => {            
-            await setTestParams( "Test Note", 1, false );
-
-            generateExpectedBody();
-
-            await vm.insert();
-
-            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedInsertBody);
            expect(spyFetch).toHaveBeenCalled();
        });

        it('should call axios.post and vnPaginateRef.fetch when newNote is valid', async () => {
-            await setTestParams( "Test Note", 1, true );
-
+            generateWrapper({ selectType: true }, 'Test Note', 1);
+            createSpyFetch();
            generateExpectedBody();
-            
+
            await vm.insert();

-            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedBody);
+            expect(postMock).toHaveBeenCalledWith(vm.$props.url, expectedInsertBody);
            expect(spyFetch).toHaveBeenCalled();
        });
    });
-});
+
+    describe('update', () => {
+        it('should call axios.patch with saveUrl when saveUrl is set and justInput is true', async () => {
+            generateWrapper({
+                url: '/business',
+                justInput: true,
+                saveUrl: '/saveUrlTest',
+            });
+            generateExpectedBody();
+
+            await vm.update();
+
+            expect(patchMock).toHaveBeenCalledWith(vm.$props.saveUrl, expectedUpdateBody);
+        });
+
+        it('should call axios.patch with url when saveUrl is not set and justInput is true', async () => {
+            generateWrapper({
+                url: '/business',
+                body: { workerFk: 1110 },
+                justInput: true,
+            });
+            generateExpectedBody();
+
+            await vm.update();
+
+            expect(patchMock).toHaveBeenCalledWith(
+                `${vm.$props.url}/${vm.$props.body.workerFk}`,
+                expectedUpdateBody,
+            );
+        });
+    });
+});
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@ -6,6 +6,7 @@ import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useState } from 'src/composables/useState';
 import { useRoute } from 'vue-router';
+import { useClipboard } from 'src/composables/useClipboard';
 import VnMoreOptions from './VnMoreOptions.vue';

 const $props = defineProps({
@ -29,10 +30,6 @@ const $props = defineProps({
        type: String,
        default: null,
    },
-    module: {
-        type: String,
-        default: null,
-    },
    summary: {
        type: Object,
        default: null,
@ -46,6 +43,7 @@ const $props = defineProps({
 const state = useState();
 const route = useRoute();
 const { t } = useI18n();
+const { copyText } = useClipboard();
 const { viewSummary } = useSummaryDialog();
 let arrayData;
 let store;
@ -57,12 +55,13 @@ defineExpose({ getData });
 onBeforeMount(async () => {
    arrayData = useArrayData($props.dataKey, {
        url: $props.url,
-        filter: $props.filter,
+        userFilter: $props.filter,
        skip: 0,
+        oneRecord: true,
    });
    store = arrayData.store;
    entity = computed(() => {
-        const data = (Array.isArray(store.data) ? store.data[0] : store.data) ?? {};
+        const data = store.data ?? {};
        if (data) emit('onFetch', data);
        return data;
    });
@ -73,7 +72,7 @@ onBeforeMount(async () => {
        () => [$props.url, $props.filter],
        async () => {
            if (!isSameDataKey.value) await getData();
-        }
+        },
    );
 });

@ -84,7 +83,7 @@ async function getData() {
    try {
        const { data } = await arrayData.fetch({ append: false, updateRouter: false });
        state.set($props.dataKey, data);
-        emit('onFetch', Array.isArray(data) ? data[0] : data);
+        emit('onFetch', data);
    } finally {
        isLoading.value = false;
    }
@ -102,13 +101,21 @@ function getValueFromPath(path) {
    return current;
 }

+function copyIdText(id) {
+    copyText(id, {
+        component: {
+            copyValue: id,
+        },
+    });
+}
+
 const emit = defineEmits(['onFetch']);

 const iconModule = computed(() => route.matched[1].meta.icon);
 const toModule = computed(() =>
    route.matched[1].path.split('/').length > 2
        ? route.matched[1].redirect
-        : route.matched[1].children[0].redirect
+        : route.matched[1].children[0].redirect,
 );
 </script>

@ -147,7 +154,9 @@ const toModule = computed(() =>
                        {{ t('components.smartCard.openSummary') }}
                    </QTooltip>
                </QBtn>
-                <RouterLink :to="{ name: `${module}Summary`, params: { id: entity.id } }">
+                <RouterLink
+                    :to="{ name: `${dataKey}Summary`, params: { id: entity.id } }"
+                >
                    <QBtn
                        class="link"
                        color="white"
@ -183,10 +192,25 @@ const toModule = computed(() =>
                            </slot>
                        </div>
                    </QItemLabel>
-                    <QItem dense>
-                        <QItemLabel class="subtitle" caption>
+                    <QItem>
+                        <QItemLabel class="subtitle">
                            #{{ getValueFromPath(subtitle) ?? entity.id }}
                        </QItemLabel>
+
+                        <QBtn
+                            round
+                            flat
+                            dense
+                            size="sm"
+                            icon="content_copy"
+                            color="primary"
+                            @click.stop="copyIdText(entity.id)"
+                        >
+                            <QTooltip>
+                                {{ t('globals.copyId') }}
+                            </QTooltip>
+                        </QBtn>
+                        <!-- </QItemLabel> -->
                    </QItem>
                </QList>
                <div class="list-box q-mt-xs">
@ -293,3 +317,11 @@ const toModule = computed(() =>
    }
 }
 </style>
+<i18n>
+    en:
+        globals:
+            copyId: Copy ID
+    es:
+        globals:
+            copyId: Copiar ID
+</i18n>
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@ -40,9 +40,10 @@ const arrayData = useArrayData(props.dataKey, {
    filter: props.filter,
    userFilter: props.userFilter,
    skip: 0,
+    oneRecord: true,
 });
 const { store } = arrayData;
-const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
+const entity = computed(() => store.data);
 const isLoading = ref(false);

 defineExpose({
@ -61,7 +62,7 @@ async function fetch() {
    store.filter = props.filter ?? {};
    isLoading.value = true;
    const { data } = await arrayData.fetch({ append: false, updateRouter: false });
-    emit('onFetch', Array.isArray(data) ? data[0] : data);
+    emit('onFetch', data);
    isLoading.value = false;
 }
 </script>
@ -208,4 +209,13 @@ async function fetch() {
 .summaryHeader {
    color: $white;
 }
+
+.cardSummary :deep(.q-card__section[content]) {
+    display: flex;
+    flex-wrap: wrap;
+    padding: 0;
+    > * {
+        flex: 1;
+    }
+}
 </style>
--- a/src/components/ui/SkeletonDescriptor.vue
+++ b/src/components/ui/SkeletonDescriptor.vue
@ -1,53 +1,32 @@
+<script setup>
+defineProps({
+    hasImage: {
+        type: Boolean,
+        default: false,
+    },
+});
+</script>
 <template>
-    <div id="descriptor-skeleton">
+    <div id="descriptor-skeleton" class="bg-vn-page">
        <div class="row justify-between q-pa-sm">
-            <QSkeleton square size="40px" />
-            <QSkeleton square size="40px" />
-            <QSkeleton square height="40px" width="20px" />
+            <QSkeleton square size="30px" v-for="i in 3" :key="i" />
        </div>
-        <div class="col justify-between q-pa-sm q-gutter-y-xs">
-            <QSkeleton square height="40px" width="150px" />
-            <QSkeleton square height="30px" width="70px" />
+        <div class="q-pa-xs" v-if="hasImage">
+            <QSkeleton square height="200px" width="100%" />
        </div>
-        <div class="col q-pl-sm q-pa-sm q-mb-md">
-            <div class="row justify-between">
-                <QSkeleton type="text" square height="30px" width="20%" />
-                <QSkeleton type="text" square height="30px" width="60%" />
-            </div>
-            <div class="row justify-between">
-                <QSkeleton type="text" square height="30px" width="20%" />
-                <QSkeleton type="text" square height="30px" width="60%" />
-            </div>
-            <div class="row justify-between">
-                <QSkeleton type="text" square height="30px" width="20%" />
-                <QSkeleton type="text" square height="30px" width="60%" />
-            </div>
-            <div class="row justify-between">
-                <QSkeleton type="text" square height="30px" width="20%" />
-                <QSkeleton type="text" square height="30px" width="60%" />
-            </div>
-            <div class="row justify-between">
-                <QSkeleton type="text" square height="30px" width="20%" />
-                <QSkeleton type="text" square height="30px" width="60%" />
-            </div>
-            <div class="row justify-between">
-                <QSkeleton type="text" square height="30px" width="20%" />
-                <QSkeleton type="text" square height="30px" width="60%" />
+        <div class="col justify-between q-pa-md q-gutter-y-xs">
+            <QSkeleton square height="25px" width="150px" />
+            <QSkeleton square height="15px" width="70px" />
+        </div>
+        <div class="q-pl-sm q-pa-sm q-mb-md">
+            <div class="row q-gutter-x-sm q-pa-none q-ma-none" v-for="i in 5" :key="i">
+                <QSkeleton type="text" square height="20px" width="30%" />
+                <QSkeleton type="text" square height="20px" width="60%" />
            </div>
        </div>

-        <QCardActions>
-            <QSkeleton size="40px" />
-            <QSkeleton size="40px" />
-            <QSkeleton size="40px" />
-            <QSkeleton size="40px" />
-            <QSkeleton size="40px" />
+        <QCardActions class="q-gutter-x-sm justify-between">
+            <QSkeleton size="40px" v-for="i in 5" :key="i" />
        </QCardActions>
    </div>
 </template>
-
-<style lang="scss" scoped>
-#descriptor-skeleton .q-card__actions {
-    justify-content: space-between;
-}
-</style>
--- a/src/components/ui/VnConfirm.vue
+++ b/src/components/ui/VnConfirm.vue
@ -82,7 +82,7 @@ function cancel() {
                    @click="cancel()"
                />
            </QCardSection>
-            <QCardSection class="q-pb-none">
+            <QCardSection class="q-pb-none" data-cy="VnConfirm_message">
                <span v-if="message !== false" v-html="message" />
            </QCardSection>
            <QCardSection class="row items-center q-pt-none">
@ -95,6 +95,7 @@ function cancel() {
                    :disable="isLoading"
                    flat
                    @click="cancel()"
+                    data-cy="VnConfirm_cancel"
                />
                <QBtn
                    :label="t('globals.confirm')"
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@ -114,7 +114,7 @@ async function clearFilters() {
        arrayData.resetPagination();
        // Filtrar los params no removibles
        const removableFilters = Object.keys(userParams.value).filter((param) =>
-            $props.unremovableParams.includes(param)
+            $props.unremovableParams.includes(param),
        );
        const newParams = {};
        // Conservar solo los params que no son removibles
@ -162,13 +162,13 @@ const formatTags = (tags) => {

 const tags = computed(() => {
    const filteredTags = tagsList.value.filter(
-        (tag) => !($props.customTags || []).includes(tag.label)
+        (tag) => !($props.customTags || []).includes(tag.label),
    );
    return formatTags(filteredTags);
 });

 const customTags = computed(() =>
-    tagsList.value.filter((tag) => ($props.customTags || []).includes(tag.label))
+    tagsList.value.filter((tag) => ($props.customTags || []).includes(tag.label)),
 );

 async function remove(key) {
@ -188,10 +188,13 @@ function formatValue(value) {
 const getLocale = (label) => {
    const param = label.split('.').at(-1);
    const globalLocale = `globals.params.${param}`;
+    const moduleName = route.meta.moduleName;
+    const moduleLocale = `${moduleName.toLowerCase()}.${param}`;
    if (te(globalLocale)) return t(globalLocale);
-    else if (te(t(`params.${param}`)));
+    else if (te(moduleLocale)) return t(moduleLocale);
    else {
-        const camelCaseModuleName = route.meta.moduleName.charAt(0).toLowerCase() + route.meta.moduleName.slice(1);    
+        const camelCaseModuleName =
+            moduleName.charAt(0).toLowerCase() + moduleName.slice(1);
        return t(`${camelCaseModuleName}.params.${param}`);
    }
 };
@ -290,6 +293,9 @@ const getLocale = (label) => {
    />
 </template>
 <style scoped lang="scss">
+.q-field__label.no-pointer-events.absolute.ellipsis {
+    margin-left: 6px !important;
+}
 .list {
    width: 256px;
 }
--- a/src/components/ui/VnMoreOptions.vue
+++ b/src/components/ui/VnMoreOptions.vue
@ -11,7 +11,7 @@
        <QTooltip>
            {{ $t('components.cardDescriptor.moreOptions') }}
        </QTooltip>
-        <QMenu ref="menuRef">
+        <QMenu ref="menuRef" data-cy="descriptor-more-opts-menu">
            <QList>
                <slot name="menu" :menu-ref="$refs.menuRef" />
            </QList>
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { ref, reactive } from 'vue';
+import { ref, reactive, useAttrs, computed } from 'vue';
 import { onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@ -16,12 +16,27 @@ import VnSelect from 'components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInput from 'components/common/VnInput.vue';

+const emit = defineEmits(['onFetch']);
+
+const originalAttrs = useAttrs();
+
+const $attrs = computed(() => {
+    const { style, ...rest } = originalAttrs;
+    return rest;
+});
+
+const isRequired = computed(() => {
+    return Object.keys($attrs).includes('required')
+});
+
 const $props = defineProps({
    url: { type: String, default: null },
+    saveUrl: {type: String, default: null},
    filter: { type: Object, default: () => {} },
    body: { type: Object, default: () => {} },
    addNote: { type: Boolean, default: false },
    selectType: { type: Boolean, default: false },
+    justInput: { type: Boolean, default: false },
 });

 const { t } = useI18n();
@ -29,6 +44,13 @@ const quasar = useQuasar();
 const newNote = reactive({ text: null, observationTypeFk: null });
 const observationTypes = ref([]);
 const vnPaginateRef = ref();
+let originalText;
+
+function handleClick(e) {
+    if (e.shiftKey && e.key === 'Enter') return;
+    if ($props.justInput) confirmAndUpdate();
+    else insert();
+}

 async function insert() {
    if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
@ -41,8 +63,36 @@ async function insert() {
    await axios.post($props.url, newBody);
    await vnPaginateRef.value.fetch();
 }
+
+function confirmAndUpdate() {
+    if(!newNote.text && originalText)
+        quasar
+            .dialog({
+                component: VnConfirm,
+                componentProps: {
+                    title: t('New note is empty'),
+                    message: t('Are you sure remove this note?'),
+                },
+            })
+            .onOk(update)
+            .onCancel(() => {
+                newNote.text = originalText;
+            });
+    else update();
+}
+
+async function update() {
+    originalText = newNote.text;
+    const body = $props.body;
+    const newBody = {
+        ...body,
+        ...{ notes: newNote.text },
+    };
+    await axios.patch(`${$props.saveUrl ?? `${$props.url}/${$props.body.workerFk}`}`, newBody);
+}
+
 onBeforeRouteLeave((to, from, next) => {
-    if (newNote.text)
+    if ((newNote.text && !$props.justInput) || (newNote.text !== originalText) && $props.justInput)
        quasar.dialog({
            component: VnConfirm,
            componentProps: {
@ -53,6 +103,13 @@ onBeforeRouteLeave((to, from, next) => {
        });
    else next();
 });
+
+function fetchData([ data ]) {
+    newNote.text = data?.notes;
+    originalText = data?.notes;
+    emit('onFetch', data);
+}
+
 </script>
 <template>
    <FetchData
@ -62,8 +119,19 @@ onBeforeRouteLeave((to, from, next) => {
        auto-load
        @on-fetch="(data) => (observationTypes = data)"
    />
-    <QCard class="q-pa-xs q-mb-lg full-width" v-if="$props.addNote">
-        <QCardSection horizontal>
+    <FetchData
+        v-if="justInput"
+        :url="url"
+        :filter="filter"
+        @on-fetch="fetchData"
+        auto-load
+    />
+    <QCard 
+        class="q-pa-xs q-mb-lg full-width" 
+        :class="{ 'just-input': $props.justInput }"
+        v-if="$props.addNote || $props.justInput"
+    >
+        <QCardSection horizontal v-if="!$props.justInput">
            {{ t('New note') }}
        </QCardSection>
        <QCardSection class="q-px-xs q-my-none q-py-none">
@ -75,19 +143,19 @@ onBeforeRouteLeave((to, from, next) => {
                    v-model="newNote.observationTypeFk"
                    option-label="description"
                    style="flex: 0.15"
-                    :required="true"
+                    :required="isRequired"
                    @keyup.enter.stop="insert"
                />
                <VnInput
                    v-model.trim="newNote.text"
                    type="textarea"
-                    :label="t('Add note here...')"
+                    :label="$props.justInput && newNote.text ? '' : t('Add note here...')"
                    filled
                    size="lg"
                    autogrow
-                    @keyup.enter.stop="insert"
+                    @keyup.enter.stop="handleClick"
+                    :required="isRequired"
                    clearable
-                    :required="true"
                >
                    <template #append>
                        <QBtn
@ -95,7 +163,7 @@ onBeforeRouteLeave((to, from, next) => {
                            icon="save"
                            color="primary"
                            flat
-                            @click="insert"
+                            @click="handleClick"
                            class="q-mb-xs"
                            dense
                            data-cy="saveNote"
@ -106,6 +174,7 @@ onBeforeRouteLeave((to, from, next) => {
        </QCardSection>
    </QCard>
    <VnPaginate
+        v-if="!$props.justInput"
        :data-key="$props.url"
        :url="$props.url"
        order="created DESC"
@ -198,6 +267,11 @@ onBeforeRouteLeave((to, from, next) => {
        }
    }
 }
+.just-input {
+    padding-right: 18px;
+    margin-bottom: 2px;
+    box-shadow: none;
+}
 </style>
 <i18n>
    es:
@ -205,4 +279,6 @@ onBeforeRouteLeave((to, from, next) => {
        New note: Nueva nota
        Save (Enter): Guardar (Intro)
        Observation type: Tipo de observación
+        New note is empty: La nueva nota esta vacia
+        Are you sure remove this note?: Estas seguro de quitar esta nota?
 </i18n>
--- a/src/components/ui/VnStockValueDisplay.vue
+++ b/src/components/ui/VnStockValueDisplay.vue
@ -0,0 +1,41 @@
+<script setup>
+import { toPercentage } from 'filters/index';
+
+import { computed } from 'vue';
+
+const props = defineProps({
+    value: {
+        type: Number,
+        required: true,
+    },
+});
+
+const valueClass = computed(() =>
+    props.value === 0 ? 'neutral' : props.value > 0 ? 'positive' : 'negative',
+);
+const iconName = computed(() =>
+    props.value === 0 ? 'equal' : props.value > 0 ? 'arrow_upward' : 'arrow_downward',
+);
+const formattedValue = computed(() => props.value);
+</script>
+<template>
+    <span :class="valueClass">
+        <QIcon :name="iconName" size="sm" class="value-icon" />
+        {{ toPercentage(formattedValue) }}
+    </span>
+</template>
+
+<style lang="scss" scoped>
+.positive {
+    color: $secondary;
+}
+.negative {
+    color: $negative;
+}
+.neutral {
+    color: $primary;
+}
+.value-icon {
+    margin-right: 4px;
+}
+</style>
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@ -19,23 +19,26 @@ onMounted(() => {
    const observer = new MutationObserver(
        () =>
            (hasContent.value =
-                actions.value?.childNodes?.length + data.value?.childNodes?.length)
+                actions.value?.childNodes?.length + data.value?.childNodes?.length),
    );
    if (actions.value) observer.observe(actions.value, opts);
    if (data.value) observer.observe(data.value, opts);
 });

-onBeforeUnmount(() => stateStore.toggleSubToolbar());
+const actionsChildCount = () => !!actions.value?.childNodes?.length;
+
+onBeforeUnmount(() => stateStore.toggleSubToolbar() && hasSubToolbar);
 </script>

 <template>
    <QToolbar
        id="subToolbar"
-        class="justify-end sticky"
        v-show="hasContent || $slots['st-actions'] || $slots['st-data']"
+        class="justify-end sticky"
    >
        <slot name="st-data">
-            <div id="st-data"></div>
+            <div id="st-data" :class="{ 'full-width': !actionsChildCount() }">
+            </div>
        </slot>
        <QSpace />
        <slot name="st-actions">
--- a/src/components/ui/VnUsesMana.vue
+++ b/src/components/ui/VnUsesMana.vue
@ -53,3 +53,8 @@ const manaCode = ref(props.manaCode);
        />
    </div>
 </template>
+<i18n>
+    es:
+        Promotion mana: Maná promoción
+        Claim mana: Maná reclamación
+</i18n>
--- a/src/components/ui/tests/CardSummary.spec.js
+++ b/src/components/ui/tests/CardSummary.spec.js
@ -51,16 +51,6 @@ describe('CardSummary', () => {
        expect(vm.store.filter).toEqual('cardFilter');
    });

-    it('should compute entity correctly from store data', () => {
-        vm.store.data = [{ id: 1, name: 'Entity 1' }];
-        expect(vm.entity).toEqual({ id: 1, name: 'Entity 1' });
-    });
-
-    it('should handle empty data gracefully', () => {
-        vm.store.data = [];
-        expect(vm.entity).toBeUndefined();
-    });
-
    it('should respond to prop changes and refetch data', async () => {
        const newUrl = 'CardSummary/35';
        const newKey = 'cardSummaryKey/35';
@ -72,7 +62,7 @@ describe('CardSummary', () => {
        expect(vm.store.filter).toEqual({ key: newKey });
    });

-    it('should return true if route path ends with /summary' , () => {
+    it('should return true if route path ends with /summary', () => {
        expect(vm.isSummary).toBe(true);
    });
-});
+});
--- a/src/composables/tests/useArrayData.spec.js
+++ b/src/composables/tests/useArrayData.spec.js
@ -16,7 +16,7 @@ describe('useArrayData', () => {
        vi.clearAllMocks();
    });

-    it('should fetch and repalce url with new params', async () => {
+    it('should fetch and replace url with new params', async () => {
        vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });

        const arrayData = useArrayData('ArrayData', { url: 'mockUrl' });
@ -33,11 +33,11 @@ describe('useArrayData', () => {
        });
        expect(routerReplace.path).toEqual('mockSection/list');
        expect(JSON.parse(routerReplace.query.params)).toEqual(
-            expect.objectContaining(params)
+            expect.objectContaining(params),
        );
    });

-    it('Should get data and send new URL without keeping parameters, if there is only one record', async () => {
+    it('should get data and send new URL without keeping parameters, if there is only one record', async () => {
        vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }] });

        const arrayData = useArrayData('ArrayData', { url: 'mockUrl', navigate: {} });
@ -56,7 +56,7 @@ describe('useArrayData', () => {
        expect(routerPush.query).toBeUndefined();
    });

-    it('Should get data and send new URL keeping parameters, if you have more than one record', async () => {
+    it('should get data and send new URL keeping parameters, if you have more than one record', async () => {
        vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [{ id: 1 }, { id: 2 }] });

        vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
@ -95,4 +95,25 @@ describe('useArrayData', () => {
        expect(routerPush.path).toEqual('mockName/');
        expect(routerPush.query.params).toBeDefined();
    });
+
+    it('should return one record', async () => {
+        vi.spyOn(axios, 'get').mockReturnValueOnce({
+            data: [
+                { id: 1, name: 'Entity 1' },
+                { id: 2, name: 'Entity 2' },
+            ],
+        });
+        const arrayData = useArrayData('ArrayData', { url: 'mockUrl', oneRecord: true });
+        await arrayData.fetch({});
+
+        expect(arrayData.store.data).toEqual({ id: 1, name: 'Entity 1' });
+    });
+
+    it('should handle empty data gracefully if has to return one record', async () => {
+        vi.spyOn(axios, 'get').mockReturnValueOnce({ data: [] });
+        const arrayData = useArrayData('ArrayData', { url: 'mockUrl', oneRecord: true });
+        await arrayData.fetch({});
+
+        expect(arrayData.store.data).toBeUndefined();
+    });
 });
--- a/src/composables/tests/useRequired.spec.js
+++ b/src/composables/tests/useRequired.spec.js
@ -0,0 +1,66 @@
+import { describe, it, expect, vi } from 'vitest';
+import { useRequired } from '../useRequired';
+
+vi.mock('../useValidator', () => ({
+    useValidator: () => ({
+        validations: () => ({
+            required: vi.fn((isRequired, val) => {
+                if (!isRequired) return true;
+                return val !== null && val !== undefined && val !== '';
+            }),
+        }),
+    }),
+}));
+
+describe('useRequired', () => {
+    it('should detect required when attr is boolean true', () => {
+        const attrs = { required: true };
+        const { isRequired } = useRequired(attrs);
+        expect(isRequired).toBe(true);
+    });
+
+    it('should detect required when attr is boolean false', () => {
+        const attrs = { required: false };
+        const { isRequired } = useRequired(attrs);
+        expect(isRequired).toBe(false);
+    });
+
+    it('should detect required when attr exists without value', () => {
+        const attrs = { required: '' };
+        const { isRequired } = useRequired(attrs);
+        expect(isRequired).toBe(true);
+    });
+
+    it('should return false when required attr does not exist', () => {
+        const attrs = { someOtherAttr: 'value' };
+        const { isRequired } = useRequired(attrs);
+        expect(isRequired).toBe(false);
+    });
+
+    describe('requiredFieldRule', () => {
+        it('should validate required field with value', () => {
+            const attrs = { required: true };
+            const { requiredFieldRule } = useRequired(attrs);
+            expect(requiredFieldRule('some value')).toBe(true);
+        });
+
+        it('should validate required field with empty value', () => {
+            const attrs = { required: true };
+            const { requiredFieldRule } = useRequired(attrs);
+            expect(requiredFieldRule('')).toBe(false);
+        });
+
+        it('should pass validation when field is not required', () => {
+            const attrs = { required: false };
+            const { requiredFieldRule } = useRequired(attrs);
+            expect(requiredFieldRule('')).toBe(true);
+        });
+
+        it('should handle null and undefined values', () => {
+            const attrs = { required: true };
+            const { requiredFieldRule } = useRequired(attrs);
+            expect(requiredFieldRule(null)).toBe(false);
+            expect(requiredFieldRule(undefined)).toBe(false);
+        });
+    });
+});
--- a/src/composables/checkEntryLock.js
+++ b/src/composables/checkEntryLock.js
@ -0,0 +1,65 @@
+import { useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import axios from 'axios';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+
+export async function checkEntryLock(entryFk, userFk) {
+    const { t } = useI18n();
+    const quasar = useQuasar();
+    const { push } = useRouter();
+    const { data } = await axios.get(`Entries/${entryFk}`, {
+        params: {
+            filter: JSON.stringify({
+                fields: ['id', 'locked', 'lockerUserFk'],
+                include: { relation: 'user', scope: { fields: ['id', 'nickname'] } },
+            }),
+        },
+    });
+    const entryConfig = await axios.get('EntryConfigs/findOne');
+
+    if (data?.lockerUserFk && data?.locked) {
+        const now = new Date(Date.vnNow()).getTime();
+        const lockedTime = new Date(data.locked).getTime();
+        const timeDiff = (now - lockedTime) / 1000;
+        const isMaxTimeLockExceeded = entryConfig.data.maxLockTime > timeDiff;
+
+        if (data?.lockerUserFk !== userFk && isMaxTimeLockExceeded) {
+            quasar
+                .dialog({
+                    component: VnConfirm,
+                    componentProps: {
+                        'data-cy': 'entry-lock-confirm',
+                        title: t('entry.lock.title'),
+                        message: t('entry.lock.message', {
+                            userName: data?.user?.nickname,
+                            time: timeDiff / 60,
+                        }),
+                    },
+                })
+                .onOk(
+                    async () =>
+                        await axios.patch(`Entries/${entryFk}`, {
+                            locked: Date.vnNow(),
+                            lockerUserFk: userFk,
+                        }),
+                )
+                .onCancel(() => {
+                    push({ path: `summary` });
+                });
+        }
+    } else {
+        await axios
+            .patch(`Entries/${entryFk}`, {
+                locked: Date.vnNow(),
+                lockerUserFk: userFk,
+            })
+            .then(
+                quasar.notify({
+                    message: t('entry.lock.success'),
+                    color: 'positive',
+                    group: false,
+                }),
+            );
+    }
+}
--- a/src/composables/getColAlign.js
+++ b/src/composables/getColAlign.js
@ -0,0 +1,22 @@
+export function getColAlign(col) {
+    let align;
+    switch (col.component) {
+        case 'time':
+        case 'date':
+        case 'select':
+            align = 'left';
+            break;
+        case 'number':
+            align = 'right';
+            break;
+        case 'checkbox':
+            align = 'center';
+            break;
+        default:
+            align = col?.align;
+    }
+
+    if (/^is[A-Z]/.test(col.name) || /^has[A-Z]/.test(col.name)) align = 'center';
+
+    return 'text-' + (align ?? 'center');
+}
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@ -57,6 +57,7 @@ export function useArrayData(key, userOptions) {
            'navigate',
            'mapKey',
            'keepData',
+            'oneRecord',
        ];
        if (typeof userOptions === 'object') {
            for (const option in userOptions) {
@ -112,7 +113,11 @@ export function useArrayData(key, userOptions) {
        store.isLoading = false;
        canceller = null;

-        processData(response.data, { map: !!store.mapKey, append });
+        processData(response.data, {
+            map: !!store.mapKey,
+            append,
+            oneRecord: store.oneRecord,
+        });

        return response;
    }
@ -314,7 +319,11 @@ export function useArrayData(key, userOptions) {
        return { params, limit };
    }

-    function processData(data, { map = true, append = true }) {
+    function processData(data, { map = true, append = true, oneRecord = false }) {
+        if (oneRecord) {
+            store.data = Array.isArray(data) ? data[0] : data;
+            return;
+        }
        if (!append) {
            store.data = [];
            store.map = new Map();
--- a/src/composables/useCau.js
+++ b/src/composables/useCau.js
@ -11,7 +11,7 @@ export async function useCau(res, message) {
    const { config, headers, request, status, statusText, data } = res || {};
    const { params, url, method, signal, headers: confHeaders } = config || {};
    const { message: resMessage, code, name } = data?.error || {};
-    delete confHeaders.Authorization;
+    delete confHeaders?.Authorization;

    const additionalData = {
        path: location.hash,
--- a/src/composables/useRequired.js
+++ b/src/composables/useRequired.js
@ -2,14 +2,10 @@ import { useValidator } from 'src/composables/useValidator';

 export function useRequired($attrs) {
    const { validations } = useValidator();
-    const hasRequired = Object.keys($attrs).includes('required');
-    let isRequired = false;
-    if (hasRequired) {
-        const required = $attrs['required'];
-        if (typeof required === 'boolean') {
-            isRequired = required;
-        }
-    }
+    const isRequired =
+        typeof $attrs['required'] === 'boolean'
+            ? $attrs['required']
+            : Object.keys($attrs).includes('required');
    const requiredFieldRule = (val) => validations().required(isRequired, val);

    return {
--- a/src/composables/useRole.js
+++ b/src/composables/useRole.js
@ -27,6 +27,15 @@ export function useRole() {

        return false;
    }
+    function likeAny(roles) {
+        const roleStore = state.getRoles();
+        for (const role of roles) {
+            if (!roleStore.value.findIndex((rs) => rs.startsWith(role)) !== -1)
+                return true;
+        }
+
+        return false;
+    }
    function isEmployee() {
        return hasAny(['employee']);
    }
@ -35,6 +44,7 @@ export function useRole() {
        isEmployee,
        fetch,
        hasAny,
+        likeAny,
        state,
    };
 }
--- a/src/css/app.scss
+++ b/src/css/app.scss
@ -21,7 +21,10 @@ body.body--light {
    .q-header .q-toolbar {
        color: var(--vn-text-color);
    }
+
+    --vn-color-negative: $negative;
 }
+
 body.body--dark {
    --vn-header-color: #5d5d5d;
    --vn-page-color: #222;
@ -37,6 +40,8 @@ body.body--dark {
    --vn-text-color-contrast: black;

    background-color: var(--vn-page-color);
+
+    --vn-color-negative: $negative;
 }

 a {
@ -75,7 +80,6 @@ a {
    text-decoration: underline;
 }

-// Removes chrome autofill background
 input:-webkit-autofill,
 select:-webkit-autofill {
    color: var(--vn-text-color);
@ -149,11 +153,6 @@ select:-webkit-autofill {
    cursor: pointer;
 }

-.vn-table-separation-row {
-    height: 16px !important;
-    background-color: var(--vn-section-color) !important;
-}
-
 /* Estilo para el asterisco en campos requeridos */
 .q-field.required .q-field__label:after {
    content: ' *';
@ -212,6 +211,10 @@ select:-webkit-autofill {
    justify-content: center;
 }

+.q-card__section[dense] {
+    padding: 0;
+}
+
 input[type='number'] {
    -moz-appearance: textfield;
 }
@ -226,10 +229,12 @@ input::-webkit-inner-spin-button {
    max-width: 100%;
 }

-.q-table__container {
-    /* ===== Scrollbar CSS ===== /
-    / Firefox */
+.remove-bg {
+    filter: brightness(1.1);
+    mix-blend-mode: multiply;
+}

+.q-table__container {
    * {
        scrollbar-width: auto;
        scrollbar-color: var(--vn-label-color) transparent;
@ -270,8 +275,6 @@ input::-webkit-inner-spin-button {
            font-size: 11pt;
        }
        td {
-            font-size: 11pt;
-            border-top: 1px solid var(--vn-page-color);
            border-collapse: collapse;
        }
    }
@ -315,9 +318,6 @@ input::-webkit-inner-spin-button {
    max-width: fit-content;
 }

-.row > .column:has(.q-checkbox) {
-    max-width: fit-content;
-}
 .q-field__inner {
    .q-field__control {
        min-height: auto !important;
@ -335,3 +335,7 @@ input::-webkit-inner-spin-button {
    border: 1px solid;
    box-shadow: 0 4px 6px #00000000;
 }
+
+.containerShrinked {
+    width: 80%;
+}
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@ -13,7 +13,7 @@
 // Tip: Use the "Theme Builder" on Quasar's documentation website.
 // Tip: to add new colors https://quasar.dev/style/color-palette/#adding-your-own-colors
 $primary: #ec8916;
-$secondary: $primary;
+$secondary: #89be34;
 $positive: #c8e484;
 $negative: #fb5252;
 $info: #84d0e2;
@ -30,7 +30,9 @@ $color-spacer: #7979794d;
 $border-thin-light: 1px solid $color-spacer-light;
 $primary-light: #f5b351;
 $dark-shadow-color: black;
-$layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d;
+$layout-shadow-dark:
+    0 0 10px 2px #00000033,
+    0 0px 10px #0000003d;
 $spacing-md: 16px;
 $color-font-secondary: #777;
 $width-xs: 400px;
--- a/src/filters/toDate.js
+++ b/src/filters/toDate.js
@ -3,6 +3,8 @@ import { useI18n } from 'vue-i18n';
 export default function (value, options = {}) {
    if (!value) return;

+    if (!isValidDate(value)) return null;
+
    if (!options.dateStyle && !options.timeStyle) {
        options.day = '2-digit';
        options.month = '2-digit';
@ -10,7 +12,12 @@ export default function (value, options = {}) {
    }

    const { locale } = useI18n();
-    const date = new Date(value);
+    const newDate = new Date(value);

-    return new Intl.DateTimeFormat(locale.value, options).format(date);
+    return new Intl.DateTimeFormat(locale.value, options).format(newDate);
+}
+// handle 0000-00-00
+function isValidDate(date) {
+    const parsedDate = new Date(date);
+    return parsedDate instanceof Date && !isNaN(parsedDate.getTime());
 }
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@ -33,6 +33,7 @@ globals:
    reset: Reset
    close: Close
    cancel: Cancel
+    isSaveAndContinue: Save and continue
    clone: Clone
    confirm: Confirm
    assign: Assign
@ -48,6 +49,7 @@ globals:
    rowRemoved: Row removed
    pleaseWait: Please wait...
    noPinnedModules: You don't have any pinned modules
+    enterToConfirm: Press Enter to confirm
    summary:
        basicData: Basic data
    daysOnward: Days onward
@ -155,6 +157,7 @@ globals:
    changeState: Change state
    raid: 'Raid {daysInForward} days'
    isVies: Vies
+    noData: No data available
    pageTitles:
        logIn: Login
        addressEdit: Update address
@ -167,6 +170,7 @@ globals:
        workCenters: Work centers
        modes: Modes
        zones: Zones
+        negative: Negative
        zonesList: List
        deliveryDays: Delivery days
        upcomingDeliveries: Upcoming deliveries
@ -174,6 +178,7 @@ globals:
        alias: Alias
        aliasUsers: Users
        subRoles: Subroles
+        myAccount: Mi cuenta
        inheritedRoles: Inherited Roles
        customers: Customers
        customerCreate: New customer
@ -332,10 +337,13 @@ globals:
        wasteRecalc: Waste recaclulate
        operator: Operator
        parking: Parking
+        vehicleList: Vehicles
+        vehicle: Vehicle
    unsavedPopup:
        title: Unsaved changes will be lost
        subtitle: Are you sure exit without saving?
    params:
+        description: Description
        clientFk: Client id
        salesPersonFk: Sales person
        warehouseFk: Warehouse
@ -358,7 +366,13 @@ globals:
        correctingFk: Rectificative
        daysOnward: Days onward
        countryFk: Country
+        countryCodeFk: Country
        companyFk: Company
+    model: Model
+    fuel: Fuel
+    active: Active
+    inactive: Inactive
+    deliveryPoint: Delivery point
 errors:
    statusUnauthorized: Access denied
    statusInternalServerError: An internal server error has ocurred
@ -397,6 +411,106 @@ cau:
    subtitle: By sending this ticket, all the data related to the error, the section, the user, etc., are already sent.
    inputLabel: Explain why this error should not appear
    askPrivileges: Ask for privileges
+entry:
+    list:
+        newEntry: New entry
+        tableVisibleColumns:
+            isExcludedFromAvailable: Exclude from inventory
+            isOrdered: Ordered
+            isConfirmed: Ready to label
+            isReceived: Received
+            isRaid: Raid
+            landed: Date
+            supplierFk: Supplier
+            reference: Ref/Alb/Guide
+            invoiceNumber: Invoice
+            agencyModeId: Agency
+            isBooked: Booked
+            companyFk: Company
+            evaNotes: Notes
+            warehouseOutFk: Origin
+            warehouseInFk: Destiny
+            entryTypeDescription: Entry type
+            invoiceAmount: Import
+            travelFk: Travel
+    summary:
+        invoiceAmount: Amount
+        commission: Commission
+        currency: Currency
+        invoiceNumber: Invoice number
+        ordered: Ordered
+        booked: Booked
+        excludedFromAvailable: Inventory
+        travelReference: Reference
+        travelAgency: Agency
+        travelShipped: Shipped
+        travelDelivered: Delivered
+        travelLanded: Landed
+        travelReceived: Received
+        buys: Buys
+        stickers: Stickers
+        package: Package
+        packing: Pack.
+        grouping: Group.
+        buyingValue: Buying value
+        import: Import
+        pvp: PVP
+    basicData:
+        travel: Travel
+        currency: Currency
+        commission: Commission
+        observation: Observation
+        booked: Booked
+        excludedFromAvailable: Inventory
+    buys:
+        observations: Observations
+        packagingFk: Box
+        color: Color
+        printedStickers: Printed stickers
+    notes:
+        observationType: Observation type
+    latestBuys:
+        tableVisibleColumns:
+            image: Picture
+            itemFk: Item ID
+            weightByPiece: Weight/Piece
+            isActive: Active
+            family: Family
+            entryFk: Entry
+            freightValue: Freight value
+            comissionValue: Commission value
+            packageValue: Package value
+            isIgnored: Is ignored
+            price2: Grouping
+            price3: Packing
+            minPrice: Min
+            ektFk: Ekt
+            packingOut: Package out
+            landing: Landing
+            isExcludedFromAvailable: Exclude from inventory
+            isRaid: Raid
+            invoiceNumber: Invoice
+            reference: Ref/Alb/Guide
+    params:
+        isExcludedFromAvailable: Excluir del inventario
+        isOrdered: Pedida
+        isConfirmed: Lista para etiquetar
+        isReceived: Recibida
+        isRaid: Redada
+        landed: Fecha
+        supplierFk: Proveedor
+        invoiceNumber: Nº Factura
+        reference: Ref/Alb/Guía
+        agencyModeId: Agencia
+        isBooked: Asentado
+        companyFk: Empresa
+        travelFk: Envio
+        evaNotes: Notas
+        warehouseOutFk: Origen
+        warehouseInFk: Destino
+        entryTypeDescription: Tipo entrada
+        invoiceAmount: Importe
+        dated: Fecha
 ticket:
    params:
        ticketFk: Ticket ID
@ -626,6 +740,8 @@ wagon:
        name: Name

 supplier:
+    search: Search supplier
+    searchInfo: Search supplier by id or name
    list:
        payMethod: Pay method
        account: Account
@ -715,6 +831,8 @@ travel:
        CloneTravelAndEntries: Clone travel and his entries
        deleteTravel: Delete travel
        AddEntry: Add entry
+        availabled: Availabled
+        availabledHour: Availabled hour
        thermographs: Thermographs
        hb: HB
    basicData:
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@ -33,9 +33,11 @@ globals:
    reset: Restaurar
    close: Cerrar
    cancel: Cancelar
+    isSaveAndContinue: Guardar y continuar
    clone: Clonar
    confirm: Confirmar
    assign: Asignar
+    replace: Sustituir
    back: Volver
    yes: Si
    no: No
@ -48,6 +50,8 @@ globals:
    rowRemoved: Fila eliminada
    pleaseWait: Por favor espera...
    noPinnedModules: No has fijado ningún módulo
+    split: Split
+    enterToConfirm: Pulsa Enter para confirmar
    summary:
        basicData: Datos básicos
    daysOnward: Días adelante
@ -55,8 +59,8 @@ globals:
    today: Hoy
    yesterday: Ayer
    dateFormat: es-ES
-    microsip: Abrir en MicroSIP
    noSelectedRows: No tienes ninguna línea seleccionada
+    microsip: Abrir en MicroSIP
    downloadCSVSuccess: Descarga de CSV exitosa
    reference: Referencia
    agency: Agencia
@ -76,8 +80,10 @@ globals:
    requiredField: Campo obligatorio
    class: clase
    type: Tipo
-    reason: motivo
+    reason: Motivo
+    removeSelection: Eliminar selección
    noResults: Sin resultados
+    results: resultados
    system: Sistema
    notificationSent: Notificación enviada
    warehouse: Almacén
@ -155,6 +161,7 @@ globals:
    changeState: Cambiar estado
    raid: 'Redada {daysInForward} días'
    isVies: Vies
+    noData: Datos no disponibles
    pageTitles:
        logIn: Inicio de sesión
        addressEdit: Modificar consignatario
@ -166,6 +173,7 @@ globals:
        agency: Agencia
        workCenters: Centros de trabajo
        modes: Modos
+        negative: Tickets negativos
        zones: Zonas
        zonesList: Listado
        deliveryDays: Días de entrega
@ -286,9 +294,9 @@ globals:
        buyRequest: Peticiones de compra
        wasteBreakdown: Deglose de mermas
        itemCreate: Nuevo artículo
-        tax: 'IVA'
-        botanical: 'Botánico'
-        barcode: 'Código de barras'
+        tax: IVA
+        botanical: Botánico
+        barcode: Código de barras
        itemTypeCreate: Nueva familia
        family: Familia
        lastEntries: Últimas entradas
@ -332,10 +340,13 @@ globals:
        wasteRecalc: Recalcular mermas
        operator: Operario
        parking: Parking
+        vehicleList: Vehículos
+        vehicle: Vehículo
    unsavedPopup:
        title: Los cambios que no haya guardado se perderán
        subtitle: ¿Seguro que quiere salir sin guardar?
    params:
+        description: Descripción
        clientFk: Id cliente
        salesPersonFk: Comercial
        warehouseFk: Almacén
@ -349,13 +360,14 @@ globals:
        from: Desde
        to: Hasta
        supplierFk: Proveedor
-        supplierRef: Ref. proveedor
+        supplierRef: Nº factura
        serial: Serie
        amount: Importe
        awbCode: AWB
        daysOnward: Días adelante
        packing: ITP
        countryFk: País
+        countryCodeFk: País
        companyFk: Empresa
 errors:
    statusUnauthorized: Acceso denegado
@ -393,6 +405,87 @@ cau:
    subtitle: Al enviar este cau ya se envían todos los datos relacionados con el error, la sección, el usuario, etc
    inputLabel: Explique el motivo por el que no deberia aparecer este fallo
    askPrivileges: Solicitar permisos
+entry:
+    list:
+        newEntry: Nueva entrada
+        tableVisibleColumns:
+            isExcludedFromAvailable: Excluir del inventario
+            isOrdered: Pedida
+            isConfirmed: Lista para etiquetar
+            isReceived: Recibida
+            isRaid: Redada
+            landed: Fecha
+            supplierFk: Proveedor
+            invoiceNumber: Nº Factura
+            reference: Ref/Alb/Guía
+            agencyModeId: Agencia
+            isBooked: Asentado
+            companyFk: Empresa
+            travelFk: Envio
+            evaNotes: Notas
+            warehouseOutFk: Origen
+            warehouseInFk: Destino
+            entryTypeDescription: Tipo entrada
+            invoiceAmount: Importe
+    summary:
+        invoiceAmount: Importe
+        commission: Comisión
+        currency: Moneda
+        invoiceNumber: Núm. factura
+        ordered: Pedida
+        booked: Contabilizada
+        excludedFromAvailable: Inventario
+        travelReference: Referencia
+        travelAgency: Agencia
+        travelShipped: F. envio
+        travelWarehouseOut: Alm. salida
+        travelDelivered: Enviada
+        travelLanded: F. entrega
+        travelReceived: Recibida
+        buys: Compras
+        stickers: Etiquetas
+        package: Embalaje
+        packing: Pack.
+        grouping: Group.
+        buyingValue: Coste
+        import: Importe
+        pvp: PVP
+    basicData:
+        travel: Envío
+        currency: Moneda
+        observation: Observación
+        commission: Comisión
+        booked: Asentado
+        excludedFromAvailable: Inventario
+    buys:
+        observations: Observaciónes
+        packagingFk: Embalaje
+        color: Color
+        printedStickers: Etiquetas impresas
+    notes:
+        observationType: Tipo de observación
+    latestBuys:
+        tableVisibleColumns:
+            image: Foto
+            itemFk: Id Artículo
+            weightByPiece: Peso (gramos)/tallo
+            isActive: Activo
+            family: Familia
+            entryFk: Entrada
+            freightValue: Porte
+            comissionValue: Comisión
+            packageValue: Embalaje
+            isIgnored: Ignorado
+            price2: Grouping
+            price3: Packing
+            minPrice: Min
+            ektFk: Ekt
+            packingOut: Embalaje envíos
+            landing: Llegada
+            isExcludedFromAvailable: Excluir del inventario
+            isRaid: Redada
+            invoiceNumber: Nº Factura
+            reference: Ref/Alb/Guía
 ticket:
    params:
        ticketFk: ID de ticket
@ -406,6 +499,38 @@ ticket:
        freightItemName: Nombre
        packageItemName: Embalaje
        longName: Descripción
+    pageTitles:
+        tickets: Tickets
+        list: Listado
+        ticketCreate: Nuevo ticket
+        summary: Resumen
+        basicData: Datos básicos
+        boxing: Encajado
+        sms: Sms
+        notes: Notas
+        sale: Lineas del pedido
+        dms: Gestión documental
+        negative: Tickets negativos
+        volume: Volumen
+        observation: Notas
+        ticketAdvance: Adelantar tickets
+        futureTickets: Tickets a futuro
+        expedition: Expedición
+        purchaseRequest: Petición de compra
+        weeklyTickets: Tickets programados
+        saleTracking: Líneas preparadas
+        services: Servicios
+        tracking: Estados
+        components: Componentes
+        pictures: Fotos
+        packages: Bultos
+    list:
+        nickname: Alias
+        state: Estado
+        shipped: Enviado
+        landed: Entregado
+        salesPerson: Comercial
+        total: Total
    card:
        customerId: ID cliente
        customerCard: Ficha del cliente
@ -452,15 +577,11 @@ ticket:
        consigneeStreet: Dirección
    create:
        address: Dirección
-order:
-    field:
-        salesPersonFk: Comercial
-    form:
-        clientFk: Cliente
-        addressFk: Dirección
-        agencyModeFk: Agencia
-    list:
-        newOrder: Nuevo Pedido
+invoiceOut:
+    card:
+        issued: Fecha emisión
+        customerCard: Ficha del cliente
+        ticketList: Listado de tickets
    summary:
        issued: Fecha
        dued: Fecha límite
@ -471,6 +592,71 @@ order:
        fee: Cuota
        tickets: Tickets
        totalWithVat: Importe
+    globalInvoices:
+        errors:
+            chooseValidClient: Selecciona un cliente válido
+            chooseValidCompany: Selecciona una empresa válida
+            chooseValidPrinter: Selecciona una impresora válida
+            chooseValidSerialType: Selecciona una tipo de serie válida
+            fillDates: La fecha de la factura y la fecha máxima deben estar completas
+            invoiceDateLessThanMaxDate: La fecha de la factura no puede ser menor que la fecha máxima
+            invoiceWithFutureDate: Existe una factura con una fecha futura
+            noTicketsToInvoice: No existen tickets para facturar
+            criticalInvoiceError: Error crítico en la facturación proceso detenido
+            invalidSerialTypeForAll: El tipo de serie debe ser global cuando se facturan todos los clientes
+        table:
+            addressId: Id dirección
+            streetAddress: Dirección fiscal
+        statusCard:
+            percentageText: '{getPercentage}% {getAddressNumber} de {getNAddresses}'
+            pdfsNumberText: '{nPdfs} de {totalPdfs} PDFs'
+    negativeBases:
+        clientId: Id cliente
+        base: Base
+        active: Activo
+        hasToInvoice: Facturar
+        verifiedData: Datos comprobados
+        comercial: Comercial
+        errors:
+            downloadCsvFailed: Error al descargar CSV
+order:
+    field:
+        salesPersonFk: Comercial
+    form:
+        clientFk: Cliente
+        addressFk: Dirección
+        agencyModeFk: Agencia
+    list:
+        newOrder: Nuevo Pedido
+    summary:
+        basket: Cesta
+        notConfirmed: No confirmada
+        created: Creado
+        createdFrom: Creado desde
+        address: Dirección
+        total: Total
+        vat: IVA
+        state: Estado
+        alias: Alias
+        items: Artículos
+        orderTicketList: Tickets del pedido
+        amount: Monto
+        confirm: Confirmar
+        confirmLines: Confirmar lineas
+shelving:
+    list:
+        parking: Parking
+        priority: Prioridad
+        newShelving: Nuevo Carro
+    summary:
+        recyclable: Reciclable
+parking:
+    pickingOrder: Orden de recogida
+    row: Fila
+    column: Columna
+    searchBar:
+        info: Puedes buscar por código de parking
+        label: Buscar parking...
 department:
    chat: Chat
    bossDepartment: Jefe de departamento
@ -631,8 +817,8 @@ wagon:
        volumeNotEmpty: El volumen no puede estar vacío
        typeNotEmpty: El tipo no puede estar vacío
        maxTrays: Has alcanzado el número máximo de bandejas
-        minHeightBetweenTrays: 'La distancia mínima entre bandejas es '
-        maxWagonHeight: 'La altura máxima del vagón es '
+        minHeightBetweenTrays: La distancia mínima entre bandejas es
+        maxWagonHeight: La altura máxima del vagón es
        uncompleteTrays: Hay bandejas sin completar
    params:
        label: Etiqueta
@ -640,6 +826,8 @@ wagon:
        volume: Volumen
        name: Nombre
 supplier:
+    search: Buscar proveedor
+    searchInfo: Buscar proveedor por id o nombre
    list:
        payMethod: Método de pago
        account: Cuenta
@ -652,6 +840,7 @@ supplier:
        verified: Verificado
        isActive: Está activo
        billingData: Forma de pago
+        financialData: Datos financieros
        payDeadline: Plazo de pago
        payDay: Día de pago
        account: Cuenta
@ -729,6 +918,8 @@ travel:
        deleteTravel: Eliminar envío
        AddEntry: Añadir entrada
        thermographs: Termógrafos
+        availabled: F. Disponible
+        availabledHour: Hora Disponible
        hb: HB
    basicData:
        daysInForward: Desplazamiento automatico (redada)
@ -777,7 +968,7 @@ components:
    cardDescriptor:
        mainList: Listado principal
        summary: Resumen
-        moreOptions: 'Más opciones'
+        moreOptions: Más opciones
    leftMenu:
        addToPinned: Añadir a fijados
        removeFromPinned: Eliminar de fijados
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@ -2,7 +2,7 @@
 import Navbar from 'src/components/NavBar.vue';
 </script>
 <template>
-    <QLayout view="hHh LpR fFf" v-shortcut>
+    <QLayout view="hHh LpR fFf">
        <Navbar />
        <RouterView></RouterView>
        <QFooter v-if="$q.platform.is.mobile"></QFooter>
--- a/src/layouts/OutLayout.vue
+++ b/src/layouts/OutLayout.vue
@ -1,12 +1,12 @@
 <script setup>
 import { Dark, Quasar } from 'quasar';
-import { computed } from 'vue';
+import { computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { localeEquivalence } from 'src/i18n/index';
 import quasarLang from 'src/utils/quasarLang';
+import { langs } from 'src/boot/defaults/constants.js';

 const { t, locale } = useI18n();
-
 const userLocale = computed({
    get() {
        return locale.value;
@ -28,7 +28,6 @@ const darkMode = computed({
        Dark.set(value);
    },
 });
-const langs = ['en', 'es'];
 </script>

 <template>
--- a/src/pages/Account/AccountAliasList.vue
+++ b/src/pages/Account/AccountAliasList.vue
@ -3,6 +3,7 @@ import { useI18n } from 'vue-i18n';
 import { ref, computed } from 'vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSection from 'src/components/common/VnSection.vue';
+import exprBuilder from './Alias/AliasExprBuilder';

 const tableRef = ref();
 const { t } = useI18n();
@ -31,15 +32,6 @@ const columns = computed(() => [
        create: true,
    },
 ]);
-
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? { id: value }
-                : { alias: { like: `%${value}%` } };
-    }
-};
 </script>

 <template>
--- a/src/pages/Account/AccountExprBuilder.js
+++ b/src/pages/Account/AccountExprBuilder.js
@ -0,0 +1,18 @@
+export default (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : {
+                      or: [
+                          { name: { like: `%${value}%` } },
+                          { nickname: { like: `%${value}%` } },
+                      ],
+                  };
+        case 'name':
+        case 'nickname':
+            return { [param]: { like: `%${value}%` } };
+        case 'roleFk':
+            return { [param]: value };
+    }
+};
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@ -4,15 +4,16 @@ import { computed, ref } from 'vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import AccountSummary from './Card/AccountSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import exprBuilder from './AccountExprBuilder.js';
+import filter from './Card/AccountFilter.js';
 import VnSection from 'src/components/common/VnSection.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnInputPassword from 'src/components/common/VnInputPassword.vue';

 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const filter = {
-    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-};
+const tableRef = ref();
+
 const dataKey = 'AccountList';
 const roles = ref([]);
 const columns = computed(() => [
@ -117,25 +118,6 @@ const columns = computed(() => [
        ],
    },
 ]);
-
-function exprBuilder(param, value) {
-    switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? { id: value }
-                : {
-                      or: [
-                          { name: { like: `%${value}%` } },
-                          { nickname: { like: `%${value}%` } },
-                      ],
-                  };
-        case 'name':
-        case 'nickname':
-            return { [param]: { like: `%${value}%` } };
-        case 'roleFk':
-            return { [param]: value };
-    }
-}
 </script>
 <template>
    <FetchData url="VnRoles" @on-fetch="(data) => (roles = data)" auto-load />
--- a/src/pages/Account/Alias/AliasExprBuilder.js
+++ b/src/pages/Account/Alias/AliasExprBuilder.js
@ -0,0 +1,8 @@
+export default (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : { alias: { like: `%${value}%` } };
+    }
+};
--- a/src/pages/Account/Alias/Card/AliasCard.vue
+++ b/src/pages/Account/Alias/Card/AliasCard.vue
@ -1,21 +1,13 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
 import VnCardBeta from 'components/common/VnCardBeta.vue';
 import AliasDescriptor from './AliasDescriptor.vue';
-const { t } = useI18n();
 </script>

 <template>
    <VnCardBeta
        data-key="Alias"
-        base-url="MailAliases"
+        url="MailAliases"
        :descriptor="AliasDescriptor"
        search-data-key="AccountAliasList"
-        :searchbar-props="{
-            url: 'MailAliases',
-            info: t('mailAlias.searchInfo'),
-            label: t('mailAlias.search'),
-            searchUrl: 'table',
-        }"
    />
 </template>
--- a/src/pages/Account/Alias/Card/AliasDescriptor.vue
+++ b/src/pages/Account/Alias/Card/AliasDescriptor.vue
@ -7,7 +7,6 @@ import { useQuasar } from 'quasar';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';

-import useCardDescription from 'src/composables/useCardDescription';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';

@ -29,9 +28,6 @@ const entityId = computed(() => {
    return $props.id || route.params.id;
 });

-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.alias, entity.id));
-
 const removeAlias = () => {
    quasar
        .dialog({
@ -55,11 +51,8 @@ const removeAlias = () => {
    <CardDescriptor
        ref="descriptor"
        :url="`MailAliases/${entityId}`"
-        module="Alias"
-        @on-fetch="setData"
-        data-key="aliasData"
-        :title="data.title"
-        :subtitle="data.subtitle"
+        data-key="Alias"
+        title="alias"
    >
        <template #menu>
            <QItem v-ripple clickable @click="removeAlias()">
--- a/src/pages/Account/Alias/Card/AliasSummary.vue
+++ b/src/pages/Account/Alias/Card/AliasSummary.vue
@ -1,13 +1,11 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';

 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';

-import { useArrayData } from 'src/composables/useArrayData';
-
 const route = useRoute();
 const { t } = useI18n();

@ -18,20 +16,15 @@ const $props = defineProps({
    },
 });

-const { store } = useArrayData('Alias');
-const alias = ref(store.data);
 const entityId = computed(() => $props.id || route.params.id);
 </script>

 <template>
-    <CardSummary
-        ref="summary"
-        :url="`MailAliases/${entityId}`"
-        @on-fetch="(data) => (alias = data)"
-        data-key="MailAliasesSummary"
-    >
-        <template #header> {{ alias.id }} - {{ alias.alias }} </template>
-        <template #body>
+    <CardSummary ref="summary" :url="`MailAliases/${entityId}`" data-key="Alias">
+        <template #header="{ entity: alias }">
+            {{ alias.id }} - {{ alias.alias }}
+        </template>
+        <template #body="{ entity: alias }">
            <QCard class="vn-one">
                <QCardSection class="q-pa-none">
                    <router-link
--- a/src/pages/Account/Card/AccountBasicData.vue
+++ b/src/pages/Account/Card/AccountBasicData.vue
@ -1,46 +1,20 @@
 <script setup>
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 import FormModel from 'components/FormModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import { ref, watch } from 'vue';
-
-const route = useRoute();
-const { t } = useI18n();
-const formModelRef = ref(null);
-
-const accountFilter = {
-    where: { id: route.params.id },
-    fields: ['id', 'email', 'nickname', 'name', 'accountStateFk', 'packages', 'pickup'],
-    include: [],
-};
-
-watch(
-    () => route.params.id,
-    () => formModelRef.value.reset()
-);
 </script>
 <template>
-    <FormModel
-        ref="formModelRef"
-        url="VnUsers/preview"
-        :url-update="`VnUsers/${route.params.id}/update-user`"
-        :filter="accountFilter"
-        model="Accounts"
-        auto-load
-        @on-data-saved="formModelRef.fetch()"
-    >
+    <FormModel :url-update="`VnUsers/${$route.params.id}/update-user`" model="Account">
        <template #form="{ data }">
            <div class="q-gutter-y-sm">
-                <VnInput v-model="data.name" :label="t('account.card.nickname')" />
-                <VnInput v-model="data.nickname" :label="t('account.card.alias')" />
-                <VnInput v-model="data.email" :label="t('globals.params.email')" />
+                <VnInput v-model="data.name" :label="$t('account.card.nickname')" />
+                <VnInput v-model="data.nickname" :label="$t('account.card.alias')" />
+                <VnInput v-model="data.email" :label="$t('globals.params.email')" />
                <VnSelect
                    url="Languages"
                    v-model="data.lang"
-                    :label="t('account.card.lang')"
+                    :label="$t('account.card.lang')"
                    option-value="code"
                    option-label="code"
                />
@ -49,7 +23,7 @@ watch(
                    table="user"
                    column="twoFactor"
                    v-model="data.twoFactor"
-                    :label="t('account.card.twoFactor')"
+                    :label="$t('account.card.twoFactor')"
                    option-value="code"
                    option-label="code"
                />
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@ -1,8 +1,14 @@
 <script setup>
 import VnCardBeta from 'components/common/VnCardBeta.vue';
 import AccountDescriptor from './AccountDescriptor.vue';
+import filter from './AccountFilter.js';
 </script>
-
 <template>
-    <VnCardBeta data-key="AccountId" :descriptor="AccountDescriptor" />
+    <VnCardBeta
+        url="VnUsers/preview"
+        :id-in-where="true"
+        data-key="Account"
+        :descriptor="AccountDescriptor"
+        :filter="filter"
+    />
 </template>
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@ -1,36 +1,18 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import useCardDescription from 'src/composables/useCardDescription';
 import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
 import VnImg from 'src/components/ui/VnImg.vue';
+import filter from './AccountFilter.js';
 import useHasAccount from 'src/composables/useHasAccount.js';

-const $props = defineProps({
-    id: {
-        type: Number,
-        required: false,
-        default: null,
-    },
-});
+const $props = defineProps({ id: { type: Number, default: null } });

 const route = useRoute();
-const { t } = useI18n();
-const entityId = computed(() => {
-    return $props.id || route.params.id;
-});
-const data = ref(useCardDescription());
+const entityId = computed(() => $props.id || route.params.id);
 const hasAccount = ref();
-const setData = (entity) => (data.value = useCardDescription(entity.nickname, entity.id));
-
-const filter = {
-    where: { id: entityId },
-    fields: ['id', 'nickname', 'name', 'role'],
-    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-};

 onMounted(async () => {
    hasAccount.value = await useHasAccount(entityId.value);
@ -41,12 +23,9 @@ onMounted(async () => {
    <CardDescriptor
        ref="descriptor"
        :url="`VnUsers/preview`"
-        :filter="filter"
-        module="Account"
-        @on-fetch="setData"
-        data-key="AccountId"
-        :title="data.title"
-        :subtitle="data.subtitle"
+        :filter="{ ...filter, where: { id: entityId } }"
+        data-key="Account"
+        title="nickname"
    >
        <template #menu>
            <AccountDescriptorMenu :entity-id="entityId" />
@ -62,7 +41,7 @@ onMounted(async () => {
                                <QIcon name="vn:claims" />
                            </div>
                            <div class="text-grey-5" style="opacity: 0.4">
-                                {{ t('account.imageNotFound') }}
+                                {{ $t('account.imageNotFound') }}
                            </div>
                        </div>
                    </div>
@ -70,8 +49,8 @@ onMounted(async () => {
            </VnImg>
        </template>
        <template #body="{ entity }">
-            <VnLv :label="t('account.card.nickname')" :value="entity.name" />
-            <VnLv :label="t('account.card.role')" :value="entity.role.name" />
+            <VnLv :label="$t('account.card.nickname')" :value="entity.name" />
+            <VnLv :label="$t('account.card.role')" :value="entity.role?.name" />
        </template>
        <template #actions="{ entity }">
            <QCardActions class="q-gutter-x-md">
@ -84,7 +63,7 @@ onMounted(async () => {
                    size="sm"
                    class="fill-icon"
                >
-                    <QTooltip>{{ t('account.card.deactivated') }}</QTooltip>
+                    <QTooltip>{{ $t('account.card.deactivated') }}</QTooltip>
                </QIcon>
                <QIcon
                    color="primary"
@ -95,7 +74,7 @@ onMounted(async () => {
                    size="sm"
                    class="fill-icon"
                >
-                    <QTooltip>{{ t('account.card.enabled') }}</QTooltip>
+                    <QTooltip>{{ $t('account.card.enabled') }}</QTooltip>
                </QIcon>
            </QCardActions>
        </template>
--- a/src/pages/Account/Card/AccountDescriptorMenu.vue
+++ b/src/pages/Account/Card/AccountDescriptorMenu.vue
@ -12,6 +12,7 @@ import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import { useQuasar } from 'quasar';
 import { useRouter } from 'vue-router';
+import VnCheckbox from 'src/components/common/VnCheckbox.vue';

 const $props = defineProps({
    hasAccount: {
@ -29,7 +30,7 @@ const router = useRouter();
 const state = useState();
 const user = state.getUser();
 const { notify } = useQuasar();
-const account = computed(() => useArrayData('AccountId').store.data[0]);
+const account = computed(() => useArrayData('Account').store.data[0]);
 account.value.hasAccount = hasAccount.value;
 const entityId = computed(() => +route.params.id);
 const hasitManagementAccess = ref();
@ -124,18 +125,14 @@ onMounted(() => {
        :promise="sync"
    >
        <template #customHTML>
-            {{ shouldSyncPassword }}
-            <QCheckbox
-                :label="t('account.card.actions.sync.checkbox')"
+            <VnCheckbox
                v-model="shouldSyncPassword"
-                class="full-width"
+                :label="t('account.card.actions.sync.checkbox')"
+                :info="t('account.card.actions.sync.tooltip')"
                clearable
                clear-icon="close"
-            >
-                <QIcon style="padding-left: 10px" color="primary" name="info" size="sm">
-                    <QTooltip>{{ t('account.card.actions.sync.tooltip') }}</QTooltip>
-                </QIcon></QCheckbox
-            >
+                color="primary"
+            />
            <VnInputPassword
                v-if="shouldSyncPassword"
                :label="t('login.password')"
@ -155,13 +152,13 @@ onMounted(() => {
            openConfirmationModal(
                t('account.card.actions.disableAccount.title'),
                t('account.card.actions.disableAccount.subtitle'),
-                () => deleteAccount()
+                () => deleteAccount(),
            )
        "
    >
        <QItemSection>{{ t('globals.delete') }}</QItemSection>
    </QItem>
-    <QItem v-if="hasSysadminAccess" v-ripple clickable>
+    <QItem v-if="hasSysadminAccess || isHimself" v-ripple clickable>
        <QItemSection @click="onChangePass(isHimself)">
            {{ isHimself ? t('globals.changePass') : t('globals.setPass') }}
        </QItemSection>
@ -174,7 +171,7 @@ onMounted(() => {
            openConfirmationModal(
                t('account.card.actions.enableAccount.title'),
                t('account.card.actions.enableAccount.subtitle'),
-                () => updateStatusAccount(true)
+                () => updateStatusAccount(true),
            )
        "
    >
@ -188,7 +185,7 @@ onMounted(() => {
            openConfirmationModal(
                t('account.card.actions.disableAccount.title'),
                t('account.card.actions.disableAccount.subtitle'),
-                () => updateStatusAccount(false)
+                () => updateStatusAccount(false),
            )
        "
    >
@ -203,7 +200,7 @@ onMounted(() => {
            openConfirmationModal(
                t('account.card.actions.activateUser.title'),
                t('account.card.actions.activateUser.title'),
-                () => updateStatusUser(true)
+                () => updateStatusUser(true),
            )
        "
    >
@ -217,7 +214,7 @@ onMounted(() => {
            openConfirmationModal(
                t('account.card.actions.deactivateUser.title'),
                t('account.card.actions.deactivateUser.title'),
-                () => updateStatusUser(false)
+                () => updateStatusUser(false),
            )
        "
    >
--- a/src/pages/Account/Card/AccountFilter.js
+++ b/src/pages/Account/Card/AccountFilter.js
@ -0,0 +1,3 @@
+export default {
+    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+};
--- a/src/pages/Account/Card/AccountMailAlias.vue
+++ b/src/pages/Account/Card/AccountMailAlias.vue
@ -86,7 +86,7 @@ watch(
    () => route.params.id,
    () => {
        getAccountData();
-    }
+    },
 );

 onMounted(async () => await getAccountData(false));
@ -130,7 +130,8 @@ onMounted(async () => await getAccountData(false));
                                            openConfirmationModal(
                                                t('User will be removed from alias'),
                                                t('¿Seguro que quieres continuar?'),
-                                                () => deleteMailAlias(row, rows, rowIndex)
+                                                () =>
+                                                    deleteMailAlias(row, rows, rowIndex),
                                            )
                                        "
                                    >
@ -157,7 +158,7 @@ onMounted(async () => await getAccountData(false));
                icon="add"
                color="primary"
                @click="openCreateMailAliasForm()"
-                shortcut="+"
+                v-shortcut="'+'"
            >
                <QTooltip>{{ t('warehouses.add') }}</QTooltip>
            </QBtn>
--- a/src/pages/Account/Card/AccountSummary.vue
+++ b/src/pages/Account/Card/AccountSummary.vue
@ -1,58 +1,41 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
-
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-
-import { useArrayData } from 'src/composables/useArrayData';
+import filter from './AccountFilter.js';
 import AccountDescriptorMenu from './AccountDescriptorMenu.vue';

+const $props = defineProps({ id: { type: Number, default: 0 } });
+
 const route = useRoute();
-const { t } = useI18n();
-
-const $props = defineProps({
-    id: {
-        type: Number,
-        default: 0,
-    },
-});
-const { store } = useArrayData('Account');
-const account = ref(store.data);
-
 const entityId = computed(() => $props.id || route.params.id);
-const filter = {
-    where: { id: entityId },
-    fields: ['id', 'nickname', 'name', 'role'],
-    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-};
 </script>

 <template>
    <CardSummary
-        data-key="AccountId"
+        data-key="Account"
+        ref="AccountSummary"
        url="VnUsers/preview"
        :filter="filter"
-        @on-fetch="(data) => (account = data)"
    >
-        <template #header>{{ account.id }} - {{ account.nickname }}</template>
-        <template #menu="">
+        <template #header="{ entity }">{{ entity.id }} - {{ entity.nickname }}</template>
+        <template #menu>
            <AccountDescriptorMenu :entity-id="entityId" />
        </template>
-        <template #body>
+        <template #body="{ entity }">
            <QCard class="vn-one">
                <QCardSection class="q-pa-none">
                    <router-link
                        :to="{ name: 'AccountBasicData', params: { id: entityId } }"
                        class="header header-link"
                    >
-                        {{ t('globals.pageTitles.basicData') }}
+                        {{ $t('globals.pageTitles.basicData') }}
                        <QIcon name="open_in_new" />
                    </router-link>
                </QCardSection>
-                <VnLv :label="t('account.card.nickname')" :value="account.name" />
-                <VnLv :label="t('account.card.role')" :value="account.role.name" />
+                <VnLv :label="$t('account.card.nickname')" :value="entity.name" />
+                <VnLv :label="$t('account.card.role')" :value="entity.role?.name" />
            </QCard>
        </template>
    </CardSummary>
--- a/src/pages/Account/Role/AccountRoles.vue
+++ b/src/pages/Account/Role/AccountRoles.vue
@ -5,6 +5,7 @@ import VnTable from 'components/VnTable/VnTable.vue';
 import { useRoute } from 'vue-router';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RoleSummary from './Card/RoleSummary.vue';
+import exprBuilder from './RoleExprBuilder.js';
 import VnSection from 'src/components/common/VnSection.vue';

 const route = useRoute();
@ -66,24 +67,7 @@ const columns = computed(() => [
        ],
    },
 ]);
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? { id: value }
-                : {
-                      or: [
-                          { name: { like: `%${value}%` } },
-                          { nickname: { like: `%${value}%` } },
-                      ],
-                  };
-        case 'name':
-        case 'description':
-            return { [param]: { like: `%${value}%` } };
-    }
-};
 </script>
-
 <template>
    <VnSection
        :data-key="dataKey"
--- a/src/pages/Account/Role/Card/RoleBasicData.vue
+++ b/src/pages/Account/Role/Card/RoleBasicData.vue
@ -1,24 +1,16 @@
 <script setup>
-import { useRoute } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-const route = useRoute();
-const { t } = useI18n();
 </script>
 <template>
-    <FormModel :url="`VnRoles/${route.params.id}`" model="VnRole" auto-load>
+    <FormModel model="Role" auto-load>
        <template #form="{ data }">
            <VnRow>
-                <div class="col">
-                    <VnInput v-model="data.name" :label="t('globals.name')" />
-                </div>
+                <VnInput v-model="data.name" :label="$t('globals.name')" />
            </VnRow>
            <VnRow>
-                <div class="col">
-                    <VnInput v-model="data.description" :label="t('role.description')" />
-                </div>
+                <VnInput v-model="data.description" :label="$t('role.description')" />
            </VnRow>
        </template>
    </FormModel>
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ b/src/pages/Account/Role/Card/RoleCard.vue
@ -3,5 +3,10 @@ import VnCardBeta from 'components/common/VnCardBeta.vue';
 import RoleDescriptor from './RoleDescriptor.vue';
 </script>
 <template>
-    <VnCardBeta data-key="Role" :descriptor="RoleDescriptor" />
+    <VnCardBeta
+        url="VnRoles"
+        data-key="Role"
+        :id-in-where="true"
+        :descriptor="RoleDescriptor"
+    />
 </template>
--- a/src/pages/Account/Role/Card/RoleDescriptor.vue
+++ b/src/pages/Account/Role/Card/RoleDescriptor.vue
@ -1,10 +1,9 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import useCardDescription from 'src/composables/useCardDescription';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 const $props = defineProps({
@ -26,11 +25,6 @@ const { t } = useI18n();
 const entityId = computed(() => {
    return $props.id || route.params.id;
 });
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
-const filter = {
-    where: { id: entityId },
-};
 const removeRole = async () => {
    await axios.delete(`VnRoles/${entityId.value}`);
    notify(t('Role removed'), 'positive');
@ -39,13 +33,9 @@ const removeRole = async () => {

 <template>
    <CardDescriptor
-        :url="`VnRoles/${entityId}`"
-        :filter="filter"
-        module="Role"
-        @on-fetch="setData"
+        url="VnRoles"
+        :filter="{ where: { id: entityId } }"
        data-key="Role"
-        :title="data.title"
-        :subtitle="data.subtitle"
        :summary="$props.summary"
    >
        <template #menu>
--- a/src/pages/Account/Role/Card/RoleSummary.vue
+++ b/src/pages/Account/Role/Card/RoleSummary.vue
@ -1,10 +1,9 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import { useArrayData } from 'src/composables/useArrayData';

 const route = useRoute();
 const { t } = useI18n();
@ -16,24 +15,18 @@ const $props = defineProps({
    },
 });

-const { store } = useArrayData('Role');
-const role = ref(store.data);
 const entityId = computed(() => $props.id || route.params.id);
-const filter = {
-    where: { id: entityId },
-};
 </script>

 <template>
    <CardSummary
        ref="summary"
-        :url="`VnRoles/${entityId}`"
-        :filter="filter"
-        @on-fetch="(data) => (role = data)"
+        url="VnRoles"
+        :filter="{ where: { id: entityId } }"
        data-key="Role"
    >
-        <template #header> {{ role.id }} - {{ role.name }} </template>
-        <template #body>
+        <template #header="{ entity }"> {{ entity.id }} - {{ entity.name }} </template>
+        <template #body="{ entity }">
            <QCard class="vn-one">
                <QCardSection class="q-pa-none">
                    <a
@ -44,9 +37,9 @@ const filter = {
                        <QIcon name="open_in_new" />
                    </a>
                </QCardSection>
-                <VnLv :label="t('role.id')" :value="role.id" />
-                <VnLv :label="t('globals.name')" :value="role.name" />
-                <VnLv :label="t('role.description')" :value="role.description" />
+                <VnLv :label="t('role.id')" :value="entity.id" />
+                <VnLv :label="t('globals.name')" :value="entity.name" />
+                <VnLv :label="t('role.description')" :value="entity.description" />
            </QCard>
        </template>
    </CardSummary>
--- a/Show More
+++ b/Show More