Merge branch 'dev' into 7731-clientViesCode

feat: refs #7731 commit blanck
2025-02-07 06:05:56 +00:00 · 2025-02-06 12:39:45 +01:00 · 2025-02-06 10:52:10 +00:00 · 2025-01-24 13:36:55 +01:00 · 2025-01-24 11:28:10 +00:00 · 2025-01-24 08:30:49 +00:00
518 changed files with 9516 additions and 17654 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -1 +0,0 @@
-node_modules
--- a/.gitignore
+++ b/.gitignore
@ -31,7 +31,6 @@ yarn-error.log*
 # Cypress directories and files
 /test/cypress/videos
 /test/cypress/screenshots
-/junit

 # VitePress directories and files
 /docs/.vitepress/cache
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/116
+++ b/116
@ -1,7 +1,6 @@
 #!/usr/bin/env groovy

 def PROTECTED_BRANCH
-def IS_LATEST

 def BRANCH_ENV = [
    test: 'test',
@ -11,22 +10,19 @@ 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_PROTECTED_BRANCH = PROTECTED_BRANCH.contains(env.BRANCH_NAME)
-        IS_LATEST = ['master', 'main'].contains(env.BRANCH_NAME)
-
-       // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
+        // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
        echo "NODE_NAME: ${env.NODE_NAME}"
        echo "WORKSPACE: ${env.WORKSPACE}"
-        echo "CHANGE_TARGET: ${env.CHANGE_TARGET}"

        configFileProvider([
            configFile(fileId: 'salix-front.properties',
@ -37,7 +33,7 @@ node {
            props.each {key, value -> echo "${key}: ${value}" }
        }

-        if (IS_PROTECTED_BRANCH) {
+        if (PROTECTED_BRANCH) {
            configFileProvider([
                configFile(fileId: "salix-front.branch.${env.BRANCH_NAME}",
                variable: 'BRANCH_PROPS_FILE')
@ -62,19 +58,6 @@ pipeline {
        PROJECT_NAME = 'lilium'
    }
    stages {
-        stage('Version') {
-            when {
-                expression { IS_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 = ""
@ -85,93 +68,48 @@ pipeline {
        }
        stage('Test') {
            when {
-                expression { !IS_PROTECTED_BRANCH }
+                expression { !PROTECTED_BRANCH }
            }
            environment {
-                NODE_ENV = ''
-                CI = 'true'
-                TZ = 'Europe/Madrid'
+                NODE_ENV = ""
            }
-            parallel {
-                stage('Unit') {
-                    steps {
-                        sh 'pnpm run test:front:ci'
-                    }
-                    post {
-                        always {
-                            junit(
-                                testResults: 'junit/vitest.xml',
-                                allowEmptyResults: true
-                            )
-                        }
-                    }
-                }
-                stage('E2E') {
-                    environment {
-                        CREDS = 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 {
-                            sh 'rm -f junit/e2e-*.xml'
-                            sh 'rm -rf test/cypress/screenshots'
-                            env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev'
-
-                            def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
-
-                            sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY'
-                            sh "docker-compose ${env.COMPOSE_PARAMS} pull back"
-                            sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
-                            sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
-
-                            image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
-                                sh 'sh test/cypress/cypressParallel.sh 1'
-                            }
-                        }
-                    }
-                    post {
-                        always {
-                            sh "docker-compose ${env.COMPOSE_PARAMS} down -v"
-                            archiveArtifacts artifacts: 'test/cypress/screenshots/**/*', allowEmptyArchive: true
-                            junit(
-                                testResults: 'junit/e2e-*.xml',
-                                allowEmptyResults: true
-                            )
-                        }
-                    }
+            steps {
+                sh 'pnpm run test:unit:ci'
+            }
+              post {
+                always {
+                    junit(
+                        testResults: 'junitresults.xml',
+                        allowEmptyResults: true
+                    )
                }
            }
        }
        stage('Build') {
            when {
-                expression { IS_PROTECTED_BRANCH }
+                expression { PROTECTED_BRANCH }
            }
            environment {
-                VERSION = readFile 'VERSION.txt'
+                CREDENTIALS = credentials('docker-registry')
            }
            steps {
+                sh 'quasar build'
                script {
-                    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')
-                    }
+                    def packageJson = readJSON file: 'package.json'
+                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
                }
+                dockerBuild()
            }
        }
        stage('Deploy') {
            when {
-                expression { IS_PROTECTED_BRANCH }
-            }
-            environment {
-                VERSION = readFile 'VERSION.txt'
+                expression { PROTECTED_BRANCH }
            }
            steps {
+                script {
+                    def packageJson = readJSON file: 'package.json'
+                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
+                }
                withKubeConfig([
                    serverUrl: "$KUBERNETES_API",
                    credentialsId: 'kubernetes',
--- a/README.md
+++ b/README.md
@ -23,7 +23,7 @@ quasar dev
 ### Run unit tests

 ```bash
-pnpm run test:front
+pnpm run test:unit
 ```

 ### Run e2e tests
@ -32,18 +32,6 @@ pnpm run test:front
 pnpm run test:e2e
 ```

-### Run e2e parallel
-
-```bash
-pnpm run test:e2e:parallel
-```
-
-### View e2e parallel report
-
-```bash
-pnpm run test:e2e:summary
-```
-
 ### Build the app for production

 ```bash
--- a/cypress.config.js
+++ b/cypress.config.js
@ -1,44 +1,12 @@
 import { defineConfig } from 'cypress';
-
-let urlHost, reporter, reporterOptions, timeouts;
-
-if (process.env.CI) {
-    urlHost = 'front';
-    reporter = 'junit';
-    reporterOptions = {
-        mochaFile: 'junit/e2e-[hash].xml',
-    };
-    timeouts = {
-        defaultCommandTimeout: 30000,
-        requestTimeout: 30000,
-        responseTimeout: 60000,
-        pageLoadTimeout: 60000,
-    };
-} 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,
-    };
-    timeouts = {
-        defaultCommandTimeout: 10000,
-        requestTimeout: 10000,
-        responseTimeout: 30000,
-        pageLoadTimeout: 60000,
-    };
-}
+// https://docs.cypress.io/app/tooling/reporters
+// https://docs.cypress.io/app/references/configuration
+// https://www.npmjs.com/package/cypress-mochawesome-reporter

 export default defineConfig({
    e2e: {
-        baseUrl: `http://${urlHost}:9000`,
-        experimentalStudio: false,
-        trashAssetsBeforeRuns: false,
-        defaultBrowser: 'chromium',
+        baseUrl: 'http://localhost:9000/',
+        experimentalStudio: true,
        fixturesFolder: 'test/cypress/fixtures',
        screenshotsFolder: 'test/cypress/screenshots',
        supportFile: 'test/cypress/support/index.js',
@ -48,17 +16,27 @@ export default defineConfig({
        specPattern: 'test/cypress/integration/**/*.spec.js',
        experimentalRunAllSpecs: true,
        watchForFileChanges: true,
-        reporter,
-        reporterOptions,
+        reporter: 'cypress-mochawesome-reporter',
+        reporterOptions: {
+            charts: true,
+            reportPageTitle: 'Cypress Inline Reporter',
+            reportFilename: '[status]_[datetime]-report',
+            embeddedScreenshots: true,
+            reportDir: 'test/cypress/reports',
+            inlineAssets: true,
+        },
        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);
+
+            return config;
+        },
        viewportWidth: 1280,
        viewportHeight: 720,
-        ...timeouts,
-        includeShadowDom: true,
-        waitForAnimations: true,
    },
 });
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -0,0 +1,7 @@
+version: '3.7'
+services:
+  main:
+    image: registry.verdnatura.es/salix-frontend:${VERSION:?}
+    build:
+      context: .
+      dockerfile: ./Dockerfile
--- a/docs/Dockerfile.dev
+++ b/docs/Dockerfile.dev
@ -1,47 +0,0 @@
-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 \
-        mesa-vulkan-drivers \
-        vulkan-tools \
-        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@14.1.0 \
-    && cypress install
-
-WORKDIR /app
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "salix-front",
-    "version": "25.14.0",
+    "version": "25.08.0",
    "description": "Salix frontend",
    "productName": "Salix",
    "author": "Verdnatura",
@ -13,11 +13,9 @@
        "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:e2e:parallel": "bash ./test/cypress/run.sh",
-        "test:e2e:summary": "bash ./test/cypress/summary.sh",
        "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
-        "test:front": "vitest",
-        "test:front:ci": "vitest run",
+        "test:unit": "vitest",
+        "test:unit:ci": "vitest run",
        "commitlint": "commitlint --edit",
        "prepare": "npx husky install",
        "addReferenceTag": "node .husky/addReferenceTag.js",
@ -49,21 +47,18 @@
        "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
        "@vue/test-utils": "^2.4.4",
        "autoprefixer": "^10.4.14",
-        "cypress": "^14.1.0",
+        "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",
-        "junit-merge": "^2.0.0",
-        "mocha": "^11.1.0",
        "postcss": "^8.4.23",
        "prettier": "^3.4.2",
        "sass": "^1.83.4",
        "vitepress": "^1.6.3",
-        "vitest": "^0.34.0",
-        "xunit-viewer": "^10.6.1"
+        "vitest": "^0.34.0"
    },
    "engines": {
        "node": "^20 || ^18 || ^16",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/proxy-serve.js
+++ b/proxy-serve.js
@ -1,6 +1,6 @@
 export default [
    {
        path: '/api',
-        rule: { target: 'http://127.0.0.1:3000' },
+        rule: { target: 'http://0.0.0.0:3000' },
    },
 ];
--- a/quasar.config.js
+++ b/quasar.config.js
@ -11,7 +11,6 @@
 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 {
@ -31,6 +30,7 @@ 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,17 +109,13 @@ export default configure(function (/* ctx */) {
            },
            proxy: {
                '/api': {
-                    target: target,
+                    target: 'http://0.0.0.0:3000',
                    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
@ -1,2 +0,0 @@
-export const langs = ['en', 'es'];
-export const decimalPlaces = 2;
--- 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,5 +30,22 @@ 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,5 +51,4 @@ export default boot(({ app }) => {

        await useCau(response, message);
    };
-    app.provide('app', app);
 });
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@ -2,6 +2,7 @@
 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';
@ -20,11 +21,14 @@ 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 = {
@ -47,6 +51,7 @@ async function setCountry(countryFk, data) {
    data.townFk = null;
    data.provinceFk = null;
    data.countryFk = countryFk;
+    await fetchTowns();
 }

 // Province
@ -55,11 +60,22 @@ 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;
@ -72,6 +88,18 @@ 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 !== '') {
@ -80,11 +108,22 @@ 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"
@ -110,13 +149,14 @@ async function filterTowns(name) {
                    @filter="filterTowns"
                    :tooltip="t('Create city')"
                    v-model="data.townFk"
-                    url="Towns/location"
+                    :options="townsOptions"
+                    option-label="name"
+                    option-value="id"
                    :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">
@ -157,12 +197,16 @@ 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,9 +62,12 @@ const where = computed(() => {
                    auto-load
                    :where="where"
                    url="Autonomies/location"
-                    sort-by="name ASC"
+                    :sort-by="['name ASC']"
+                    :limit="30"
                    :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,10 +64,6 @@ const $props = defineProps({
        type: Function,
        default: null,
    },
-    beforeSaveFn: {
-        type: Function,
-        default: null,
-    },
    goTo: {
        type: String,
        default: '',
@ -180,20 +176,14 @@ async function saveChanges(data) {
        hasChanges.value = false;
        return;
    }
-    let changes = data || getChanges();
-    if ($props.beforeSaveFn) changes = await $props.beforeSaveFn(changes, getChanges);
-
+    const changes = data || getChanges();
    try {
-        if (changes?.creates?.length === 0 && changes?.updates?.length === 0) {
-            return;
-        }
-
        await axios.post($props.saveUrl || $props.url + '/crud', changes);
    } finally {
        isLoading.value = false;
    }
    originalData.value = JSON.parse(JSON.stringify(formData.value));
-    if (changes?.creates?.length) await vnPaginateRef.value.fetch();
+    if (changes.creates?.length) await vnPaginateRef.value.fetch();

    hasChanges.value = false;
    emit('saveChanges', data);
@ -239,12 +229,12 @@ async function remove(data) {
                componentProps: {
                    title: t('globals.confirmDeletion'),
                    message: t('globals.confirmDeletionMessage'),
-                    data: { deletes: ids },
+                    newData,
                    ids,
-                    promise: saveChanges,
                },
            })
            .onOk(async () => {
+                await saveChanges({ deletes: ids });
                newData = newData.filter((form) => !ids.some((id) => id == form[pk]));
                fetch(newData);
            });
@ -384,8 +374,6 @@ 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,6 +42,7 @@ 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([]);
@ -120,17 +121,23 @@ 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' }"
-        order="name ASC"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
+        order="name"
        @on-fetch="(data) => (ItemTypesOptions = data)"
        auto-load
    />
    <FetchData
        url="Inks"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
-        order="name ASC"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
+        order="name"
        @on-fetch="(data) => (InksOptions = data)"
        auto-load
    />
@ -145,11 +152,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')"
@ -188,7 +195,7 @@ const selectItem = ({ id }) => {
            >
                <template #body-cell-id="{ row }">
                    <QTd auto-width @click.stop>
-                        <QBtn flat class="link">{{ row.id }}</QBtn>
+                        <QBtn flat color="blue">{{ row.id }}</QBtn>
                        <ItemDescriptorProxy :id="row.id" />
                    </QTd>
                </template>
--- 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'] }"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
        auto-load
    />
    <FetchData
@ -181,7 +181,6 @@ const selectTravel = ({ id }) => {
                    color="primary"
                    :disabled="isLoading"
                    :loading="isLoading"
-                    data-cy="save-filter-travel-form"
                />
            </div>
            <QTable
@ -192,11 +191,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 data-cy="travelFk-travel-form">
-                        <QBtn flat class="link">{{ row.id }}</QBtn>
+                    <QTd auto-width @click.stop>
+                        <QBtn flat color="blue">{{ row.id }}</QBtn>
                        <TravelDescriptorProxy :id="row.id" />
                    </QTd>
                </template>
--- 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, useAttrs } from 'vue';
+import { onMounted, onUnmounted, computed, ref, watch, nextTick } from 'vue';
 import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@ -12,7 +12,6 @@ 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();
@ -23,7 +22,6 @@ const { validate } = useValidator();
 const { notify } = useNotify();
 const route = useRoute();
 const myForm = ref(null);
-const attrs = useAttrs();
 const $props = defineProps({
    url: {
        type: String,
@ -96,10 +94,6 @@ const $props = defineProps({
        type: [String, Boolean],
        default: '800px',
    },
-    onDataSaved: {
-        type: Function,
-        default: () => {},
-    },
 });
 const emit = defineEmits(['onFetch', 'onDataSaved']);
 const modelValue = computed(
@ -112,14 +106,14 @@ const isLoading = ref(false);
 const isResetting = ref(false);
 const hasChanges = ref(!$props.observeFormChanges);
 const originalData = computed(() => state.get(modelValue));
-const formData = ref();
+const formData = ref({});
 const defaultButtons = computed(() => ({
    save: {
        dataCy: 'saveDefaultBtn',
        color: 'primary',
        icon: 'save',
        label: 'globals.save',
-        click: async () => await save(),
+        click: () => myForm.value.submit(),
        type: 'submit',
    },
    reset: {
@ -140,8 +134,7 @@ onMounted(async () => {

    if (!$props.formInitialData) {
        if ($props.autoLoad && $props.url) await fetch();
-        else if (arrayData.store.data)
-            updateAndEmit('onFetch', { val: arrayData.store.data });
+        else if (arrayData.store.data) updateAndEmit('onFetch', arrayData.store.data);
    }
    if ($props.observeFormChanges) {
        watch(
@ -161,7 +154,7 @@ onMounted(async () => {
 if (!$props.url)
    watch(
        () => arrayData.store.data,
-        (val) => updateAndEmit('onFetch', { val }),
+        (val) => updateAndEmit('onFetch', val),
    );

 watch(
@ -207,7 +200,7 @@ async function fetch() {
        });
        if (Array.isArray(data)) data = data[0] ?? {};

-        updateAndEmit('onFetch', { val: data });
+        updateAndEmit('onFetch', data);
    } catch (e) {
        state.set(modelValue, {});
        throw e;
@ -234,11 +227,7 @@ async function save() {

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

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

 function reset() {
    formData.value = JSON.parse(JSON.stringify(originalData.value));
-    updateAndEmit('onFetch', { val: originalData.value });
+    updateAndEmit('onFetch', originalData.value);
    if ($props.observeFormChanges) {
        hasChanges.value = false;
        isResetting.value = true;
@ -275,11 +264,11 @@ function filter(value, update, filterOptions) {
    );
 }

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

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

 function trimData(data) {
@ -289,27 +278,6 @@ 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,
@ -325,13 +293,12 @@ defineExpose({
        <QForm
            ref="myForm"
            v-if="formData"
-            @submit.prevent
-            @keyup.prevent="onKeyup"
+            @submit="save"
            @reset="reset"
            class="q-pa-md"
            :style="maxWidth ? 'max-width: ' + maxWidth : ''"
            id="formModel"
-            :mapper="onBeforeSave"
+            :prevent-submit="$attrs['prevent-submit']"
        >
            <QCard>
                <slot
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@ -1,13 +1,12 @@
 <script setup>
-import { ref, computed, useAttrs, nextTick } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useState } from 'src/composables/useState';

 import FormModel from 'components/FormModel.vue';

 const emit = defineEmits(['onDataSaved', 'onDataCanceled']);

-const props = defineProps({
+defineProps({
    title: {
        type: String,
        default: '',
@ -16,41 +15,23 @@ const props = defineProps({
        type: String,
        default: '',
    },
-    showSaveAndContinueBtn: {
-        type: Boolean,
-        default: false,
-    },
 });

 const { t } = useI18n();
-const attrs = useAttrs();
-const state = useState();
+
 const formModelRef = ref(null);
 const closeButton = ref(null);
-const isSaveAndContinue = ref(props.showSaveAndContinueBtn);
-const isLoading = computed(() => formModelRef.value?.isLoading);
-const reset = computed(() => formModelRef.value?.reset);

-const onDataSaved = async (formData, requestResponse) => {
-    if (!isSaveAndContinue.value) closeButton.value?.click();
-    if (isSaveAndContinue.value) {
-        await nextTick();
-        state.set(attrs.model, attrs.formInitialData);
-    }
-    isSaveAndContinue.value = props.showSaveAndContinueBtn;
+const onDataSaved = (formData, requestResponse) => {
+    if (closeButton.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);

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

@ -78,16 +59,15 @@ defineExpose({
                    flat
                    :disabled="isLoading"
                    :loading="isLoading"
-                    data-cy="FormModelPopup_cancel"
-                    v-close-popup
-                    z-max
                    @click="emit('onDataCanceled')"
+                    v-close-popup
+                    data-cy="FormModelPopup_cancel"
+                    z-max
                />
                <QBtn
-                    :flat="showSaveAndContinueBtn"
                    :label="t('globals.save')"
                    :title="t('globals.save')"
-                    @click="onClick(false)"
+                    type="submit"
                    color="primary"
                    class="q-ml-sm"
                    :disabled="isLoading"
@ -95,18 +75,6 @@ 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,25 +121,23 @@ const removeTag = (index, params, search) => {
    applyTags(params, search);
 };
 const setCategoryList = (data) => {
-    categoryList.value = (data || []).map((category) => ({
-        ...category,
-        icon: `vn:${(category.icon || '').split('-')[1]}`,
-    }));
+    categoryList.value = (data || [])
+        .filter((category) => category.display)
+        .map((category) => ({
+            ...category,
+            icon: `vn:${(category.icon || '').split('-')[1]}`,
+        }));
    fetchItemTypes();
 };
 </script>

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

 es:
@ -337,6 +339,7 @@ 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
@ -77,7 +77,6 @@ watch(
 function findMatches(search, item) {
    const matches = [];
    function findRoute(search, item) {
-        if (!item?.children) return;
        for (const child of item.children) {
            if (search?.indexOf(child.name) > -1) {
                matches.push(child);
@ -93,7 +92,7 @@ function findMatches(search, item) {
 }

 function addChildren(module, route, parent) {
-    const menus = route?.meta?.menu;
+    const menus = route?.meta?.menu ?? route?.menus?.[props.source]; //backwards compatible
    if (!menus) return;

    const matches = findMatches(menus, route);
@ -108,7 +107,11 @@ function getRoutes() {
        main: getMainRoutes,
        card: getCardRoutes,
    };
-    handleRoutes[props.source]();
+    try {
+        handleRoutes[props.source]();
+    } catch (error) {
+        throw new Error(`Method is not defined`);
+    }
 }
 function getMainRoutes() {
    const modules = Object.assign([], navigation.getModules().value);
@ -119,6 +122,7 @@ function getMainRoutes() {
        );
        if (!moduleDef) continue;
        item.children = [];
+
        addChildren(item.module, moduleDef, item.children);
    }

@ -128,18 +132,23 @@ function getMainRoutes() {
 function getCardRoutes() {
    const currentRoute = route.matched[1];
    const currentModule = toLowerCamel(currentRoute.name);
-    let moduleDef;
-
-    let index = route.matched.length - 1;
-    while (!moduleDef && index > 0) {
-        if (route.matched[index]?.meta?.menu) moduleDef = route.matched[index];
-        index--;
-    }
+    let moduleDef = routes.find((route) => toLowerCamel(route.name) === currentModule);

    if (!moduleDef) return;
+    if (!moduleDef?.menus) moduleDef = betaGetRoutes();
    addChildren(currentModule, moduleDef, items.value);
 }

+function betaGetRoutes() {
+    let menuRoute;
+    let index = route.matched.length - 1;
+    while (!menuRoute && index > 0) {
+        if (route.matched[index]?.meta?.menu) menuRoute = route.matched[index];
+        index--;
+    }
+    return menuRoute;
+}
+
 async function togglePinned(item, event) {
    if (event.defaultPrevented) return;
    event.preventDefault();
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@ -26,7 +26,6 @@ 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
@ -57,7 +57,7 @@ const refresh = () => window.location.reload();
                :class="{
                    'no-visible': !stateQuery.isLoading().value,
                }"
-                size="sm"
+                size="xs"
                data-cy="loading-spinner"
            />
            <QSpace />
@ -85,15 +85,7 @@ const refresh = () => window.location.reload();
                    </QTooltip>
                    <PinnedModules ref="pinnedModulesRef" />
                </QBtn>
-                <QBtn
-                    class="q-pa-none"
-                    rounded
-                    dense
-                    flat
-                    no-wrap
-                    id="user"
-                    data-cy="userPanel_btn"
-                >
+                <QBtn class="q-pa-none" rounded dense flat no-wrap id="user">
                    <VnAvatar
                        :worker-id="user.id"
                        :title="user.name"
--- a/src/components/RefundInvoiceForm.vue
+++ b/src/components/RefundInvoiceForm.vue
@ -9,7 +9,6 @@ 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: {
@ -132,11 +131,15 @@ const refund = async () => {
                        :required="true"
                    /> </VnRow
                ><VnRow>
-                    <VnCheckbox
-                        v-model="invoiceParams.inheritWarehouse"
-                        :label="t('Inherit warehouse')"
-                        :info="t('Inherit warehouse tooltip')"
-                    />
+                    <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>
                </VnRow>
            </template>
        </FormPopup>
--- a/src/components/TicketProblems.vue
+++ b/src/components/TicketProblems.vue
@ -1,53 +1,16 @@
 <script setup>
-import { toCurrency } from 'src/filters';
-
 defineProps({ row: { type: Object, required: true } });
 </script>
 <template>
    <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?.reserved"
-            color="primary"
-            name="vn:reserva"
-            size="xs"
-            data-cy="ticketSaleReservedIcon"
-        >
-            <QTooltip>
-                {{ t('ticketSale.reserved') }}
-            </QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="row?.isDeleted"
-            color="primary"
-            name="vn:deletedTicket"
-            size="xs"
-            data-cy="ticketDeletedIcon"
-        >
-            <QTooltip>
-                {{ t('Ticket deleted') }}
-            </QTooltip>
-        </QIcon>
-        <QIcon
-            v-if="row?.hasRisk"
+            v-if="row?.risk"
            name="vn:risk"
            :color="row.hasHighRisk ? 'negative' : 'primary'"
            size="xs"
        >
            <QTooltip>
-                {{ $t('salesTicketsTable.risk') }}:
-                {{ toCurrency(row.risk - (row.credit ?? 0)) }}
+                {{ $t('salesTicketsTable.risk') }}: {{ row.risk - row.credit }}
            </QTooltip>
        </QIcon>
        <QIcon
@ -89,7 +52,12 @@ defineProps({ row: { type: Object, required: true } });
        >
            <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
        </QIcon>
-        <QIcon v-if="row?.isTaxDataChecked" name="vn:no036" color="primary" size="xs">
+        <QIcon
+            v-if="!row?.isTaxDataChecked === 0"
+            name="vn:no036"
+            color="primary"
+            size="xs"
+        >
            <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
        </QIcon>
        <QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs">
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@ -10,7 +10,6 @@ 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: {
@ -87,7 +86,7 @@ const makeInvoice = async () => {
            (data) => (
                (rectificativeTypeOptions = data),
                (transferInvoiceParams.cplusRectificationTypeFk = data.filter(
-                    (type) => type.description == 'I – Por diferencias',
+                    (type) => type.description == 'I – Por diferencias'
                )[0].id)
            )
        "
@ -100,7 +99,7 @@ const makeInvoice = async () => {
            (data) => (
                (siiTypeInvoiceOutsOptions = data),
                (transferInvoiceParams.siiTypeInvoiceOutFk = data.filter(
-                    (type) => type.code == 'R4',
+                    (type) => type.code == 'R4'
                )[0].id)
            )
        "
@ -122,6 +121,7 @@ const makeInvoice = async () => {
                <VnRow>
                    <VnSelect
                        :label="t('Client')"
+                        :options="clientsOptions"
                        hide-selected
                        option-label="name"
                        option-value="id"
@ -186,11 +186,15 @@ const makeInvoice = async () => {
                    />
                </VnRow>
                <VnRow>
-                    <VnCheckbox
-                        v-model="checked"
-                        :label="t('Bill destination client')"
-                        :info="t('transferInvoiceInfo')"
-                    />
+                    <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>
                </VnRow>
            </template>
        </FormPopup>
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@ -1,8 +1,9 @@
 <script setup>
 import { markRaw, computed } from 'vue';
-import { QIcon, QToggle } from 'quasar';
+import { QIcon, QCheckbox } 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';
@ -11,11 +12,8 @@ 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,
@ -41,18 +39,10 @@ const $props = defineProps({
        type: Object,
        default: null,
    },
-    autofocus: {
-        type: Boolean,
-        default: false,
-    },
    showLabel: {
        type: Boolean,
        default: null,
    },
-    eventHandlers: {
-        type: Object,
-        default: null,
-    },
 });

 const defaultSelect = {
@ -109,8 +99,7 @@ const defaultComponents = {
        },
    },
    checkbox: {
-        ref: 'checkbox',
-        component: markRaw(VnCheckbox),
+        component: markRaw(QCheckbox),
        attrs: ({ model }) => {
            const defaultAttrs = {
                disable: !$props.isEditable,
@ -126,10 +115,6 @@ const defaultComponents = {
        },
        forceAttrs: {
            label: $props.showLabel && $props.column.label,
-            autofocus: true,
-        },
-        events: {
-            blur: () => emit('blur'),
        },
    },
    select: {
@ -140,19 +125,12 @@ 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(() => {
@ -182,28 +160,7 @@ const col = computed(() => {
    return newColumn;
 });

-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;
-    }, {});
-});
+const components = computed(() => $props.components ?? defaultComponents);
 </script>
 <template>
    <div class="row no-wrap">
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@ -1,13 +1,14 @@
 <script setup>
 import { markRaw, computed } from 'vue';
-import { QCheckbox, QToggle } from 'quasar';
+import { QCheckbox } 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 VnCheckbox from 'components/common/VnCheckbox.vue';
-import VnColumn from 'components/VnTable/VnColumn.vue';
+import VnTableColumn from 'components/VnTable/VnColumn.vue';

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

 defineExpose({ addFilter, props: $props });
@ -37,7 +34,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);

@ -49,18 +46,19 @@ 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-pt-none fit ${$props.customClass}`,
+        class: 'q-px-sm q-pb-xs q-pt-none fit',
        dense: true,
        filled: !$props.showTitle,
    },
@ -92,6 +90,7 @@ const components = {
        event: updateEvent,
        attrs: {
            ...defaultAttrs,
+            style: 'min-width: 150px',
        },
        forceAttrs,
    },
@ -107,27 +106,17 @@ const components = {
        },
    },
    checkbox: {
-        component: markRaw(VnCheckbox),
+        component: markRaw(QCheckbox),
        event: updateEvent,
        attrs: {
-            class: $props.showTitle ? 'q-py-sm' : 'q-px-md q-py-xs fit',
+            dense: true,
+            class: $props.showTitle ? 'q-py-sm q-mt-md' : '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) {
@ -143,8 +132,19 @@ 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,8 +152,13 @@ const onTabPressed = async () => {
 };
 </script>
 <template>
-    <div v-if="showFilter" class="full-width" style="overflow: hidden">
-        <VnColumn
+    <div
+        v-if="showFilter"
+        class="full-width"
+        :class="alignRow()"
+        style="max-height: 45px; overflow: hidden"
+    >
+        <VnTableColumn
            :column="$props.column"
            default="input"
            v-model="model"
@ -163,8 +168,3 @@ 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,10 +23,6 @@ const $props = defineProps({
        type: Boolean,
        default: false,
    },
-    align: {
-        type: String,
-        default: 'end',
-    },
 });
 const hover = ref();
 const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
@ -45,78 +41,55 @@ 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="items-center no-wrap cursor-pointer title"
-        :style="textAlignToFlex(align)"
+        class="row items-center no-wrap cursor-pointer"
    >
        <span :title="label">{{ label }}</span>
-        <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"
+        <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
-                    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>
+                {{ model?.index }}
+                <QIcon
+                    :name="
+                        model?.index
+                            ? model?.direction == 'DESC'
+                                ? 'arrow_downward'
+                                : 'arrow_upward'
+                            : 'swap_vert'
+                    "
+                    size="xs"
+                />
+            </div>
+        </QChip>
    </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,39 +1,22 @@
 <script setup>
-import {
-    ref,
-    onBeforeMount,
-    onMounted,
-    onUnmounted,
-    computed,
-    watch,
-    h,
-    render,
-    inject,
-    useAttrs,
-    nextTick,
-} from 'vue';
-import { useArrayData } from 'src/composables/useArrayData';
+import { ref, onBeforeMount, onMounted, computed, watch, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-import { useQuasar, date } from 'quasar';
+import { useQuasar } 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 VnColumn from 'components/VnTable/VnColumn.vue';
+import VnTableColumn 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';
-import RightMenu from '../common/RightMenu.vue';

-const arrayData = useArrayData(useAttrs()['data-key']);
 const $props = defineProps({
    columns: {
        type: Array,
@ -51,6 +34,10 @@ const $props = defineProps({
        type: Boolean,
        default: true,
    },
+    rightSearchIcon: {
+        type: Boolean,
+        default: true,
+    },
    rowClick: {
        type: [Function, Boolean],
        default: null,
@ -127,23 +114,7 @@ const $props = defineProps({
        type: Boolean,
        default: false,
    },
-    withFilters: {
-        type: Boolean,
-        default: true,
-    },
-    overlay: {
-        type: Boolean,
-        default: false,
-    },
-    createComplement: {
-        type: Object,
-    },
-    dataCy: {
-        type: String,
-        default: 'vnTable',
-    },
 });
-
 const { t } = useI18n();
 const stateStore = useStateStore();
 const route = useRoute();
@ -161,17 +132,10 @@ 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',
@ -192,8 +156,7 @@ onBeforeMount(() => {
    hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
 });

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

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

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

 function splitColumns(columns) {
    splittedColumns.value = {
@ -257,9 +209,7 @@ function splitColumns(columns) {
            col.columnFilter = { inWhere: true, ...col.columnFilter };
        splittedColumns.value.columns.push(col);
    }
-
-    splittedColumns.value.create = createOrderSort(splittedColumns.value.create);
-
+    // Status column
    if (splittedColumns.value.chips.length) {
        splittedColumns.value.columnChips = splittedColumns.value.chips.filter(
            (c) => !c.isId,
@ -275,30 +225,22 @@ function splitColumns(columns) {
    }
 }

-function createOrderSort(columns) {
-    const orderedColumn = columns
-        .map((column, index) =>
-            column.createOrder !== undefined ? { ...column, originalIndex: index } : null,
-        )
-        .filter((item) => item !== null);
-
-    orderedColumn.sort((a, b) => a.createOrder - b.createOrder);
-
-    const filteredColumns = columns.filter((col) => col.createOrder === undefined);
-
-    orderedColumn.forEach((col) => {
-        filteredColumns.splice(col.createOrder, 0, col);
-    });
-
-    return filteredColumns;
-}
-
 const rowClickFunction = computed(() => {
    if ($props.rowClick != undefined) return $props.rowClick;
    if ($props.redirect) return ({ id }) => redirectFn(id);
    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}` });
 }
@ -320,6 +262,21 @@ 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(_);
@ -338,14 +295,8 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
    if (evt?.shiftKey && added) {
        const rowIndex = selectedRows[0].$index;
        const selectedIndexes = new Set(selected.value.map((row) => row.$index));
-        const minIndex = selectedIndexes.size
-            ? Math.min(...selectedIndexes, rowIndex)
-            : 0;
-        const maxIndex = Math.max(...selectedIndexes, rowIndex);
-
-        for (let i = minIndex; i <= maxIndex; i++) {
-            const row = rows[i];
-            if (row.$index == rowIndex) continue;
+        for (const row of rows) {
+            if (row.$index == rowIndex) break;
            if (!selectedIndexes.has(row.$index)) {
                selected.value.push(row);
                selectedIndexes.add(row.$index);
@ -353,282 +304,16 @@ 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) {
-                    await updateSelectValue(value, column, row, oldValue);
-                } else row[column.name] = value;
-                await column?.cellEvent?.['update:modelValue']?.(value, oldValue, row);
-            },
-            keyup: async (event) => {
-                if (event.key === 'Enter')
-                    await destroyInput(rowId, 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 updateSelectValue(value, column, row, oldValue) {
-    row[column.name] = value[column.attrs?.optionValue ?? 'id'];
-
-    row[column?.name + 'VnTableTextValue'] = value[column.attrs?.optionLabel ?? 'name'];
-
-    if (column?.attrs?.find?.label)
-        row[column?.attrs?.find?.label] = value[column.attrs?.optionLabel ?? 'name'];
-
-    await column?.cellEvent?.['update:modelValue']?.(value, oldValue, row);
-}
-
-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 + 'VnTableTextValue']) {
-        if (selectRegex.test(col?.component) && row[col?.name + 'VnTableTextValue']) {
-            return dashIfEmpty(row[col?.name + 'VnTableTextValue']);
-        } 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}` });
-}
-
-function removeTextValue(data, getChanges) {
-    let changes = data.updates;
-    if (changes) {
-        for (const change of changes) {
-            for (const key in change.data) {
-                if (key.endsWith('VnTableTextValue')) {
-                    delete change.data[key];
-                }
-            }
-        }
-
-        data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
-    }
-    if ($attrs?.beforeSaveFn) data = $attrs.beforeSaveFn(data, getChanges);
-
-    return data;
-}
-
-function handleRowClick(event, row) {
-    if (event.ctrlKey) return rowCtrlClickFunction.value(event, row);
-    if (rowClickFunction.value) rowClickFunction.value(row);
-}
-
-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 () => {};
-});
 </script>
 <template>
-    <RightMenu v-if="$props.rightSearch" :overlay="overlay">
-        <template #right-panel>
+    <QDrawer
+        v-if="$props.rightSearch"
+        v-model="stateStore.rightDrawer"
+        side="right"
+        :width="256"
+        show-if-above
+    >
+        <QScrollArea class="fit">
            <VnTableFilter
                :data-key="$attrs['data-key']"
                :columns="columns"
@ -642,17 +327,16 @@ const rowCtrlClickFunction = computed(() => {
                    <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
                </template>
            </VnTableFilter>
-        </template>
-    </RightMenu>
+        </QScrollArea>
+    </QDrawer>
    <CrudModel
        v-bind="$attrs"
        :class="$attrs['class'] ?? 'q-px-md'"
-        :limit="$attrs['limit'] ?? 100"
+        :limit="$attrs['limit'] ?? 20"
        ref="CrudModelRef"
        @on-fetch="(...args) => emit('onFetch', ...args)"
        :search-url="searchUrl"
        :disable-infinite-scroll="isTableMode"
-        :before-save-fn="removeTextValue"
        @save-changes="reload"
        :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
        :auto-load="hasParams || $attrs['auto-load']"
@ -664,12 +348,8 @@ const rowCtrlClickFunction = computed(() => {
            <QTable
                ref="tableRef"
                v-bind="table"
-                :class="[
-                    'vnTable',
-                    table ? 'selection-cell' : '',
-                    $props.footer ? 'last-row-sticky' : '',
-                ]"
-                wrap-cells
+                class="vnTable"
+                :class="{ 'last-row-sticky': $props.footer }"
                :columns="splittedColumns.columns"
                :rows="rows"
                v-model:selected="selected"
@ -680,17 +360,14 @@ const rowCtrlClickFunction = computed(() => {
                :style="isTableMode && `max-height: ${tableHeight}`"
                :virtual-scroll="isTableMode"
                @virtual-scroll="handleScroll"
-                @row-click="(event, row) => handleRowClick(event, row)"
+                @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
                @update:selected="emit('update:selected', $event)"
                @selection="(details) => handleSelection(details, rows)"
-                :hide-selected-banner="true"
-                :data-cy
            >
                <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"
@ -698,50 +375,49 @@ const rowCtrlClickFunction = computed(() => {
                        :skip="columnsVisibilitySkipped"
                    />
                    <QBtnToggle
-                        v-if="!tableModes.some((mode) => mode.disable)"
                        v-model="mode"
                        toggle-color="primary"
                        class="bg-vn-section-color"
                        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"
-                        v-bind:class="col.headerClass"
-                        class="body-cell"
-                        :style="col?.width ? `max-width: ${col?.width}` : ''"
+                        :style="col.headerStyle"
+                        :class="col.headerClass"
                    >
                        <div
-                            class="no-padding"
-                            :style="[
-                                withFilters && $props.columnSearch ? 'height: 75px' : '',
-                            ]"
+                            class="column ellipsis"
+                            :class="`text-${col?.align ?? 'left'}`"
+                            :style="$props.columnSearch ? 'height: 75px' : ''"
                        >
-                            <div style="height: 30px">
+                            <div class="row items-center no-wrap" 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?.labelAbbreviation ?? col?.label"
+                                    :label="col?.label"
                                    :data-key="$attrs['data-key']"
                                    :search-url="searchUrl"
-                                    :align="getColAlign(col)"
                                />
                            </div>
                            <VnFilter
-                                v-if="
-                                    $props.columnSearch &&
-                                    col.columnSearch !== false &&
-                                    withFilters
-                                "
+                                v-if="$props.columnSearch"
                                :column="col"
                                :show-title="true"
                                :data-key="$attrs['data-key']"
                                v-model="params[columnName(col)]"
                                :search-url="searchUrl"
-                                customClass="header-filter"
+                                class="full-width"
                            />
                        </div>
                    </QTh>
@ -759,68 +435,32 @@ const rowCtrlClickFunction = computed(() => {
                    </QTd>
                </template>
                <template #body-cell="{ col, row, rowIndex }">
+                    <!-- Columns -->
                    <QTd
-                        class="no-margin q-px-xs"
+                        auto-width
+                        class="no-margin"
+                        :class="[getColAlign(col), col.columnClass]"
+                        :style="col.style"
                        v-if="col.visible ?? true"
-                        :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"
+                        @click.ctrl="
+                            ($event) =>
+                                rowCtrlClickFunction && rowCtrlClickFunction($event, row)
+                        "
                    >
-                        <div
-                            class="no-padding no-margin"
-                            style="
-                                overflow: hidden;
-                                text-overflow: ellipsis;
-                                white-space: nowrap;
-                            "
-                            :data-cy="`vnTableCell_${col.name}`"
+                        <slot
+                            :name="`column-${col.name}`"
+                            :col="col"
+                            :row="row"
+                            :row-index="rowIndex"
                        >
-                            <slot
-                                :name="`column-${col.name}`"
-                                :col="col"
+                            <VnTableColumn
+                                :column="col"
                                :row="row"
-                                :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>
+                                :is-editable="col.isEditable ?? isEditable"
+                                v-model="row[col.name]"
+                                component-prop="columnField"
+                            />
+                        </slot>
                    </QTd>
                </template>
                <template #body-cell-tableActions="{ col, row }">
@ -841,7 +481,7 @@ const rowCtrlClickFunction = computed(() => {
                            flat
                            dense
                            :class="
-                                btn.isPrimary ? 'text-primary-light' : 'color-vn-label'
+                                btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
                            "
                            :style="`visibility: ${
                                ((btn.show && btn.show(row)) ?? true)
@ -849,19 +489,23 @@ const rowCtrlClickFunction = computed(() => {
                                    : 'hidden'
                            }`"
                            @click="btn.action(row)"
-                            :data-cy="btn?.name ?? `tableAction-${index}`"
                        />
                    </QTd>
                </template>
                <template #item="{ row, colsMap }">
                    <component
-                        v-bind:is="'div'"
-                        @click="(event) => cardClick(event, row)"
+                        :is="$props.redirect ? 'router-link' : 'span'"
+                        :to="`/${$props.redirect}/` + row.id"
                    >
                        <QCard
                            bordered
                            flat
                            class="row no-wrap justify-between cursor-pointer q-pa-sm"
+                            @click="
+                                (_, row) => {
+                                    $props.rowClick && $props.rowClick(row);
+                                }
+                            "
                            style="height: 100%"
                        >
                            <QCardSection
@ -898,7 +542,7 @@ const rowCtrlClickFunction = computed(() => {
                                </QCardSection>
                                <!-- Fields -->
                                <QCardSection
-                                    class="q-pl-sm q-py-xs"
+                                    class="q-pl-sm q-pr-lg q-py-xs"
                                    :class="$props.cardClass"
                                >
                                    <div
@ -919,25 +563,13 @@ const rowCtrlClickFunction = computed(() => {
                                                        :row="row"
                                                        :row-index="index"
                                                    >
-                                                        <VnColumn
-                                                            :column="{
-                                                                ...col,
-                                                                disable:
-                                                                    col?.component ===
-                                                                    'checkbox'
-                                                                        ? true
-                                                                        : false,
-                                                            }"
+                                                        <VnTableColumn
+                                                            :column="col"
                                                            :row="row"
                                                            :is-editable="false"
                                                            v-model="row[col.name]"
                                                            component-prop="columnField"
-                                                            :show-label="
-                                                                col?.component ===
-                                                                'checkbox'
-                                                                    ? false
-                                                                    : true
-                                                            "
+                                                            :show-label="true"
                                                        />
                                                    </slot>
                                                </span>
@ -957,14 +589,13 @@ const rowCtrlClickFunction = computed(() => {
                                    :key="index"
                                    :title="btn.title"
                                    :icon="btn.icon"
-                                    data-cy="cardBtn"
                                    class="q-pa-xs"
+                                    flat
                                    :class="
                                        btn.isPrimary
                                            ? 'text-primary-light'
-                                            : 'color-vn-label'
+                                            : 'color-vn-text '
                                    "
-                                    flat
                                    @click="btn.action(row)"
                                />
                            </QCardSection>
@ -972,19 +603,14 @@ const rowCtrlClickFunction = computed(() => {
                    </component>
                </template>
                <template #bottom-row="{ cols }" v-if="$props.footer">
-                    <QTr v-if="rows.length" style="height: 45px">
-                        <QTh v-if="table.selection" />
+                    <QTr v-if="rows.length" style="height: 30px">
                        <QTh
                            v-for="col of cols.filter((cols) => cols.visible ?? true)"
                            :key="col?.id"
+                            class="text-center"
                            :class="getColAlign(col)"
-                            :style="col?.width ? `max-width: ${col?.width}` : ''"
-                            style="font-size: small"
                        >
-                            <slot
-                                :name="`column-footer-${col.name}`"
-                                :isEditableColumn="isEditableColumn(col)"
-                            />
+                            <slot :name="`column-footer-${col.name}`" />
                        </QTh>
                    </QTr>
                </template>
@ -1028,57 +654,33 @@ const rowCtrlClickFunction = computed(() => {
            {{ createForm?.title }}
        </QTooltip>
    </QPageSticky>
-    <QDialog
-        v-model="showForm"
-        transition-show="scale"
-        transition-hide="scale"
-        :full-width="createComplement?.isFullWidth ?? false"
-        data-cy="vn-table-create-dialog"
-    >
+    <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
        <FormModelPopup
-            ref="createRef"
            v-bind="createForm"
            :model="$attrs['data-key'] + 'Create'"
            @on-data-saved="(_, res) => createForm.onDataSaved(res)"
        >
            <template #form-inputs="{ data }">
-                <slot name="alter-create" :data="data">
-                    <div :style="createComplement?.containerStyle">
-                        <div
-                            :style="createComplement?.previousStyle"
-                            v-if="!quasar.screen.xs"
-                        >
-                            <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,
-                                        ...column?.createAttrs,
-                                    }"
-                                    :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>
-                </slot>
+                <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>
            </template>
        </FormModelPopup>
    </QDialog>
@ -1095,42 +697,6 @@ 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);
@ -1147,21 +713,18 @@ es:

 .grid-three {
    display: grid;
-    grid-template-columns: repeat(auto-fit, minmax(300px, max-content));
-    width: 100%;
+    grid-template-columns: repeat(auto-fit, minmax(350px, max-content));
+    max-width: 100%;
    grid-gap: 20px;
    margin: 0 auto;
 }

 .grid-create {
    display: grid;
-    grid-template-columns: 1fr 1fr;
+    grid-template-columns: repeat(auto-fit, minmax(150px, max-content));
    max-width: 100%;
    grid-gap: 20px;
    margin: 0 auto;
-    .col-span-2 {
-        grid-column: span 2;
-    }
 }

 .flex-one {
@ -1175,9 +738,7 @@ es:
        }
    }
 }
-.q-table tbody tr td {
-    position: relative;
-}
+
 .q-table {
    th {
        padding: 0;
@ -1226,7 +787,6 @@ es:
 .vn-label-value {
    display: flex;
    flex-direction: row;
-    align-items: center;
    color: var(--vn-text-color);
    .value {
        overflow: hidden;
@ -1278,15 +838,4 @@ 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,36 +27,31 @@ function columnName(col) {
 </script>
 <template>
    <VnFilterPanel v-bind="$attrs" :search-button="true" :disable-submit-event="true">
-        <template #body="{ params, orders, searchFn }">
+        <template #body="{ params, orders }">
            <div
-                class="container"
+                class="row no-wrap flex-center"
                v-for="col of columns.filter((c) => c.columnFilter ?? true)"
                :key="col.id"
            >
-                <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>
+                <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>
            <slot
                name="moreFilterPanel"
                :params="params"
-                :search-fn="searchFn"
                :orders="orders"
                :columns="columns"
            />
@ -72,21 +67,3 @@ 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,21 +32,16 @@ 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, labelAbbreviation } = column;
+        const { label, name } = column;
        if (skippeds[name]) continue;
        column.visible = data[name] ?? true;
-        if (!isLocal)
-            localColumns.value.push({
-                name,
-                label,
-                labelAbbreviation,
-                visible: column.visible,
-            });
+        if (!isLocal) localColumns.value.push({ name, label, visible: column.visible });
    }
 }

@ -157,11 +152,7 @@ onMounted(async () => {
                    <QCheckbox
                        v-for="col in localColumns"
                        :key="col.name"
-                        :label="
-                            col?.labelAbbreviation
-                                ? col.labelAbbreviation + ` (${col.label ?? col.name})`
-                                : (col.label ?? col.name)
-                        "
+                        :label="col.label ?? col.name"
                        v-model="col.visible"
                    />
                </div>
--- a/src/components/VnTable/tests/VnTable.spec.js
+++ b/src/components/VnTable/tests/VnTable.spec.js
@ -27,58 +27,30 @@ describe('VnTable', () => {
    beforeEach(() => (vm.selected = []));

    describe('handleSelection()', () => {
-        const rows = [
-            { $index: 0 },
-            { $index: 1 },
-            { $index: 2 },
-            { $index: 3 },
-            { $index: 4 },
-        ];
-
-        it('should add rows to selected when shift key is pressed and rows are added in ascending order', () => {
-            const selectedRows = [{ $index: 1 }];
+        const rows = [{ $index: 0 }, { $index: 1 }, { $index: 2 }];
+        const selectedRows = [{ $index: 1 }];
+        it('should add rows to selected when shift key is pressed and rows are added except last one', () => {
            vm.handleSelection(
                { evt: { shiftKey: true }, added: true, rows: selectedRows },
-                rows,
+                rows
            );
            expect(vm.selected).toEqual([{ $index: 0 }]);
        });

-        it('should add rows to selected when shift key is pressed and rows are added in descending order', () => {
-            const selectedRows = [{ $index: 3 }];
-            vm.handleSelection(
-                { evt: { shiftKey: true }, added: true, rows: selectedRows },
-                rows,
-            );
-            expect(vm.selected).toEqual([{ $index: 0 }, { $index: 1 }, { $index: 2 }]);
-        });
-
        it('should not add rows to selected when shift key is not pressed', () => {
-            const selectedRows = [{ $index: 1 }];
            vm.handleSelection(
                { evt: { shiftKey: false }, added: true, rows: selectedRows },
-                rows,
+                rows
            );
            expect(vm.selected).toEqual([]);
        });

        it('should not add rows to selected when rows are not added', () => {
-            const selectedRows = [{ $index: 1 }];
            vm.handleSelection(
                { evt: { shiftKey: true }, added: false, rows: selectedRows },
-                rows,
+                rows
            );
            expect(vm.selected).toEqual([]);
        });
-
-        it('should add all rows between the smallest and largest selected indexes', () => {
-            vm.selected = [{ $index: 1 }, { $index: 3 }];
-            const selectedRows = [{ $index: 4 }];
-            vm.handleSelection(
-                { evt: { shiftKey: true }, added: true, rows: selectedRows },
-                rows,
-            );
-            expect(vm.selected).toEqual([{ $index: 1 }, { $index: 3 }, { $index: 2 }]);
-        });
    });
 });
--- a/src/components/tests/CrudModel.spec.js
+++ b/src/components/tests/CrudModel.spec.js
@ -30,8 +30,8 @@ describe('CrudModel', () => {
                saveFn: '',
            },
        });
-        wrapper = wrapper.wrapper;
-        vm = wrapper.vm;
+        wrapper=wrapper.wrapper;
+        vm=wrapper.vm;
    });

    beforeEach(() => {
@ -143,14 +143,14 @@ describe('CrudModel', () => {
        });

        it('should return true if object is empty', async () => {
-            dummyObj = {};
-            result = vm.isEmpty(dummyObj);
+            dummyObj ={};
+            result = vm.isEmpty(dummyObj);    

            expect(result).toBe(true);
        });

        it('should return false if object is not empty', async () => {
-            dummyObj = { a: 1, b: 2, c: 3 };
+            dummyObj = {a:1, b:2, c:3};
            result = vm.isEmpty(dummyObj);

            expect(result).toBe(false);
@ -158,31 +158,29 @@ describe('CrudModel', () => {

        it('should return true if array is empty', async () => {
            dummyArray = [];
-            result = vm.isEmpty(dummyArray);
+            result = vm.isEmpty(dummyArray); 

            expect(result).toBe(true);
        });
-
+        
        it('should return false if array is not empty', async () => {
-            dummyArray = [1, 2, 3];
+            dummyArray = [1,2,3];
            result = vm.isEmpty(dummyArray);

            expect(result).toBe(false);
-        });
+        })
    });

    describe('resetData()', () => {
        it('should add $index to elements in data[] and sets originalData and formData with data', async () => {
-            data = [
-                {
-                    name: 'Tony',
-                    lastName: 'Stark',
-                    age: 42,
-                },
-            ];
+            data = [{
+                name: 'Tony',
+                lastName: 'Stark',
+                age: 42,
+            }];

            vm.resetData(data);
-
+            
            expect(vm.originalData).toEqual(data);
            expect(vm.originalData[0].$index).toEqual(0);
            expect(vm.formData).toEqual(data);
@ -202,7 +200,7 @@ describe('CrudModel', () => {
                lastName: 'Stark',
                age: 42,
            };
-
+            
            vm.resetData(data);

            expect(vm.originalData).toEqual(data);
@ -212,19 +210,17 @@ describe('CrudModel', () => {
    });

    describe('saveChanges()', () => {
-        data = [
-            {
-                name: 'Tony',
-                lastName: 'Stark',
-                age: 42,
-            },
-        ];
+        data = [{
+            name: 'Tony',
+            lastName: 'Stark',
+            age: 42,
+        }];

        it('should call saveFn if exists', async () => {
            await wrapper.setProps({ saveFn: vi.fn() });

            vm.saveChanges(data);
-
+            
            expect(vm.saveFn).toHaveBeenCalledOnce();
            expect(vm.isLoading).toBe(false);
            expect(vm.hasChanges).toBe(false);
@ -233,15 +229,13 @@ describe('CrudModel', () => {
        });

        it("should use default url if there's not saveFn", async () => {
-            const postMock = vi.spyOn(axios, 'post');
-
-            vm.formData = [
-                {
-                    name: 'Bruce',
-                    lastName: 'Wayne',
-                    age: 45,
-                },
-            ];
+            const postMock =vi.spyOn(axios, 'post');
+            
+            vm.formData = [{
+                name: 'Bruce',
+                lastName: 'Wayne',
+                age: 45,
+            }]

            await vm.saveChanges(data);

--- a/src/components/tests/FormModel.spec.js
+++ b/src/components/tests/FormModel.spec.js
@ -57,7 +57,6 @@ 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);
@ -95,12 +94,8 @@ 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 } });
-
-            vm.formData = {};
+            vm.formData.mockKey = 'newVal';
            await vm.$nextTick();
-            vm.formData = { mockKey: 'newVal' };
-            await vm.$nextTick();
-
            await vm.save();
            expect(spy).toHaveBeenCalled();
            vm.formData.mockKey = 'mockVal';
--- a/src/components/tests/Leftmenu.spec.js
+++ b/src/components/tests/Leftmenu.spec.js
@ -15,7 +15,10 @@ vi.mock('src/router/modules', () => ({
            meta: {
                title: 'customers',
                icon: 'vn:client',
-                menu: ['CustomerList', 'CustomerCreate'],
+            },
+            menus: {
+                main: ['CustomerList', 'CustomerCreate'],
+                card: ['CustomerBasicData'],
            },
            children: [
                {
@ -47,6 +50,14 @@ vi.mock('src/router/modules', () => ({
                                ],
                            },
                        },
+                        {
+                            path: 'create',
+                            name: 'CustomerCreate',
+                            meta: {
+                                title: 'createCustomer',
+                                icon: 'vn:addperson',
+                            },
+                        },
                    ],
                },
            ],
@ -87,7 +98,7 @@ vi.spyOn(vueRouter, 'useRoute').mockReturnValue({
                icon: 'vn:client',
                moduleName: 'Customer',
                keyBinding: 'c',
-                menu: ['customer'],
+                menu: 'customer',
            },
        },
    ],
@ -249,6 +260,15 @@ describe('Leftmenu as main', () => {
        });
    });

+    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();
@ -331,9 +351,8 @@ describe('addChildren', () => {

    it('should handle routes with no meta menu', () => {
        const route = {
-            meta: {
-                menu: [],
-            },
+            meta: {},
+            menus: {},
        };

        const parent = [];
--- a/src/components/tests/UserPanel.spec.js
+++ b/src/components/tests/UserPanel.spec.js
@ -1,65 +1,61 @@
-import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
+import { vi, describe, expect, it, beforeEach, beforeAll, afterEach } from 'vitest';
 import { createWrapper } from 'app/test/vitest/helper';
 import UserPanel from 'src/components/UserPanel.vue';
 import axios from 'axios';
 import { useState } from 'src/composables/useState';

-vi.mock('src/utils/quasarLang', () => ({
-  default: vi.fn(),
-}));
-
 describe('UserPanel', () => {
-  let wrapper;
-  let 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,
+    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;
    });
-    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);
-    await 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);
+        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);
-    await 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);
+        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/RightMenu.vue
+++ b/src/components/common/RightMenu.vue
@ -11,13 +11,6 @@ const stateStore = useStateStore();
 const slots = useSlots();
 const hasContent = useHasContent('#right-panel');

-defineProps({
-    overlay: {
-        type: Boolean,
-        default: false,
-    },
-});
-
 onMounted(() => {
    if ((!slots['right-panel'] && !hasContent.value) || quasar.platform.is.mobile)
        stateStore.rightDrawer = false;
@ -41,12 +34,7 @@ onMounted(() => {
            </QBtn>
        </div>
    </Teleport>
-    <QDrawer
-        v-model="stateStore.rightDrawer"
-        side="right"
-        :width="256"
-        :overlay="overlay"
-    >
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256">
        <QScrollArea class="fit">
            <div id="right-panel"></div>
            <slot v-if="!hasContent" name="right-panel" />
--- a/src/components/common/SendEmailDialog.vue
+++ b/src/components/common/SendEmailDialog.vue
@ -56,12 +56,7 @@ async function confirm() {
                {{ t('The notification will be sent to the following address') }}
            </QCardSection>
            <QCardSection class="q-pt-none">
-                <VnInput
-                    v-model="address"
-                    is-outlined
-                    autofocus
-                    data-cy="SendEmailNotifiactionDialogInput"
-                />
+                <VnInput v-model="address" is-outlined autofocus />
            </QCardSection>
            <QCardActions align="right">
                <QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
--- a/src/components/common/VnAccountNumber.vue
+++ b/src/components/common/VnAccountNumber.vue
@ -1,9 +1,12 @@
 <script setup>
-import { nextTick, ref } from 'vue';
-import VnInput from './VnInput.vue';
-import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
+import { nextTick, ref, watch } from 'vue';
+import { QInput } from 'quasar';

 const $props = defineProps({
+    modelValue: {
+        type: String,
+        default: '',
+    },
    insertable: {
        type: Boolean,
        default: false,
@ -11,25 +14,70 @@ const $props = defineProps({
 });

 const emit = defineEmits(['update:modelValue', 'accountShortToStandard']);
-const model = defineModel({ prop: 'modelValue' });
-const inputRef = ref(false);

-function setCursorPosition(pos) {
-    const input = inputRef.value.vnInputRef.$el.querySelector('input');
-    input.focus();
-    input.setSelectionRange(pos, pos);
+let internalValue = ref($props.modelValue);
+
+watch(
+    () => $props.modelValue,
+    (newVal) => {
+        internalValue.value = newVal;
+    }
+);
+
+watch(
+    () => internalValue.value,
+    (newVal) => {
+        emit('update:modelValue', newVal);
+        accountShortToStandard();
+    }
+);
+
+const handleKeydown = (e) => {
+    if (e.key === 'Backspace') return;
+    if (e.key === '.') {
+        accountShortToStandard();
+        // TODO: Fix this setTimeout, with nextTick doesn't work
+        setTimeout(() => {
+            setCursorPosition(0, e.target);
+        }, 1);
+        return;
+    }
+
+    if ($props.insertable && e.key.match(/[0-9]/)) {
+        handleInsertMode(e);
+    }
+};
+function setCursorPosition(pos, el = vnInputRef.value) {
+    el.focus();
+    el.setSelectionRange(pos, pos);
 }
-
-async function handleUpdateModel(val) {
-    model.value = val?.at(-1) === '.' ? useAccountShortToStandard(val) : val;
-    await nextTick(() => setCursorPosition(0));
+const vnInputRef = ref(false);
+const handleInsertMode = (e) => {
+    e.preventDefault();
+    const input = e.target;
+    const cursorPos = input.selectionStart;
+    const { maxlength } = vnInputRef.value;
+    let currentValue = internalValue.value;
+    if (!currentValue) currentValue = e.key;
+    const newValue = e.key;
+    if (newValue && !isNaN(newValue) && cursorPos < maxlength) {
+        internalValue.value =
+            currentValue.substring(0, cursorPos) +
+            newValue +
+            currentValue.substring(cursorPos + 1);
+    }
+    nextTick(() => {
+        input.setSelectionRange(cursorPos + 1, cursorPos + 1);
+    });
+};
+function accountShortToStandard() {
+    internalValue.value = internalValue.value?.replace(
+        '.',
+        '0'.repeat(11 - internalValue.value.length)
+    );
 }
 </script>
+
 <template>
-    <VnInput
-        v-model="model"
-        ref="inputRef"
-        :insertable
-        @update:model-value="handleUpdateModel"
-    />
+    <QInput @keydown="handleKeydown" ref="vnInputRef" v-model="internalValue" />
 </template>
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@ -1,56 +1,50 @@
 <script setup>
-import { onBeforeMount } from 'vue';
-import { useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
+import { onBeforeMount, computed } from 'vue';
+import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
 import VnSubToolbar from '../ui/VnSubToolbar.vue';
-
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import LeftMenu from 'components/LeftMenu.vue';
+import RightMenu from 'components/common/RightMenu.vue';
 const props = defineProps({
    dataKey: { type: String, required: true },
    url: { type: String, default: undefined },
-    idInWhere: { type: Boolean, default: false },
    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 },
 });

 const stateStore = useStateStore();
+const route = useRoute();
 const router = useRouter();
+const searchRightDataKey = computed(() => {
+    if (!props.searchDataKey) return route.name;
+    return props.searchDataKey;
+});
+
 const arrayData = useArrayData(props.dataKey, {
    url: props.url,
    userFilter: props.filter,
    oneRecord: true,
 });

-onBeforeRouteLeave(() => {
-    stateStore.cardDescriptorChangeValue(null);
-});
-
 onBeforeMount(async () => {
-    stateStore.cardDescriptorChangeValue(props.descriptor);
-
-    const route = router.currentRoute.value;
    try {
        await fetch(route.params.id);
    } catch {
-        const { matched: matches } = route;
+        const { matched: matches } = router.currentRoute.value;
        const { path } = matches.at(-1);
        router.push({ path: path.replace(/:id.*/, '') });
    }
 });

 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);
 });
@ -62,13 +56,34 @@ async function fetch(id, append = false) {
    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>
-    <VnSubToolbar />
-    <div :class="[useCardSize(), $attrs.class]">
-        <RouterView :key="$route.path" />
-    </div>
+    <QDrawer
+        v-model="stateStore.leftDrawer"
+        show-if-above
+        :width="256"
+        v-if="stateStore.isHeaderMounted()"
+    >
+        <QScrollArea class="fit">
+            <component :is="descriptor" />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <slot name="searchbar" v-if="props.searchDataKey">
+        <VnSearchbar :data-key="props.searchDataKey" v-bind="props.searchbarProps" />
+    </slot>
+    <RightMenu>
+        <template #right-panel v-if="props.filterPanel">
+            <component :is="props.filterPanel" :data-key="searchRightDataKey" />
+        </template>
+    </RightMenu>
+    <QPageContainer>
+        <QPage>
+            <VnSubToolbar />
+            <div :class="[useCardSize(), $attrs.class]">
+                <RouterView :key="$route.path" />
+            </div>
+        </QPage>
+    </QPageContainer>
 </template>
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@ -0,0 +1,64 @@
+<script setup>
+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';
+import LeftMenu from 'components/LeftMenu.vue';
+import VnSubToolbar from '../ui/VnSubToolbar.vue';
+
+const props = defineProps({
+    dataKey: { type: String, required: true },
+    url: { type: String, default: undefined },
+    idInWhere: { type: Boolean, default: false },
+    filter: { type: Object, default: () => {} },
+    descriptor: { type: Object, required: true },
+    filterPanel: { type: Object, default: undefined },
+    searchDataKey: { type: String, default: undefined },
+    searchbarProps: { type: Object, default: undefined },
+    redirectOnError: { type: Boolean, default: false },
+});
+
+const stateStore = useStateStore();
+const router = useRouter();
+const arrayData = useArrayData(props.dataKey, {
+    url: props.url,
+    userFilter: props.filter,
+    oneRecord: true,
+});
+
+onBeforeMount(async () => {
+    const route = router.currentRoute.value;
+    try {
+        await fetch(route.params.id);
+    } catch {
+        const { matched: matches } = route;
+        const { path } = matches.at(-1);
+        router.push({ path: path.replace(/:id.*/, '') });
+    }
+});
+
+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>
+    <Teleport to="#left-panel" v-if="stateStore.isHeaderMounted()">
+        <component :is="descriptor" />
+        <QSeparator />
+        <LeftMenu source="card" />
+    </Teleport>
+    <VnSubToolbar />
+    <div :class="[useCardSize(), $attrs.class]">
+        <RouterView :key="$route.path" />
+    </div>
+</template>
--- a/src/components/common/VnCheckbox.vue
+++ b/src/components/common/VnCheckbox.vue
@ -1,47 +0,0 @@
-<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-model="checkboxModel"
-            :data-cy="$attrs['data-cy'] ?? `vnCheckbox${$attrs['label'] ?? ''}`"
-        />
-        <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
@ -1,32 +0,0 @@
-<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,8 +17,6 @@ const $props = defineProps({
    },
 });

-const emit = defineEmits(['blur']);
-
 const componentArray = computed(() => {
    if (typeof $props.prop === 'object') return [$props.prop];
    return $props.prop;
@ -48,8 +46,7 @@ function toValueAttrs(attrs) {
    <span
        v-for="toComponent of componentArray"
        :key="toComponent.name"
-        class="column fit"
-        :class="toComponent?.component == 'checkbox' ? 'flex-center' : ''"
+        class="column flex-center fit"
    >
        <component
            v-if="toComponent?.component"
@ -57,7 +54,6 @@ 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/VnDms.vue
+++ b/src/components/common/VnDms.vue
@ -177,7 +177,6 @@ function addDefaultData(data) {
                            name="vn:attach"
                            class="cursor-pointer"
                            @click="inputFileRef.pickFiles()"
-                            data-cy="attachFile"
                        >
                            <QTooltip>{{ t('globals.selectFile') }}</QTooltip>
                        </QIcon>
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@ -389,7 +389,10 @@ defineExpose({
                    </div>
                </template>
            </QTable>
-            <div v-else class="info-row q-pa-md text-center">
+            <div 
+                v-else 
+                class="info-row q-pa-md text-center"
+            >
                <h5>
                    {{ t('No data to display') }}
                </h5>
@ -413,7 +416,6 @@ defineExpose({
            v-shortcut
            @click="showFormDialog()"
            class="fill-icon"
-            data-cy="addButton"
        >
            <QTooltip>
                {{ t('Upload file') }}
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@ -11,7 +11,6 @@ const emit = defineEmits([
    'update:options',
    'keyup.enter',
    'remove',
-    'blur',
 ]);

 const $props = defineProps({
@ -83,7 +82,7 @@ const mixinRules = [
    requiredFieldRule,
    ...($attrs.rules ?? []),
    (val) => {
-        const maxlength = $props.maxlength;
+        const { maxlength } = vnInputRef.value;
        if (maxlength && +val.length > maxlength)
            return t(`maxLength`, { value: maxlength });
        const { min, max } = vnInputRef.value.$attrs;
@ -108,7 +107,7 @@ const handleInsertMode = (e) => {
    e.preventDefault();
    const input = e.target;
    const cursorPos = input.selectionStart;
-    const maxlength = $props.maxlength;
+    const { maxlength } = vnInputRef.value;
    let currentValue = value.value;
    if (!currentValue) currentValue = e.key;
    const newValue = e.key;
@ -137,15 +136,14 @@ const handleUppercase = () => {
            :type="$attrs.type"
            :class="{ required: isRequired }"
            @keyup.enter="emit('keyup.enter')"
-            @blur="emit('blur')"
            @keydown="handleKeydown"
            :clearable="false"
            :rules="mixinRules"
            :lazy-rules="true"
            hide-bottom-space
-            :data-cy="($attrs['data-cy'] ?? $attrs.label) + '_input'"
+            :data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
        >
-            <template #prepend v-if="$slots.prepend">
+            <template #prepend>
                <slot name="prepend" />
            </template>
            <template #append>
@ -170,11 +168,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"
                >
@ -182,7 +180,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">
@ -196,15 +194,13 @@ 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>
@ -218,4 +214,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,7 +107,6 @@ const manageDate = (date) => {
            @click="isPopupOpen = !isPopupOpen"
            @keydown="isPopupOpen = false"
            hide-bottom-space
-            :data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
        >
            <template #append>
                <QIcon
--- a/src/components/common/VnInputNumber.vue
+++ b/src/components/common/VnInputNumber.vue
@ -8,7 +8,6 @@ defineProps({
 });

 const model = defineModel({ type: [Number, String] });
-const emit = defineEmits(['blur']);
 </script>
 <template>
    <VnInput
@ -25,6 +24,5 @@ const emit = defineEmits(['blur']);
                    model = parseFloat(val).toFixed(decimalPlaces);
            }
        "
-        @blur="emit('blur')"
    />
 </template>
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@ -85,7 +85,6 @@ const handleModelValue = (data) => {
        :tooltip="t('Create new location')"
        :rules="mixinRules"
        :lazy-rules="true"
-        required
    >
        <template #form>
            <CreateNewPostcode
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@ -10,7 +10,7 @@ import { useColor } from 'src/composables/useColor';
 import { useCapitalize } from 'src/composables/useCapitalize';
 import { useValidator } from 'src/composables/useValidator';
 import VnAvatar from '../ui/VnAvatar.vue';
-import VnLogValue from './VnLogValue.vue';
+import VnJsonValue from '../common/VnJsonValue.vue';
 import FetchData from '../FetchData.vue';
 import VnSelect from './VnSelect.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
@ -560,11 +560,10 @@ watch(
                                                                            value.nameI18n
                                                                        }}:
                                                                    </span>
-                                                                    <VnLogValue
+                                                                    <VnJsonValue
                                                                        :value="
                                                                            value.val.val
                                                                        "
-                                                                        :name="value.name"
                                                                    />
                                                                </QItem>
                                                            </QCardSection>
@ -615,11 +614,7 @@ watch(
                                                    >
                                                        {{ prop.nameI18n }}:
                                                    </span>
-                                                    <VnLogValue
-                                                        :value="prop.val.val"
-                                                        :name="prop.name"
-                                                    />
-                                                    <VnIconLink />
+                                                    <VnJsonValue :value="prop.val.val" />
                                                    <span
                                                        v-if="
                                                            propIndex <
@ -646,10 +641,17 @@ watch(
                                                    >
                                                        {{ prop.nameI18n }}:
                                                    </span>
+                                                    <VnJsonValue :value="prop.val.val" />
+                                                    <span
+                                                        v-if="prop.val.id"
+                                                        class="id-value"
+                                                    >
+                                                        #{{ prop.val.id }}
+                                                    </span>
                                                    <span v-if="log.action == 'update'">
-                                                        <VnLogValue
+                                                        ←
+                                                        <VnJsonValue
                                                            :value="prop.old.val"
-                                                            :name="prop.name"
                                                        />
                                                        <span
                                                            v-if="prop.old.id"
@ -657,28 +659,6 @@ watch(
                                                        >
                                                            #{{ prop.old.id }}
                                                        </span>
-                                                        →
-                                                        <VnLogValue
-                                                            :value="prop.val.val"
-                                                            :name="prop.name"
-                                                        />
-                                                        <span
-                                                            v-if="prop.val.id"
-                                                            class="id-value"
-                                                        >
-                                                            #{{ prop.val.id }}
-                                                        </span>
-                                                    </span>
-                                                    <span v-else="prop.old.val">
-                                                        <VnLogValue
-                                                            :value="prop.val.val"
-                                                            :name="prop.name"
-                                                        />
-                                                        <span
-                                                            v-if="prop.old.id"
-                                                            class="id-value"
-                                                            >#{{ prop.old.id }}</span
-                                                        >
                                                    </span>
                                                </div>
                                            </span>
--- a/src/components/common/VnLogValue.vue
+++ b/src/components/common/VnLogValue.vue
@ -1,22 +0,0 @@
-<script setup>
-import { useDescriptorStore } from 'src/stores/useDescriptorStore';
-import VnJsonValue from './VnJsonValue.vue';
-import { computed } from 'vue';
-const descriptorStore = useDescriptorStore();
-
-const $props = defineProps({
-    name: { type: [String], default: undefined },
-});
-
-const descriptor = computed(() => descriptorStore.has($props.name));
-</script>
-<template>
-    <VnJsonValue v-bind="$attrs" />
-    <QIcon
-        name="launch"
-        class="link"
-        v-if="$attrs.value && descriptor"
-        :data-cy="'iconLaunch-' + $props.name"
-    />
-    <component :is="descriptor" :id="$attrs.value" v-if="$attrs.value && descriptor" />
-</template>
--- a/src/components/common/VnModule.vue
+++ b/src/components/common/VnModule.vue
@ -12,7 +12,7 @@ const $props = defineProps({
    },
 });
 onMounted(
-    () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false),
+    () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false)
 );

 const teleportRef = ref({});
@ -35,14 +35,8 @@ onMounted(() => {
 <template>
    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
        <QScrollArea class="fit text-grey-8">
-            <div id="left-panel" ref="teleportRef">
-                <template v-if="stateStore.cardDescriptor">
-                    <component :is="stateStore.cardDescriptor" />
-                    <QSeparator />
-                    <LeftMenu source="card" />
-                </template>
-                <template v-else> <LeftMenu /></template>
-            </div>
+            <div id="left-panel" ref="teleportRef"></div>
+            <LeftMenu v-if="!hasContent" />
        </QScrollArea>
    </QDrawer>
    <QPageContainer>
--- a/src/components/common/VnPopupProxy.vue
+++ b/src/components/common/VnPopupProxy.vue
@ -1,38 +0,0 @@
-<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,14 +106,7 @@ 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
@ -1,5 +1,5 @@
 <script setup>
-import { ref, toRefs, computed, watch, onMounted, useAttrs, nextTick } from 'vue';
+import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useRequired } from 'src/composables/useRequired';
@ -171,8 +171,7 @@ 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,
@ -221,7 +220,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) {
@ -240,14 +239,13 @@ async function fetchFilter(val) {

    const { data } = await arrayData.applyFilter(
        { filter: filterOptions },
-        { updateRouter: false },
+        { updateRouter: false }
    );
    setOptions(data);
    return data;
 }

 async function filterHandler(val, update) {
-    if (isLoading.value) return update();
    if (!val && lastVal.value === val) {
        lastVal.value = val;
        return update();
@ -274,7 +272,7 @@ async function filterHandler(val, update) {
                ref.setOptionIndex(-1);
                ref.moveOptionSelection(1, true);
            }
-        },
+        }
    );
 }

@ -295,7 +293,6 @@ async function onScroll({ to, direction, from, index }) {
        await arrayData.loadMore();
        setOptions(arrayData.store.data);
        vnSelectRef.value.scrollTo(lastIndex);
-        await nextTick();
        isLoading.value = false;
    }
 }
@ -311,7 +308,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) {
@ -323,11 +320,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" @blur="emit('blur')" />
+    <VnSelect v-bind="$attrs" :options="$attrs.options ?? options" />
 </template>
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@ -37,6 +37,7 @@ const isAllowedToCreate = computed(() => {

 defineExpose({ vnSelectDialogRef: select });
 </script>
+
 <template>
    <VnSelect
        ref="select"
@ -66,6 +67,7 @@ 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,7 +1,9 @@
 <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>
@ -9,13 +11,11 @@ const model = defineModel({ type: [String, Number, Object] });
        :label="$t('globals.supplier')"
        v-bind="$attrs"
        v-model="model"
-        url="Suppliers"
+        :url="url"
        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
@ -1,50 +0,0 @@
-<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/VnSelectVies.vue
+++ b/src/components/common/VnSelectVies.vue
@ -0,0 +1,81 @@
+<script setup>
+import { ref } from 'vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+import { useI18n } from 'vue-i18n';
+
+const { t } = useI18n();
+const model = defineModel({ type: String, required: true });
+const countriesOption = ref([]);
+const countriesOptionCopy = ref([]);
+const lastVal = ref();
+
+function handleBlur() {
+    if (lastVal.value == '') lastVal.value = null;
+    model.value = lastVal.value && lastVal.value.toUpperCase().slice(0, 2);
+}
+
+function filterFn(val, update) {
+    update(
+        () => {
+            if (val === '') {
+                countriesOptionCopy.value = JSON.parse(
+                    JSON.stringify(countriesOption.value)
+                );
+                return;
+            }
+
+            const exist = countriesOption.value.filter((c) =>
+                c.code.toLowerCase().includes(val.toLowerCase())
+            );
+            if (exist) return (countriesOptionCopy.value = exist);
+            countriesOptionCopy.value = JSON.parse(JSON.stringify([{ code: val }]));
+        },
+        (ref) => {
+            if (val !== '' && ref.options.length > 0) {
+                ref.setOptionIndex(-1);
+                ref.moveOptionSelection(1, true);
+            }
+        }
+    );
+}
+</script>
+<template>
+    <FetchData auto-load @on-fetch="(data) => (countriesOption = data)" url="Countries" />
+    <VnSelect
+        :label="t('Vies')"
+        v-model="model"
+        :input-debounce="0"
+        :options="countriesOptionCopy"
+        @input-value="(evt) => (lastVal = evt) && handleBlur()"
+        @filter="filterFn"
+        option-label="code"
+        option-value="code"
+        v-bind="$attrs"
+    >
+        <template #option="scope">
+            <QItem v-bind="scope.itemProps">
+                <QItemSection>
+                    <QItemLabel>{{ scope.opt?.code }}</QItemLabel>
+                    <QItemLabel caption>
+                        {{ scope.opt?.code }},
+                        {{ scope.opt?.name }}
+                    </QItemLabel>
+                </QItemSection>
+            </QItem>
+        </template>
+        <template #after>
+            <QIcon name="info" class="cursor-pointer">
+                <QTooltip>{{ t('viesTip') }}</QTooltip>
+            </QIcon>
+        </template>
+    </VnSelect>
+</template>
+<i18n>
+es:
+    viesTip: El campo puede contener valores que no este en la lista
+
+en:
+    viesTip: The field may contain value that are not in the list
+
+</i18n>
--- a/src/components/common/tests/VnLogValue.spec.js
+++ b/src/components/common/tests/VnLogValue.spec.js
@ -1,26 +0,0 @@
-import { describe, it, expect } from 'vitest';
-import VnLogValue from 'src/components/common/VnLogValue.vue';
-import { createWrapper } from 'app/test/vitest/helper';
-
-const buildComponent = (props) => {
-    return createWrapper(VnLogValue, {
-        props,
-        global: {},
-    }).wrapper;
-};
-
-describe('VnLogValue', () => {
-    const id = 1;
-    it('renders without descriptor', async () => {
-        expect(getIcon('inventFk').exists()).toBe(false);
-    });
-
-    it('renders with descriptor', async () => {
-        expect(getIcon('claimFk').text()).toBe('launch');
-    });
-
-    function getIcon(name) {
-        const wrapper = buildComponent({ value: { val: id }, name });
-        return wrapper.find('.q-icon');
-    }
-});
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@ -5,8 +5,7 @@ import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useState } from 'src/composables/useState';
-import { useRoute, useRouter } from 'vue-router';
-import { useClipboard } from 'src/composables/useClipboard';
+import { useRoute } from 'vue-router';
 import VnMoreOptions from './VnMoreOptions.vue';

 const $props = defineProps({
@ -30,6 +29,10 @@ const $props = defineProps({
        type: String,
        default: null,
    },
+    module: {
+        type: String,
+        default: null,
+    },
    summary: {
        type: Object,
        default: null,
@ -38,32 +41,23 @@ const $props = defineProps({
        type: String,
        default: 'md-width',
    },
-    toModule: {
-        type: String,
-        default: null,
-    },
 });

 const state = useState();
 const route = useRoute();
-const router = useRouter();
 const { t } = useI18n();
-const { copyText } = useClipboard();
 const { viewSummary } = useSummaryDialog();
 let arrayData;
 let store;
 let entity;
 const isLoading = ref(false);
 const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
-const DESCRIPTOR_PROXY = 'DescriptorProxy';
-const moduleName = ref();
-const isSameModuleName = route.matched[1].meta.moduleName !== moduleName.value;
 defineExpose({ getData });

 onBeforeMount(async () => {
    arrayData = useArrayData($props.dataKey, {
        url: $props.url,
-        userFilter: $props.filter,
+        filter: $props.filter,
        skip: 0,
        oneRecord: true,
    });
@ -84,18 +78,6 @@ onBeforeMount(async () => {
    );
 });

-function getName() {
-    let name = $props.dataKey;
-    if ($props.dataKey.includes(DESCRIPTOR_PROXY)) {
-        name = name.split(DESCRIPTOR_PROXY)[0];
-    }
-    return name;
-}
-const routeName = computed(() => {
-    let routeName = getName();
-    return `${routeName}Summary`;
-});
-
 async function getData() {
    store.url = $props.url;
    store.filter = $props.filter ?? {};
@ -121,49 +103,22 @@ function getValueFromPath(path) {
    return current;
 }

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

-const iconModule = computed(() => {
-    moduleName.value = getName();
-    if ($props.toModule) {
-        return router.getRoutes().find((r) => r.name === $props.toModule.name).meta.icon;
-    }
-    if (isSameModuleName) {
-        return router.options.routes[1].children.find((r) => r.name === moduleName.value)
-            ?.meta?.icon;
-    } else {
-        return route.matched[1].meta.icon;
-    }
-});
-
-const toModule = computed(() => {
-    moduleName.value = getName();
-    if ($props.toModule) return $props.toModule;
-    if (isSameModuleName) {
-        return router.options.routes[1].children.find((r) => r.name === moduleName.value)
-            ?.redirect;
-    } else {
-        return route.matched[1].path.split('/').length > 2
-            ? route.matched[1].redirect
-            : route.matched[1].children[0].redirect;
-    }
-});
+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,
+);
 </script>

 <template>
-    <div class="descriptor" data-cy="cardDescriptor">
+    <div class="descriptor">
        <template v-if="entity && !isLoading">
            <div class="header bg-primary q-pa-sm justify-between">
-                <slot name="header-extra-action">
-                    <QBtn
+                <slot name="header-extra-action"
+                    ><QBtn
                        round
                        flat
                        dense
@ -171,13 +126,13 @@ const toModule = computed(() => {
                        :icon="iconModule"
                        color="white"
                        class="link"
-                        :to="toModule"
+                        :to="$attrs['to-module'] ?? toModule"
                    >
                        <QTooltip>
                            {{ t('globals.goToModuleIndex') }}
                        </QTooltip>
-                    </QBtn>
-                </slot>
+                    </QBtn></slot
+                >
                <QBtn
                    @click.stop="viewSummary(entity.id, $props.summary, $props.width)"
                    round
@ -188,13 +143,12 @@ const toModule = computed(() => {
                    color="white"
                    class="link"
                    v-if="summary"
-                    data-cy="openSummaryBtn"
                >
                    <QTooltip>
                        {{ t('components.smartCard.openSummary') }}
                    </QTooltip>
                </QBtn>
-                <RouterLink :to="{ name: routeName, params: { id: entity.id } }">
+                <RouterLink :to="{ name: `${module}Summary`, params: { id: entity.id } }">
                    <QBtn
                        class="link"
                        color="white"
@ -203,7 +157,6 @@ const toModule = computed(() => {
                        icon="launch"
                        round
                        size="md"
-                        data-cy="goToSummaryBtn"
                    >
                        <QTooltip>
                            {{ t('components.cardDescriptor.summary') }}
@ -221,59 +174,35 @@ const toModule = computed(() => {
                <QList dense>
                    <QItemLabel header class="ellipsis text-h5" :lines="1">
                        <div class="title">
-                            <span
-                                v-if="$props.title"
-                                :title="getValueFromPath(title)"
-                                :data-cy="`${$attrs['data-cy'] ?? 'cardDescriptor'}_title`"
-                            >
+                            <span v-if="$props.title" :title="getValueFromPath(title)">
                                {{ getValueFromPath(title) ?? $props.title }}
                            </span>
                            <slot v-else name="description" :entity="entity">
-                                <span
-                                    :title="entity.name"
-                                    :data-cy="`${$attrs['data-cy'] ?? 'cardDescriptor'}_description`"
-                                    v-text="entity.name"
-                                />
+                                <span :title="entity.name">
+                                    {{ entity.name }}
+                                </span>
                            </slot>
                        </div>
                    </QItemLabel>
-                    <QItem>
-                        <QItemLabel
-                            class="subtitle"
-                            :data-cy="`${$attrs['data-cy'] ?? 'cardDescriptor'}_subtitle`"
-                        >
+                    <QItem dense>
+                        <QItemLabel class="subtitle" caption>
                            #{{ 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>
                    </QItem>
                </QList>
-                <div
-                    class="list-box q-mt-xs"
-                    :data-cy="`${$attrs['data-cy'] ?? 'cardDescriptor'}_listbox`"
-                >
+                <div class="list-box q-mt-xs">
                    <slot name="body" :entity="entity" />
                </div>
            </div>
            <div class="icons">
                <slot name="icons" :entity="entity" />
            </div>
-            <div class="actions justify-center" data-cy="descriptor_actions">
+            <div class="actions justify-center">
                <slot name="actions" :entity="entity" />
            </div>
            <slot name="after" />
        </template>
+        <!-- Skeleton -->
        <SkeletonDescriptor v-if="!entity || isLoading" />
    </div>
    <QInnerLoading
@ -365,11 +294,3 @@ 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
@ -81,7 +81,6 @@ async function fetch() {
                                name: `${moduleName ?? route.meta.moduleName}Summary`,
                                params: { id: entityId || entity.id },
                            }"
-                            data-cy="goToSummaryBtn"
                        >
                            <QIcon name="open_in_new" color="white" size="sm" />
                        </router-link>
--- a/src/components/ui/CatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@ -132,8 +132,7 @@ const card = toRef(props, 'item');
    display: flex;
    flex-direction: column;
    gap: 4px;
-    white-space: nowrap;
-    width: 192px;
+
    p {
        margin-bottom: 0;
    }
--- a/src/components/ui/SkeletonDescriptor.vue
+++ b/src/components/ui/SkeletonDescriptor.vue
@ -1,32 +1,53 @@
-<script setup>
-defineProps({
-    hasImage: {
-        type: Boolean,
-        default: false,
-    },
-});
-</script>
 <template>
-    <div id="descriptor-skeleton" class="bg-vn-page">
+    <div id="descriptor-skeleton">
        <div class="row justify-between q-pa-sm">
-            <QSkeleton square size="30px" v-for="i in 3" :key="i" />
+            <QSkeleton square size="40px" />
+            <QSkeleton square size="40px" />
+            <QSkeleton square height="40px" width="20px" />
        </div>
-        <div class="q-pa-xs" v-if="hasImage">
-            <QSkeleton square height="200px" width="100%" />
+        <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>
-        <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 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>
        </div>

-        <QCardActions class="q-gutter-x-sm justify-between">
-            <QSkeleton size="40px" v-for="i in 5" :key="i" />
+        <QCardActions>
+            <QSkeleton size="40px" />
+            <QSkeleton size="40px" />
+            <QSkeleton size="40px" />
+            <QSkeleton size="40px" />
+            <QSkeleton size="40px" />
        </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" data-cy="VnConfirm_message">
+            <QCardSection class="q-pb-none">
                <span v-if="message !== false" v-html="message" />
            </QCardSection>
            <QCardSection class="row items-center q-pt-none">
@ -95,7 +95,6 @@ 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
@ -54,7 +54,7 @@ const $props = defineProps({
        default: 'table',
    },
    redirect: {
-        type: [String, Boolean],
+        type: Boolean,
        default: true,
    },
    arrayData: {
@ -249,7 +249,7 @@ const getLocale = (label) => {
                        :key="chip.label"
                        :removable="!unremovableParams?.includes(chip.label)"
                        @remove="remove(chip.label)"
-                        :data-cy="`vnFilterPanelChip_${chip.label}`"
+                        data-cy="vnFilterPanelChip"
                    >
                        <slot
                            name="tags"
@ -293,9 +293,6 @@ 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/VnLv.vue
+++ b/src/components/ui/VnLv.vue
@ -28,7 +28,7 @@ function copyValueText() {
 const val = computed(() => $props.value);
 </script>
 <template>
-    <div class="vn-label-value" :data-cy="`${$attrs['data-cy'] ?? 'vnLv'}${label ?? ''}`">
+    <div class="vn-label-value">
        <QCheckbox
            v-if="typeof value === 'boolean'"
            v-model="val"
--- a/src/components/ui/VnMoreOptions.vue
+++ b/src/components/ui/VnMoreOptions.vue
@ -11,8 +11,8 @@
        <QTooltip>
            {{ $t('components.cardDescriptor.moreOptions') }}
        </QTooltip>
-        <QMenu ref="menuRef" data-cy="descriptor-more-opts-menu">
-            <QList data-cy="descriptor-more-opts_list">
+        <QMenu ref="menuRef">
+            <QList>
                <slot name="menu" :menu-ref="$refs.menuRef" />
            </QList>
        </QMenu>
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@ -21,13 +21,12 @@ const emit = defineEmits(['onFetch']);
 const $attrs = useAttrs();

 const isRequired = computed(() => {
-    return Object.keys($attrs).includes('required');
+    return Object.keys($attrs).includes('required')
 });

 const $props = defineProps({
    url: { type: String, default: null },
-    saveUrl: { type: String, default: null },
-    userFilter: { type: Object, default: () => {} },
+    saveUrl: {type: String, default: null},
    filter: { type: Object, default: () => {} },
    body: { type: Object, default: () => {} },
    addNote: { type: Boolean, default: false },
@ -61,7 +60,7 @@ async function insert() {
 }

 function confirmAndUpdate() {
-    if (!newNote.text && originalText)
+    if(!newNote.text && originalText)
        quasar
            .dialog({
                component: VnConfirm,
@ -84,17 +83,11 @@ async function update() {
        ...body,
        ...{ notes: newNote.text },
    };
-    await axios.patch(
-        `${$props.saveUrl ?? `${$props.url}/${$props.body.workerFk}`}`,
-        newBody,
-    );
+    await axios.patch(`${$props.saveUrl ?? `${$props.url}/${$props.body.workerFk}`}`, newBody);
 }

 onBeforeRouteLeave((to, from, next) => {
-    if (
-        (newNote.text && !$props.justInput) ||
-        (newNote.text !== originalText && $props.justInput)
-    )
+    if ((newNote.text && !$props.justInput) || (newNote.text !== originalText) && $props.justInput)
        quasar.dialog({
            component: VnConfirm,
            componentProps: {
@ -106,11 +99,12 @@ onBeforeRouteLeave((to, from, next) => {
    else next();
 });

-function fetchData([data]) {
+function fetchData([ data ]) {
    newNote.text = data?.notes;
    originalText = data?.notes;
    emit('onFetch', data);
 }
+
 </script>
 <template>
    <FetchData
@ -127,8 +121,8 @@ function fetchData([data]) {
        @on-fetch="fetchData"
        auto-load
    />
-    <QCard
-        class="q-pa-xs q-mb-lg full-width"
+    <QCard 
+        class="q-pa-xs q-mb-lg full-width" 
        :class="{ 'just-input': $props.justInput }"
        v-if="$props.addNote || $props.justInput"
    >
@ -180,13 +174,12 @@ function fetchData([data]) {
        :url="$props.url"
        order="created DESC"
        :limit="0"
-        :user-filter="userFilter"
-        :filter="filter"
+        :user-filter="$props.filter"
        auto-load
        ref="vnPaginateRef"
        class="show"
        v-bind="$attrs"
-        :search-url="false"
+        search-url="notes"
        @on-fetch="
            newNote.text = '';
            newNote.observationTypeFk = null;
@ -220,7 +213,7 @@ function fetchData([data]) {
                                >
                                    {{
                                        observationTypes.find(
-                                            (ot) => ot.id === note.observationTypeFk,
+                                            (ot) => ot.id === note.observationTypeFk
                                        )?.description
                                    }}
                                </QBadge>
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@ -33,10 +33,6 @@ const props = defineProps({
        type: String,
        default: '',
    },
-    userFilter: {
-        type: Object,
-        default: null,
-    },
    filter: {
        type: Object,
        default: null,
@ -208,9 +204,8 @@ async function search() {
 }

 :deep(.q-field--focused) {
-    .q-icon,
-    .q-placeholder {
-        color: var(--vn-black-text-color);
+    .q-icon {
+        color: black;
    }
 }

--- a/src/components/ui/VnStockValueDisplay.vue
+++ b/src/components/ui/VnStockValueDisplay.vue
@ -1,41 +0,0 @@
-<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/VnUsesMana.vue
+++ b/src/components/ui/VnUsesMana.vue
@ -53,8 +53,3 @@ const manaCode = ref(props.manaCode);
        />
    </div>
 </template>
-<i18n>
-    es:
-        Promotion mana: Maná promoción
-        Claim mana: Maná reclamación
-</i18n>
--- a/src/composables/tests/useRequired.spec.js
+++ b/src/composables/tests/useRequired.spec.js
@ -1,66 +0,0 @@
-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
@ -1,64 +0,0 @@
-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: {
-                        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
@ -1,24 +0,0 @@
-export function getColAlign(col) {
-    let align;
-    switch (col.component) {
-        case 'time':
-        case 'date':
-        case 'select':
-            align = 'left';
-            break;
-        case 'number':
-            align = 'right';
-            break;
-        case 'time':
-        case 'date':
-        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
@ -148,7 +148,8 @@ export function useArrayData(key, userOptions) {
    }

    async function applyFilter({ filter, params }, fetchOptions = {}) {
-        if (filter) store.filter = filter;
+        if (filter) store.userFilter = filter;
+        store.filter = {};
        if (params) store.userParams = { ...params };

        const response = await fetch(fetchOptions);
@ -244,7 +245,7 @@ export function useArrayData(key, userOptions) {
    async function loadMore() {
        if (!store.hasMoreData) return;

-        store.skip = (store?.filter?.limit ?? store.limit) * store.page;
+        store.skip = store.limit * store.page;
        store.page += 1;

        await fetch({ append: true });
--- a/src/composables/useCau.js
+++ b/src/composables/useCau.js
@ -11,7 +11,6 @@ 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;

    const additionalData = {
        path: location.hash,
@ -41,7 +40,7 @@ export async function useCau(res, message) {
                handler: async () => {
                    const locale = i18n.global.t;
                    const reason = ref(
-                        code == 'ACCESS_DENIED' ? locale('cau.askPrivileges') : '',
+                        code == 'ACCESS_DENIED' ? locale('cau.askPrivileges') : ''
                    );
                    openConfirmationModal(
                        locale('cau.title'),
@ -60,9 +59,10 @@ export async function useCau(res, message) {
                                'onUpdate:modelValue': (val) => (reason.value = val),
                                label: locale('cau.inputLabel'),
                                class: 'full-width',
+                                required: true,
                                autofocus: true,
                            },
-                        },
+                        }
                    );
                },
            },
--- a/src/composables/useRequired.js
+++ b/src/composables/useRequired.js
@ -2,10 +2,14 @@ import { useValidator } from 'src/composables/useValidator';

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

    return {
--- a/src/composables/useRole.js
+++ b/src/composables/useRole.js
@ -27,15 +27,6 @@ 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']);
    }
@ -44,7 +35,6 @@ export function useRole() {
        isEmployee,
        fetch,
        hasAny,
-        likeAny,
        state,
    };
 }
--- a/src/css/app.scss
+++ b/src/css/app.scss
@ -15,17 +15,13 @@ body.body--light {
    --vn-empty-tag: #acacac;
    --vn-black-text-color: black;
    --vn-text-color-contrast: white;
-    --vn-link-color: #1e90ff;

    background-color: var(--vn-page-color);

    .q-header .q-toolbar {
        color: var(--vn-text-color);
    }
-
-    --vn-color-negative: $negative;
 }
-
 body.body--dark {
    --vn-header-color: #5d5d5d;
    --vn-page-color: #222;
@ -39,11 +35,8 @@ body.body--dark {
    --vn-empty-tag: #2d2d2d;
    --vn-black-text-color: black;
    --vn-text-color-contrast: black;
-    --vn-link-color: #66bfff;

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

 a {
@ -51,7 +44,7 @@ a {
 }

 .link {
-    color: var(--vn-link-color);
+    color: $color-link;
    cursor: pointer;

    &--white {
@ -60,14 +53,14 @@ a {
 }

 .tx-color-link {
-    color: var(--vn-link-color) !important;
+    color: $color-link !important;
 }
 .tx-color-font {
-    color: var(--vn-link-color) !important;
+    color: $color-link !important;
 }

 .header-link {
-    color: var(--vn-link-color) !important;
+    color: $color-link !important;
    cursor: pointer;
    border-bottom: solid $primary;
    border-width: 2px;
@ -82,6 +75,7 @@ a {
    text-decoration: underline;
 }

+// Removes chrome autofill background
 input:-webkit-autofill,
 select:-webkit-autofill {
    color: var(--vn-text-color);
@ -155,6 +149,11 @@ 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: ' *';
@ -231,12 +230,10 @@ input::-webkit-inner-spin-button {
    max-width: 100%;
 }

-.remove-bg {
-    filter: brightness(1.1);
-    mix-blend-mode: multiply;
-}
-
 .q-table__container {
+    /* ===== Scrollbar CSS ===== /
+    / Firefox */
+
    * {
        scrollbar-width: auto;
        scrollbar-color: var(--vn-label-color) transparent;
@ -277,6 +274,8 @@ input::-webkit-inner-spin-button {
            font-size: 11pt;
        }
        td {
+            font-size: 11pt;
+            border-top: 1px solid var(--vn-page-color);
            border-collapse: collapse;
        }
    }
@ -320,6 +319,9 @@ 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;
@ -337,7 +339,3 @@ input::-webkit-inner-spin-button {
    border: 1px solid;
    box-shadow: 0 4px 6px #00000000;
 }
-
-.containerShrinked {
-    width: 70%;
-}
--- 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: #89be34;
+$secondary: $primary;
 $positive: #c8e484;
 $negative: #fb5252;
 $info: #84d0e2;
@ -24,14 +24,13 @@ $alert: $negative;
 $white: #fff;
 $dark: #3d3d3d;
 // custom
+$color-link: #66bfff;
 $color-spacer-light: #a3a3a31f;
 $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,8 +3,6 @@ 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';
@ -12,12 +10,7 @@ export default function (value, options = {}) {
    }

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

-    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());
+    return new Intl.DateTimeFormat(locale.value, options).format(date);
 }
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@ -33,7 +33,6 @@ globals:
    reset: Reset
    close: Close
    cancel: Cancel
-    isSaveAndContinue: Save and continue
    clone: Clone
    confirm: Confirm
    assign: Assign
@ -49,7 +48,6 @@ 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
@ -99,6 +97,7 @@ globals:
    file: File
    selectFile: Select a file
    copyClipboard: Copy on clipboard
+    salesPerson: SalesPerson
    send: Send
    code: Code
    since: Since
@ -152,14 +151,10 @@ globals:
    maxTemperature: Max
    minTemperature: Min
    changePass: Change password
-    setPass: Set password
    deleteConfirmTitle: Delete selected elements
    changeState: Change state
    raid: 'Raid {daysInForward} days'
    isVies: Vies
-    department: Department
-    noData: No data available
-    vehicle: Vehicle
    pageTitles:
        logIn: Login
        addressEdit: Update address
@ -172,7 +167,6 @@ globals:
        workCenters: Work centers
        modes: Modes
        zones: Zones
-        negative: Negative
        zonesList: List
        deliveryDays: Delivery days
        upcomingDeliveries: Upcoming deliveries
@ -180,7 +174,6 @@ globals:
        alias: Alias
        aliasUsers: Users
        subRoles: Subroles
-        myAccount: Mi cuenta
        inheritedRoles: Inherited Roles
        customers: Customers
        customerCreate: New customer
@ -347,6 +340,7 @@ globals:
    params:
        description: Description
        clientFk: Client id
+        salesPersonFk: Sales person
        warehouseFk: Warehouse
        provinceFk: Province
        stateFk: State
@ -369,7 +363,6 @@ globals:
        countryFk: Country
        countryCodeFk: Country
        companyFk: Company
-        nickname: Alias
    model: Model
    fuel: Fuel
    active: Active
@ -413,106 +406,6 @@ 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
@ -531,7 +424,6 @@ ticket:
        customerCard: Customer card
        ticketList: Ticket List
        newOrder: New Order
-        ticketClaimed: Claimed ticket
    boxing:
        expedition: Expedition
        created: Created
@ -604,6 +496,7 @@ worker:
        balance: Balance
        medical: Medical
    list:
+        department: Department
        schedule: Schedule
        newWorker: New worker
    summary:
@ -695,10 +588,8 @@ worker:
        machine: Machine
    business:
        tableVisibleColumns:
-            id: ID
            started: Start Date
            ended: End Date
-            hourlyLabor: Time sheet
            company: Company
            reasonEnd: Reason for Termination
            department: Department
@ -706,7 +597,6 @@ worker:
            calendarType: Work Calendar
            workCenter: Work Center
            payrollCategories: Contract Category
-            workerBusinessAgreementName: Agreement
            occupationCode: Contribution Code
            rate: Rate
            businessType: Contract Type
@ -745,8 +635,6 @@ wagon:
        name: Name

 supplier:
-    search: Search supplier
-    searchInfo: Search supplier by id or name
    list:
        payMethod: Pay method
        account: Account
@ -836,8 +724,6 @@ travel:
        CloneTravelAndEntries: Clone travel and his entries
        deleteTravel: Delete travel
        AddEntry: Add entry
-        availabled: Availabled
-        availabledHour: Availabled hour
        thermographs: Thermographs
        hb: HB
    basicData:
@ -862,6 +748,7 @@ components:
        mine: For me
        hasMinPrice: Minimum price
        # LatestBuysFilter
+        salesPersonFk: Buyer
        supplierFk: Supplier
        from: From
        to: To
@ -892,8 +779,6 @@ components:
    VnLv:
        copyText: '{copyValue} has been copied to the clipboard'
    iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789'
-    VnNotes:
-        clientWithoutPhone: 'The following clients do not have a phone number and the message will not be sent to them: {clientWithoutPhone}'
 weekdays:
    sun: Sunday
    mon: Monday
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@ -33,11 +33,9 @@ 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
@ -50,8 +48,6 @@ 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
@ -59,8 +55,8 @@ globals:
    today: Hoy
    yesterday: Ayer
    dateFormat: es-ES
-    noSelectedRows: No tienes ninguna línea seleccionada
    microsip: Abrir en MicroSIP
+    noSelectedRows: No tienes ninguna línea seleccionada
    downloadCSVSuccess: Descarga de CSV exitosa
    reference: Referencia
    agency: Agencia
@ -80,10 +76,8 @@ globals:
    requiredField: Campo obligatorio
    class: clase
    type: Tipo
-    reason: Motivo
-    removeSelection: Eliminar selección
+    reason: motivo
    noResults: Sin resultados
-    results: resultados
    system: Sistema
    notificationSent: Notificación enviada
    warehouse: Almacén
@ -103,6 +97,7 @@ globals:
    file: Fichero
    selectFile: Seleccione un fichero
    copyClipboard: Copiar en portapapeles
+    salesPerson: Comercial
    send: Enviar
    code: Código
    since: Desde
@ -156,14 +151,10 @@ globals:
    maxTemperature: Máx
    minTemperature: Mín
    changePass: Cambiar contraseña
-    setPass: Establecer contraseña
    deleteConfirmTitle: Eliminar los elementos seleccionados
    changeState: Cambiar estado
    raid: 'Redada {daysInForward} días'
    isVies: Vies
-    noData: Datos no disponibles
-    department: Departamento
-    vehicle: Vehículo
    pageTitles:
        logIn: Inicio de sesión
        addressEdit: Modificar consignatario
@ -175,7 +166,6 @@ globals:
        agency: Agencia
        workCenters: Centros de trabajo
        modes: Modos
-        negative: Tickets negativos
        zones: Zonas
        zonesList: Listado
        deliveryDays: Días de entrega
@ -296,9 +286,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
@ -350,6 +340,7 @@ globals:
    params:
        description: Descripción
        clientFk: Id cliente
+        salesPersonFk: Comercial
        warehouseFk: Almacén
        provinceFk: Provincia
        stateFk: Estado
@ -361,7 +352,7 @@ globals:
        from: Desde
        to: Hasta
        supplierFk: Proveedor
-        supplierRef: Nº factura
+        supplierRef: Ref. proveedor
        serial: Serie
        amount: Importe
        awbCode: AWB
@ -370,7 +361,6 @@ globals:
        countryFk: País
        countryCodeFk: País
        companyFk: Empresa
-        nickname: Alias
 errors:
    statusUnauthorized: Acceso denegado
    statusInternalServerError: Ha ocurrido un error interno del servidor
@ -407,87 +397,6 @@ 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
@ -501,43 +410,11 @@ 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
-        total: Total
    card:
        customerId: ID cliente
        customerCard: Ficha del cliente
        ticketList: Listado de tickets
        newOrder: Nuevo pedido
-        ticketClaimed: Ticket reclamado
    boxing:
        expedition: Expedición
        created: Creado
@ -579,11 +456,15 @@ ticket:
        consigneeStreet: Dirección
    create:
        address: Dirección
-invoiceOut:
-    card:
-        issued: Fecha emisión
-        customerCard: Ficha del cliente
-        ticketList: Listado de tickets
+order:
+    field:
+        salesPersonFk: Comercial
+    form:
+        clientFk: Cliente
+        addressFk: Dirección
+        agencyModeFk: Agencia
+    list:
+        newOrder: Nuevo Pedido
    summary:
        issued: Fecha
        dued: Fecha límite
@ -594,69 +475,6 @@ invoiceOut:
        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:
-    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
@ -689,6 +507,7 @@ worker:
        formation: Formación
        medical: Mutua
    list:
+        department: Departamento
        schedule: Horario
        newWorker: Nuevo trabajador
    summary:
@ -768,10 +587,8 @@ worker:
            concept: Concepto
    business:
        tableVisibleColumns:
-            id: Id
            started: Fecha inicio
            ended: Fecha fin
-            hourlyLabor: Ficha
            company: Empresa
            reasonEnd: Motivo finalización
            department: Departamento
@ -782,13 +599,12 @@ worker:
            occupationCode: Cotización
            rate: Tarifa
            businessType: Contrato
-            workerBusinessAgreementName: Convenio
            amount: Salario
            basicSalary: Salario transportistas
            notes: Notas
    operator:
        numberOfWagons: Número de vagones
-        train: Tren
+        train: tren
        itemPackingType: Tipo de embalaje
        warehouse: Almacén
        sector: Sector
@ -819,8 +635,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
@ -828,8 +644,6 @@ wagon:
        volume: Volumen
        name: Nombre
 supplier:
-    search: Buscar proveedor
-    searchInfo: Buscar proveedor por id o nombre
    list:
        payMethod: Método de pago
        account: Cuenta
@ -842,7 +656,6 @@ supplier:
        verified: Verificado
        isActive: Está activo
        billingData: Forma de pago
-        financialData: Datos financieros
        payDeadline: Plazo de pago
        payDay: Día de pago
        account: Cuenta
@ -920,8 +733,6 @@ 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)
@ -946,6 +757,7 @@ components:
        hasMinPrice: Precio mínimo
        wareHouseFk: Almacén
        # LatestBuysFilter
+        salesPersonFk: Comprador
        supplierFk: Proveedor
        visible: Visible
        active: Activo
@ -969,15 +781,13 @@ 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
    VnLv:
        copyText: '{copyValue} se ha copiado al portapepeles'
    iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789'
-    VnNotes:
-        clientWithoutPhone: 'Estos clientes no tienen asociado número de télefono y el sms no les será enviado: {clientWithoutPhone}'
 weekdays:
    sun: Domingo
    mon: Lunes
--- a/src/layouts/OutLayout.vue
+++ b/src/layouts/OutLayout.vue
@ -1,12 +1,12 @@
 <script setup>
 import { Dark, Quasar } from 'quasar';
-import { computed, onMounted } from 'vue';
+import { computed } 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,6 +28,7 @@ const darkMode = computed({
        Dark.set(value);
    },
 });
+const langs = ['en', 'es'];
 </script>

 <template>
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@ -149,12 +149,14 @@ const columns = computed(() => [
                :right-search="false"
            >
                <template #more-create-dialog="{ data }">
+                    <QCardSection>
                        <VnInputPassword
                            :label="t('Password')"
                            v-model="data.password"
                            :required="true"
                            autocomplete="new-password"
                        />
+                    </QCardSection>
                </template>
            </VnTable>
        </template>
--- a/src/pages/Account/Alias/Card/AliasCard.vue
+++ b/src/pages/Account/Alias/Card/AliasCard.vue
@ -1,10 +1,10 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import AliasDescriptor from './AliasDescriptor.vue';
 </script>

 <template>
-    <VnCard
+    <VnCardBeta
        data-key="Alias"
        url="MailAliases"
        :descriptor="AliasDescriptor"
--- a/src/pages/Account/Alias/Card/AliasDescriptor.vue
+++ b/src/pages/Account/Alias/Card/AliasDescriptor.vue
@ -51,9 +51,9 @@ const removeAlias = () => {
    <CardDescriptor
        ref="descriptor"
        :url="`MailAliases/${entityId}`"
+        module="Alias"
        data-key="Alias"
        title="alias"
-        :to-module="{ name: 'AccountAlias' }"
    >
        <template #menu>
            <QItem v-ripple clickable @click="removeAlias()">
--- a/src/pages/Account/Alias/Card/AliasSummary.vue
+++ b/src/pages/Account/Alias/Card/AliasSummary.vue
@ -5,7 +5,6 @@ import { useI18n } from 'vue-i18n';

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

 const route = useRoute();
 const { t } = useI18n();
@ -28,10 +27,13 @@ const entityId = computed(() => $props.id || route.params.id);
        <template #body="{ entity: alias }">
            <QCard class="vn-one">
                <QCardSection class="q-pa-none">
-                    <VnTitle
-                        :url="`#/account/alias/${entityId}/basic-data`"
-                        :text="t('globals.summary.basicData')"
-                    />
+                    <router-link
+                        :to="{ name: 'AliasBasicData', params: { id: entityId } }"
+                        class="header header-link"
+                    >
+                        {{ t('globals.summary.basicData') }}
+                        <QIcon name="open_in_new" />
+                    </router-link>
                </QCardSection>
                <VnLv :label="t('role.id')" :value="alias.id" />
                <VnLv :label="t('role.description')" :value="alias.description" />
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@ -1,10 +1,10 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import AccountDescriptor from './AccountDescriptor.vue';
 import filter from './AccountFilter.js';
 </script>
 <template>
-    <VnCard
+    <VnCardBeta
        url="VnUsers/preview"
        :id-in-where="true"
        data-key="Account"
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@ -23,7 +23,8 @@ onMounted(async () => {
    <CardDescriptor
        ref="descriptor"
        :url="`VnUsers/preview`"
-        :filter="{ ...filter, where: { id: entityId } }"
+        :filter="filter"
+        module="Account"
        data-key="Account"
        title="nickname"
    >
--- a/src/pages/Account/Card/AccountDescriptorMenu.vue
+++ b/src/pages/Account/Card/AccountDescriptorMenu.vue
@ -12,7 +12,6 @@ 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: {
@ -25,23 +24,16 @@ const $props = defineProps({
 const { t } = useI18n();
 const { hasAccount } = toRefs($props);
 const { openConfirmationModal } = useVnConfirm();
-const arrayData = useArrayData('Account');
 const route = useRoute();
 const router = useRouter();
 const state = useState();
 const user = state.getUser();
 const { notify } = useQuasar();
-const account = computed(() => arrayData.store.data);
+const account = computed(() => useArrayData('Account').store.data[0]);
 account.value.hasAccount = hasAccount.value;
 const entityId = computed(() => +route.params.id);
 const hasitManagementAccess = ref();
 const hasSysadminAccess = ref();
-const isHimself = computed(() => user.value.id === account.value.id);
-const url = computed(() =>
-    isHimself.value
-        ? 'Accounts/change-password'
-        : `Accounts/${entityId.value}/setPassword`,
-);

 async function updateStatusAccount(active) {
    if (active) {
@ -114,8 +106,11 @@ onMounted(() => {
        :ask-old-pass="askOldPass"
        :submit-fn="
            async (newPassword, oldPassword) => {
-                const body = isHimself ? { userId: entityId, oldPassword } : {};
-                await axios.patch(url, { ...body, newPassword });
+                await axios.patch(`Accounts/change-password`, {
+                    userId: entityId,
+                    newPassword,
+                    oldPassword,
+                });
            }
        "
    />
@ -126,14 +121,18 @@ onMounted(() => {
        :promise="sync"
    >
        <template #customHTML>
-            <VnCheckbox
-                v-model="shouldSyncPassword"
+            {{ shouldSyncPassword }}
+            <QCheckbox
                :label="t('account.card.actions.sync.checkbox')"
-                :info="t('account.card.actions.sync.tooltip')"
+                v-model="shouldSyncPassword"
+                class="full-width"
                clearable
                clear-icon="close"
-                color="primary"
-            />
+            >
+                <QIcon style="padding-left: 10px" color="primary" name="info" size="sm">
+                    <QTooltip>{{ t('account.card.actions.sync.tooltip') }}</QTooltip>
+                </QIcon></QCheckbox
+            >
            <VnInputPassword
                v-if="shouldSyncPassword"
                :label="t('login.password')"
@ -154,16 +153,21 @@ onMounted(() => {
                t('account.card.actions.disableAccount.title'),
                t('account.card.actions.disableAccount.subtitle'),
                () => deleteAccount(),
-                () => deleteAccount(),
            )
        "
    >
        <QItemSection>{{ t('globals.delete') }}</QItemSection>
    </QItem>
-    <QItem v-if="hasSysadminAccess || isHimself" v-ripple clickable>
-        <QItemSection @click="onChangePass(isHimself)">
-            {{ isHimself ? t('globals.changePass') : t('globals.setPass') }}
+    <QItem
+        v-if="hasSysadminAccess"
+        v-ripple
+        clickable
+        @click="user.id === account.id ? onChangePass(true) : onChangePass(false)"
+    >
+        <QItemSection v-if="user.id === account.id">
+            {{ t('globals.changePass') }}
        </QItemSection>
+        <QItemSection v-else>{{ t('globals.setPass') }}</QItemSection>
    </QItem>
    <QItem
        v-if="!account.hasAccount && hasSysadminAccess"
@ -174,7 +178,6 @@ onMounted(() => {
                t('account.card.actions.enableAccount.title'),
                t('account.card.actions.enableAccount.subtitle'),
                () => updateStatusAccount(true),
-                () => updateStatusAccount(true),
            )
        "
    >
@ -189,7 +192,6 @@ onMounted(() => {
                t('account.card.actions.disableAccount.title'),
                t('account.card.actions.disableAccount.subtitle'),
                () => updateStatusAccount(false),
-                () => updateStatusAccount(false),
            )
        "
    >
@ -205,7 +207,6 @@ onMounted(() => {
                t('account.card.actions.activateUser.title'),
                t('account.card.actions.activateUser.title'),
                () => updateStatusUser(true),
-                () => updateStatusUser(true),
            )
        "
    >
@ -220,7 +221,6 @@ onMounted(() => {
                t('account.card.actions.deactivateUser.title'),
                t('account.card.actions.deactivateUser.title'),
                () => updateStatusUser(false),
-                () => updateStatusUser(false),
            )
        "
    >
--- a/src/pages/Account/Card/AccountDescriptorProxy.vue
+++ b/src/pages/Account/Card/AccountDescriptorProxy.vue
@ -1,14 +0,0 @@
-<script setup>
-import AccountDescriptor from './AccountDescriptor.vue';
-import AccountSummary from './AccountSummary.vue';
-</script>
-<template>
-    <QPopupProxy style="max-width: 10px">
-        <AccountDescriptor
-            v-if="$attrs.id"
-            v-bind="$attrs.id"
-            :summary="AccountSummary"
-            :proxy-render="true"
-        />
-    </QPopupProxy>
-</template>
--- a/src/pages/Account/Card/AccountSummary.vue
+++ b/src/pages/Account/Card/AccountSummary.vue
@ -5,7 +5,6 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import filter from './AccountFilter.js';
 import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';

 const $props = defineProps({ id: { type: Number, default: 0 } });

@ -27,10 +26,13 @@ const entityId = computed(() => $props.id || route.params.id);
        <template #body="{ entity }">
            <QCard class="vn-one">
                <QCardSection class="q-pa-none">
-                    <VnTitle
-                        :url="`#/account/${entityId}/basic-data`"
-                        :text="$t('globals.pageTitles.basicData')"
-                    />
+                    <router-link
+                        :to="{ name: 'AccountBasicData', params: { id: entityId } }"
+                        class="header header-link"
+                    >
+                        {{ $t('globals.pageTitles.basicData') }}
+                        <QIcon name="open_in_new" />
+                    </router-link>
                </QCardSection>
                <VnLv :label="$t('account.card.nickname')" :value="entity.name" />
                <VnLv :label="$t('account.card.role')" :value="entity.role?.name" />
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Robert Ferrús	307355ba3f	Merge branch 'dev' into 7731-clientViesCode gitea/salix-front/pipeline/pr-dev This commit looks good Details	2025-02-07 06:05:56 +00:00
Robert Ferrús	4e85e30e41	feat: refs #7731 commit blanck	2025-02-06 12:39:45 +01:00
Robert Ferrús	fe3ea3fa6a	Merge branch 'dev' into 7731-clientViesCode	2025-02-06 10:52:10 +00:00
Robert Ferrús	0c3650c9e3	feat: refs #7731 fix branche gitea/salix-front/pipeline/head This commit looks good Details	2025-01-24 13:36:55 +01:00
Alex Moreno	da0540a748	Merge branch 'dev' into 7731-clientViesCode gitea/salix-front/pipeline/head This commit looks good Details	2025-01-24 11:28:10 +00:00
Robert Ferrús	9ecb734b1b	Merge branch 'dev' into 7731-clientViesCode	2025-01-24 08:30:49 +00:00
Robert Ferrús	f019c55b72	Merge branch 'dev' into 7731-clientViesCode	2025-01-24 05:56:11 +00:00
Robert Ferrús	d966be60da	Merge branch 'dev' into 7731-clientViesCode	2025-01-23 08:06:09 +00:00
Robert Ferrús	c884c09943	feat: refs #7731 resolve conflicts	2025-01-23 09:05:49 +01:00
Robert Ferrús	32191fe713	Merge branch 'dev' into 7731-clientViesCode	2025-01-22 13:07:22 +00:00
Robert Ferrús	fdaa3ea72a	Merge branch 'dev' of https: refs #7731//gitea.verdnatura.es/verdnatura/salix-front into 7731-clientViesCode	2025-01-22 10:11:07 +01:00
Robert Ferrús	dab45277da	Merge branch 'dev' into 7731-clientViesCode gitea/salix-front/pipeline/pr-dev This commit looks good Details	2024-12-17 10:24:14 +00:00
Robert Ferrús	4de85126cd	feat: refs #7731 gitea/salix-front/pipeline/pr-dev This commit looks good Details	2024-12-17 11:02:51 +01:00
Robert Ferrús	08f247900a	Merge branch 'dev' of https: refs #7731//gitea.verdnatura.es/verdnatura/salix-front into 7731-clientViesCode	2024-12-17 08:20:40 +01:00
Robert Ferrús	82fce46999	feat: refs #7731 supplierFiscalData gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details	2024-10-21 13:16:06 +02:00
Robert Ferrús	6b99039e68	Merge branch '7731-clientViesCode' of https://gitea.verdnatura.es/verdnatura/salix-front into 7731-clientViesCode gitea/salix-front/pipeline/pr-dev This commit looks good Details	2024-10-21 09:59:36 +02:00
Robert Ferrús	6e164cda14	Merge branch 'dev' into 7731-clientViesCode gitea/salix-front/pipeline/pr-dev This commit looks good Details	2024-10-21 07:56:06 +00:00
Robert Ferrús	6d0e99faa3	Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7731-clientViesCode	2024-10-21 09:55:19 +02:00
Robert Ferrús	5a1317da77	feat: refs #7731 create component vnSelectVies gitea/salix-front/pipeline/pr-dev This commit looks good Details	2024-10-17 10:58:08 +02:00