Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6321_negative_tickets

2024-09-11 08:50:39 +02:00 · 2024-09-11 08:50:39 +02:00 · 78c5836431
parent 437d70d415 3781ee97cb
commit 78c5836431
434 changed files with 16249 additions and 17364 deletions
--- a/.husky/addReferenceTag.js
+++ b/.husky/addReferenceTag.js
@ -0,0 +1,33 @@
+const fs = require('fs');
+const path = require('path');
+
+function getCurrentBranchName(p = process.cwd()) {
+    if (!fs.existsSync(p)) return false;
+
+    const gitHeadPath = path.join(p, '.git', 'HEAD');
+
+    if (!fs.existsSync(gitHeadPath))
+        return getCurrentBranchName(path.resolve(p, '..'));
+
+    const headContent = fs.readFileSync(gitHeadPath, 'utf-8');
+    return headContent.trim().split('/')[2];
+}
+
+const branchName = getCurrentBranchName();
+
+if (branchName) {
+    const msgPath = `.git/COMMIT_EDITMSG`;
+    const msg = fs.readFileSync(msgPath, 'utf-8');
+    const reference = branchName.match(/^\d+/);
+
+    const referenceTag = `refs #${reference}`;
+    if (!msg.includes(referenceTag) && reference) {
+        const splitedMsg = msg.split(':');
+
+        if (splitedMsg.length > 1) {
+            const finalMsg = splitedMsg[0] + ': ' + referenceTag + splitedMsg.slice(1).join(':');
+            fs.writeFileSync(msgPath, finalMsg);
+        }
+    }
+}
+
--- a/.husky/commit-msg
+++ b/.husky/commit-msg
@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+echo "Running husky commit-msg hook"
+npx --no-install commitlint --edit
+echo "Adding reference tag to commit message"
+node .husky/addReferenceTag.js
+
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,229 @@
+# Version 24.36 - 2024-08-27
+
+### Added 🆕
+
+-   feat(FormModel): trim data by default by:alexm
+-   feat(orderBasicData): add notes by:alexm
+-   feat(orderList): correct create order by:alexm
+-   feat(orderList): use orderFilter and fixed this by:alexm
+-   feat: #7323 handle workerPhoto (origin/7323_workerPhoto, 7323_workerPhoto) by:Javier Segarra
+-   feat: add recover password and reset password by:alexm
+-   feat: refs #7346 add seriaType option by:jgallego
+-   feat: refs #7346 elimino === by:jgallego
+-   feat: refs #7346 formdata uses serialType by:jgallego
+-   feat: refs #7346 refactor by:jgallego
+-   feat: refs #7346 sonarLint warnings (origin/7346-invoiceOutMultilple, 7346-invoiceOutMultilple) by:jgallego
+-   feat: refs #7710 uses cloneAll by:jgallego
+-   fix: refs #7717 fix OrderList table filters' and summary table style by:Jon
+
+### Changed 📦
+
+-   feat: refs #7346 refactor by:jgallego
+-   perf: date fields (mindshore/feature/TicketFutureFilter, feature/TicketFutureFilter) by:Javier Segarra
+-   perf: refs #7717 right menu filter by:Jon
+-   perf: use ref at component start by:Javier Segarra
+-   refactor: refs #7717 delete useless function and import by:Jon
+-   refactor: refs #7717 deleted useless code by:Jon
+
+### Fixed 🛠️
+
+-   feat(orderList): use orderFilter and fixed this by:alexm
+-   fix(VnTable): orderBy v-model by:alexm
+-   fix(account_card): redirection by:carlossa
+-   fix(orderLines): reload when delete and redirect when confirm by:alexm
+-   fix: #6336 ClaimListStates by:Javier Segarra
+-   fix: account subsections cards by:carlossa
+-   fix: duplicate key by:Jon
+-   fix: order description to vnTable by:alexm
+-   fix: orderCatalogFilter order by:alexm
+-   fix: quasar build warnings (6336_claim_fix_states) by:Javier Segarra
+-   fix: refs #7717 fix OrderList table filters' and summary table style by:Jon
+-   fix: refs #7717 fix basic data form & minor errors by:Jon
+-   fix: refs #7717 fix catalog filter, searchbar redirect and search by:Jon
+-   fix: refs #7717 fix catalog searchbar and worker tests(refs #7323) by:Jon
+-   fix: refs #7717 fix order sections by:Jon
+-   fix: refs #7717 fix volume and lines redirect by:Jon
+-   fix: refs #7717 fixed searchbar filter with rightmenu filters' applied by:Jon
+-   fix: test by:alexm
+-   fix: ticketDescriptorMenu by:Javier Segarra
+-   refs #7355 account fixes by:carlossa
+
+# Version 24.34 - 2024-08-20
+
+### Added 🆕
+
+-   chore: #6900 order params by:jorgep
+-   chore: refs #6900 drop console log by:jorgep
+-   chore: refs #6900 drop vnCurrency by:jorgep
+-   chore: refs #6900 fix e2e tests by:jorgep
+-   chore: refs #6900 mv rectificative logic by:jorgep
+-   chore: refs #6900 responsive code by:jorgep
+-   chore: refs #7283 drop array types by:jorgep
+-   chore: refs #7283 drop import by:jorgep
+-   chore: refs #7283 fix e2e logout by:jorgep
+-   chore: refs #7283 update VnAvatar title handling by:jorgep
+-   chore: refs #7323 fix test by:jorgep
+-   chore: refs #7323 remove unused import by:jorgep
+-   chore: refs #7323drop commented code by:jorgep
+-   feat(VnCard): use props searchbar by:alexm
+-   feat(customer): improve basicData to balance by:alexm
+-   feat(customer_balance): refs #6943 add functionality from salix by:alexm
+-   feat(customer_balance): refs #6943 translations by:alexm
+-   feat: refs #6130 husky commitLint config by:pablone
+-   feat: refs #6130 husky hooks by:pablone
+-   feat: refs #6900 add InvoiceInSerial by:jorgep
+-   feat: refs #6900 add locale by:jorgep
+-   feat: refs #6900 use VnTable & sort filter fields by:jorgep
+-   feat: refs #7323 add flex-wrap by:jorgep
+-   feat: refs #7323 add my account" btn & fix models log selectable by:jorgep
+-   feat: refs #7323 improve test by:jorgep
+
+### Changed 📦
+
+-   refactor(customer_log: use VnLog by:alexm
+-   refactor(customer_recovery): to vnTable by:alexm
+-   refactor(customer_webAccess): FormModel by:alexm
+-   refactor: refs #7283 update avatar size and color by:jorgep
+
+### Fixed 🛠️
+
+-   chore: refs #6900 fix e2e tests by:jorgep
+-   chore: refs #7283 fix e2e logout by:jorgep
+-   chore: refs #7323 fix test by:jorgep
+-   feat: refs #7323 add my account" btn & fix models log selectable by:jorgep
+-   fix #7355 fix acls list by:carlossa
+-   fix(VnFilterPanel): emit userParams better by:alexm
+-   fix(claim_summary): url links (HEAD -> 7864_testToMaster_2434, origin/test, origin/7864_testToMaster_2434, test) by:alexm
+-   fix(customer_sms: fix reload by:alexm
+-   fix(twoFactor): unify code login and twoFactor by:alexm
+-   fix: VnCard VnSearchbar props by:alexm
+-   fix: accountMailAlias by:alexm
+-   fix: refs #6130 add commit lint modules by:pablone
+-   fix: refs #6130 pnpm-lock.yml by:pablone
+-   fix: refs #6900 improve loading by:jorgep
+-   fix: refs #6900 improve logic (origin/6900-addSerial) by:jorgep
+-   fix: refs #6900 improve logic by:jorgep
+-   fix: refs #6900 rectificative btn reactivity by:jorgep
+-   fix: refs #6900 use type number by:jorgep
+-   fix: refs #6900 vat & dueday by:jorgep
+-   fix: refs #6900 vat, dueday & intrastat by:jorgep
+-   fix: refs #6989 show entity name & default time from config table by:jorgep
+-   fix: refs #7283 basicData locale by:jorgep
+-   fix: refs #7283 itemLastEntries filter by:jorgep
+-   fix: refs #7283 itemTags & VnImg by:jorgep
+-   fix: refs #7283 locale by:jorgep
+-   fix: refs #7283 min-width vnImg by:jorgep
+-   fix: refs #7283 use vnAvatar & add optional zoom by:jorgep
+-   fix: refs #7283 userPanel pic by:jorgep
+-   fix: refs #7323 add department popup by:jorgep
+-   fix: refs #7323 add locale by:jorgep
+-   fix: refs #7323 css righ menu by:jorgep
+-   fix: refs #7323 data-key & add select by:jorgep
+-   fix: refs #7323 load all opts by:jorgep
+-   fix: refs #7323 righ menu bug by:jorgep
+-   fix: refs #7323 use global locale by:jorgep
+-   fix: refs #7323 use workerFilter (origin/7323-warmfix-fixErrors) by:jorgep
+-   fix: refs #7323 vnsubtoolbar css by:jorgep
+-   fix: refs #7323 wrong css by:jorgep
+-   refs #7355 fix Rol, alias by:carlossa
+-   refs #7355 fix accountAlias by:carlossa
+-   refs #7355 fix alias summary by:carlossa
+-   refs #7355 fix conflicts by:carlossa
+-   refs #7355 fix create Rol by:carlossa
+-   refs #7355 fix list by:carlossa
+-   refs #7355 fix lists redirects summary by:carlossa
+-   refs #7355 fix roles by:carlossa
+-   refs #7355 fix search exprBuilder by:carlossa
+-   refs #7355 fix vnTable by:carlossa
+
+# Version 24.32 - 2024-08-06
+
+### Added 🆕
+
+-   chore: refs #7197 drop space by:jorgep
+-   chore: refs #7197 drop useless attr by:jorgep
+-   chore: refs #7197 fix test by:jorgep
+-   chore: refs #7197 fix tests by:jorgep
+-   chore: refs #7197 fix unit tests by:jorgep
+-   chore: refs #7197 idrop useless class by:jorgep
+-   chore: refs #7197 improve form filling in Cypress tests by:jorgep
+-   chore: refs #7197 remove unused import by:jorgep
+-   feat: customerPayments card view by:alexm
+-   feat: refs #6943 lock grid mode by:jorgep
+-   feat: refs #6943 wip consumption filter by:jorgep
+-   feat: refs #7197 add correcting filter by:jorgep
+-   feat: refs #7197 add supplier activities filter option by:jorgep
+-   feat: refs #7197 summary responsive by:jorgep
+-   feat: refs #7323 fix descriptors, added VnTable and minor changes by:Jon
+-   feat: refs #7323 fixed tests, changed calendar styles and fix workerCreate by:Jon
+-   feat: refs #7356 list & weekly to VnTable and style fixes by:Jon
+-   feat: refs #7401 add menu options by:pablone
+-   feat: SalesClientTable by:Javier Segarra
+-   feat: salesOrderTable by:Javier Segarra
+-   feat: salesTicketTable by:Javier Segarra
+-   feat: VnTable SalesTicketTable by:Javier Segarra
+-   fix: columns style by:alexm
+
+### Changed 📦
+
+-   perf: LeftMenu show/hide by:Javier Segarra
+-   perf: refs #7356 TicketList state column by:Jon
+-   perf: VnFilterPanel (origin/7323_WorkerMigration_End) by:Javier Segarra
+-   perf: width SalesTicketsTable by:Javier Segarra
+-   refactor: #6943 wip use vnTable CustomerCredits by:jorgep
+-   refactor: CustomerNotifications use VnTable by:alexm
+-   refactor: CustomerPayments use VnTable by:alexm
+-   refactor: refs #7014 deleted main files and changed route files by:Jon
+-   refactor: refs #7014 improved route.js & deleted RouteMain by:Jon
+-   refactor: refs #7014 refactor <module>Main.vue by:Jon
+-   refactor: refs #7014 refactor ZoneCard, deleted ZoneMain & created basic tests for functionality by:Jon
+-   refactor: refs #7197 use invoiceInSearchbar & queryParams by:jorgep
+-   refactor: refs #7323 hidden column filter proposal by:Jon
+-   refactor: refs #7356 fixed VnTable filters by:Jon
+-   refactor: refs #7356 requested changes by:Jon
+-   refactor: wip use vnTable CustomerCredits by:jorgep
+
+### Fixed 🛠️
+
+-   chore: refs #7197 fix test by:jorgep
+-   chore: refs #7197 fix tests by:jorgep
+-   chore: refs #7197 fix unit tests by:jorgep
+-   feat: refs #7323 fix descriptors, added VnTable and minor changes by:Jon
+-   feat: refs #7323 fixed tests, changed calendar styles and fix workerCreate by:Jon
+-   feat: refs #7356 list & weekly to VnTable and style fixes by:Jon
+-   fix(claim): small details (6336-claim-v6) by:alexm
+-   fix: columns style by:alexm
+-   fix: customer defaulter add amount order (6943-fixCustomer) by:alexm
+-   fix: customerDefaulter correct functionality by:alexm
+-   fix: customerNotifications filter by:alexm
+-   fix: fix conflicts by:Jon
+-   fix: refs #6101 fix TicketList by:Jon
+-   fix: refs #6891 worker tests by:jorgep
+-   fix: refs #6943 drop padding-left checkbox & create wrap mode vnRow by:jorgep
+-   fix: refs #6943 prevent undefined by:jorgep
+-   fix: refs #7014 fix tests by:Jon
+-   fix: refs #7014 fix wagon module by:Jon
+-   fix: refs #7197 add url InvoiceInSearchbar by:jorgep
+-   fix: refs #7197 amount reactivity by:jorgep
+-   fix: refs #7197 drop character by:jorgep
+-   fix: refs #7197 reactivity invoiceCorrection by:jorgep
+-   fix: refs #7197 responsive summary layout by:jorgep
+-   fix: refs #7197 rollback by:jorgep
+-   fix: refs #7197 rollback crudModel by:jorgep
+-   fix: refs #7197 setInvoiceInCorrecition by:jorgep
+-   fix: refs #7197 vat, intrastat, filter and list sections by:jorgep
+-   fix: refs #7323 fix department & email table filter by:Jon
+-   fix: refs #7323 fixed left filter by:Jon
+-   fix: refs #7323 fix workerTimeControl form by:Jon
+-   fix: refs #7401 fix routeForm by:pablone
+-   fix: refs #7401 remove console.log by:pablone
+-   fix: refs CAU 207504 fix itemDiary and logs by:Jon
+-   fix: workerCreate form street field to be always upperCase by:Jon
+-   hotfix: refs CAU #207614 fix sale.concept field by:Jon
+-   refactor: refs #7356 fixed VnTable filters by:Jon
+-   refs #6898 fix by:carlossa
+-   Ticket expedition initial load fix by:wbuezas
+
 # Version 24.28 - 2024-07-09

 ### Added 🆕
--- a/commitlint.config.js
+++ b/commitlint.config.js
@ -0,0 +1 @@
+module.exports = { extends: ['@commitlint/config-conventional'] };
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
    "name": "salix-front",
-    "version": "24.32.0",
+    "version": "24.40.0",
    "description": "Salix frontend",
    "productName": "Salix",
    "author": "Verdnatura",
@ -13,7 +13,10 @@
        "test:e2e:ci": "cd ../salix && gulp docker && cd ../salix-front && cypress run",
        "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
        "test:unit": "vitest",
-        "test:unit:ci": "vitest run"
+        "test:unit:ci": "vitest run",
+        "commitlint": "commitlint --edit",
+        "prepare": "npx husky install",
+        "addReferenceTag": "node .husky/addReferenceTag.js"
    },
    "dependencies": {
        "@quasar/cli": "^2.3.0",
@ -29,6 +32,8 @@
        "vue-router": "^4.2.1"
    },
    "devDependencies": {
+        "@commitlint/cli": "^19.2.1",
+        "@commitlint/config-conventional": "^19.1.0",
        "@intlify/unplugin-vue-i18n": "^0.8.1",
        "@pinia/testing": "^0.1.2",
        "@quasar/app-vite": "^1.7.3",
@ -41,6 +46,7 @@
        "eslint-config-prettier": "^8.8.0",
        "eslint-plugin-cypress": "^2.13.3",
        "eslint-plugin-vue": "^9.14.1",
+        "husky": "^8.0.0",
        "postcss": "^8.4.23",
        "prettier": "^2.8.8",
        "vitest": "^0.31.1"
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@ -43,6 +43,15 @@ const onResponseError = (error) => {
    }

    switch (response?.status) {
+        case 422:
+            if (error.name == 'ValidationError')
+                message +=
+                    ' "' +
+                    responseError.details.context +
+                    '.' +
+                    Object.keys(responseError.details.codes).join(',') +
+                    '"';
+            break;
        case 500:
            message = 'errors.statusInternalServerError';
            break;
--- a/src/boot/keyShortcut.js
+++ b/src/boot/keyShortcut.js
@ -0,0 +1,34 @@
+export default {
+    mounted: function (el, binding) {
+        const shortcut = binding.value ?? '+';
+
+        const { key, ctrl, alt, callback } =
+            typeof shortcut === 'string'
+                ? {
+                      key: shortcut,
+                      ctrl: true,
+                      alt: true,
+                      callback: () =>
+                          document
+                              .querySelector(`button[shortcut="${shortcut}"]`)
+                              ?.click(),
+                  }
+                : binding.value;
+
+        const handleKeydown = (event) => {
+            if (event.key === key && (!ctrl || event.ctrlKey) && (!alt || event.altKey)) {
+                callback();
+            }
+        };
+
+        // Attach the event listener to the window
+        window.addEventListener('keydown', handleKeydown);
+
+        el._handleKeydown = handleKeydown;
+    },
+    unmounted: function (el) {
+        if (el._handleKeydown) {
+            window.removeEventListener('keydown', el._handleKeydown);
+        }
+    },
+};
--- a/src/boot/mainShortcutMixin.js
+++ b/src/boot/mainShortcutMixin.js
@ -0,0 +1,38 @@
+import routes from 'src/router/modules';
+import { useRouter } from 'vue-router';
+
+let isNotified = false;
+
+export default {
+    created: function () {
+        const router = useRouter();
+        const keyBindingMap = routes
+            .filter((route) => route.meta.keyBinding)
+            .reduce((map, route) => {
+                map['Key' + route.meta.keyBinding.toUpperCase()] = route.path;
+                return map;
+            }, {});
+
+        const handleKeyDown = (event) => {
+            const { ctrlKey, altKey, code } = event;
+
+            if (ctrlKey && altKey && keyBindingMap[code] && !isNotified) {
+                event.preventDefault();
+                router.push(keyBindingMap[code]);
+                isNotified = true;
+            }
+        };
+
+        const handleKeyUp = (event) => {
+            const { ctrlKey, altKey } = event;
+
+            // Resetea la bandera cuando se sueltan las teclas ctrl o alt
+            if (!ctrlKey || !altKey) {
+                isNotified = false;
+            }
+        };
+
+        window.addEventListener('keydown', handleKeyDown);
+        window.addEventListener('keyup', handleKeyUp);
+    },
+};
--- a/src/boot/qformMixin.js
+++ b/src/boot/qformMixin.js
@ -1,28 +1,11 @@
 import { getCurrentInstance } from 'vue';

-const filterAvailableInput = (element) => {
-    return element.classList.contains('q-field__native') && !element.disabled;
-};
-const filterAvailableText = (element) => {
-    return (
-        element.__vueParentComponent.type.name === 'QInput' &&
-        element.__vueParentComponent?.attrs?.class !== 'vn-input-date'
-    );
-};
-
 export default {
    mounted: function () {
        const vm = getCurrentInstance();
        if (vm.type.name === 'QForm') {
            if (!['searchbarForm', 'filterPanelForm'].includes(this.$el?.id)) {
-                // AUTOFOCUS
-                const elementsArray = Array.from(this.$el.elements);
-                const availableInputs = elementsArray.filter(filterAvailableInput);
-                const firstInputElement = availableInputs.find(filterAvailableText);
-
-                if (firstInputElement) {
-                    firstInputElement.focus();
-                }
+                // TODO: AUTOFOCUS IS NOT FOCUSING
                const that = this;
                this.$el.addEventListener('keyup', function (evt) {
                    if (evt.key === 'Enter') {
--- a/src/boot/quasar.js
+++ b/src/boot/quasar.js
@ -1,6 +1,10 @@
 import { boot } from 'quasar/wrappers';
 import qFormMixin from './qformMixin';
+import mainShortcutMixin from './mainShortcutMixin';
+import keyShortcut from './keyShortcut';

 export default boot(({ app }) => {
    app.mixin(qFormMixin);
+    app.mixin(mainShortcutMixin);
+    app.directive('shortcut', keyShortcut);
 });
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@ -52,7 +52,7 @@ onMounted(async () => {
        @on-data-saved="onDataSaved"
    >
        <template #form-inputs="{ data, validate }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                <VnInput
                    :label="t('name')"
                    v-model="data.name"
@ -67,7 +67,7 @@ onMounted(async () => {
                    :rules="validate('bankEntity.bic')"
                />
            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                <div class="col">
                    <VnSelect
                        :label="t('country')"
--- a/src/components/CreateManualInvoiceForm.vue
+++ b/src/components/CreateManualInvoiceForm.vue
@ -59,7 +59,7 @@ const onDataSaved = async (formData, requestResponse) => {
                <QIcon name="warning" class="fill-icon q-mr-sm" size="md" />
                {{ t('Invoicing in progress...') }}
            </span>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                <VnSelect
                    :label="t('Ticket')"
                    :options="ticketsOptions"
@ -99,7 +99,7 @@ const onDataSaved = async (formData, requestResponse) => {
                />
                <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                <VnSelect
                    :label="t('Serial')"
                    :options="invoiceOutSerialsOptions"
@ -117,7 +117,7 @@ const onDataSaved = async (formData, requestResponse) => {
                    v-model="data.taxArea"
                />
            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                <VnInput
                    :label="t('Reference')"
                    type="textarea"
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@ -4,8 +4,8 @@ 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 VnInput from 'src/components/common/VnInput.vue';
+import VnSelectProvince from 'components/VnSelectProvince.vue';
+import VnInput from 'components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';

 const emit = defineEmits(['onDataSaved']);
@ -19,8 +19,8 @@ const cityFormData = reactive({

 const provincesOptions = ref([]);

-const onDataSaved = (dataSaved) => {
-    emit('onDataSaved', dataSaved);
+const onDataSaved = (...args) => {
+    emit('onDataSaved', ...args);
 };
 </script>

@ -36,24 +36,16 @@ const onDataSaved = (dataSaved) => {
        :form-initial-data="cityFormData"
        url-create="towns"
        model="city"
-        @on-data-saved="onDataSaved($event)"
+        @on-data-saved="onDataSaved"
    >
        <template #form-inputs="{ data, validate }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                <VnInput
                    :label="t('Name')"
                    v-model="data.name"
                    :rules="validate('city.name')"
                />
-                <VnSelect
-                    :label="t('Province')"
-                    :options="provincesOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="data.provinceFk"
-                    :rules="validate('city.provinceFk')"
-                />
+                <VnSelectProvince v-model="data.provinceFk" />
            </VnRow>
        </template>
    </FormModelPopup>
--- a/src/components/CreateNewExpenseForm.vue
+++ b/src/components/CreateNewExpenseForm.vue
@ -0,0 +1,50 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModelPopup from './FormModelPopup.vue';
+
+const emit = defineEmits(['onDataSaved']);
+const { t } = useI18n();
+</script>
+<template>
+    <FormModelPopup
+        url-create="Expenses"
+        model="Expense"
+        :title="t('New expense')"
+        :form-initial-data="{ id: null, isWithheld: false, name: null }"
+        @on-data-saved="emit('onDataSaved', $event)"
+    >
+        <template #form-inputs="{ data, validate }">
+            <VnRow>
+                <VnInput
+                    :label="`${t('globals.code')}`"
+                    v-model="data.id"
+                    :required="true"
+                    :rules="validate('expense.code')"
+                />
+                <QCheckbox
+                    dense
+                    size="sm"
+                    :label="`${t('It\'s a withholding')}`"
+                    v-model="data.isWithheld"
+                    :rules="validate('expense.isWithheld')"
+                />
+            </VnRow>
+            <VnRow>
+                <VnInput
+                    :label="`${t('globals.description')}`"
+                    v-model="data.name"
+                    :required="true"
+                    :rules="validate('expense.description')"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    New expense: Nuevo gasto
+    It's a withholding: Es una retención
+</i18n>
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@ -5,9 +5,9 @@ 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';
 import VnInput from 'src/components/common/VnInput.vue';
 import CreateNewCityForm from './CreateNewCityForm.vue';
-import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
 import FormModelPopup from './FormModelPopup.vue';

@ -22,20 +22,17 @@ const postcodeFormData = reactive({
    townFk: null,
 });

-const townsFetchDataRef = ref(null);
 const provincesFetchDataRef = ref(null);
 const countriesOptions = ref([]);
 const provincesOptions = ref([]);
-const townsLocationOptions = ref([]);
+const town = ref({});

-const onDataSaved = (formData) => {
+function onDataSaved(formData) {
    const newPostcode = {
        ...formData,
    };
-    const townObject = townsLocationOptions.value.find(
-        ({ id }) => id === formData.townFk
-    );
-    newPostcode.town = townObject?.name;
+    newPostcode.town = town.value.name;
+    newPostcode.townFk = town.value.id;
    const provinceObject = provincesOptions.value.find(
        ({ id }) => id === formData.provinceFk
    );
@ -43,39 +40,41 @@ const onDataSaved = (formData) => {
    const countryObject = countriesOptions.value.find(
        ({ id }) => id === formData.countryFk
    );
-    newPostcode.country = countryObject?.country;
+    newPostcode.country = countryObject?.name;
    emit('onDataSaved', newPostcode);
-};
+}

-const onCityCreated = async ({ name, provinceFk }, formData) => {
-    await townsFetchDataRef.value.fetch();
-    formData.townFk = townsLocationOptions.value.find((town) => town.name === name).id;
-    formData.provinceFk = provinceFk;
-    formData.countryFk = provincesOptions.value.find(
-        (province) => province.id === provinceFk
-    ).countryFk;
-};
-
-const onProvinceCreated = async ({ name }, formData) => {
+async function onCityCreated(newTown, formData) {
    await provincesFetchDataRef.value.fetch();
-    formData.provinceFk = provincesOptions.value.find(
-        (province) => province.name === name
-    ).id;
-};
+    newTown.province = provincesOptions.value.find(
+        (province) => province.id === newTown.provinceFk
+    );
+    formData.townFk = newTown;
+    setTown(newTown, formData);
+}
+
+function setTown(newTown, data) {
+    if (!newTown) return;
+    town.value = newTown;
+    data.provinceFk = newTown.provinceFk;
+    data.countryFk = newTown.province.countryFk;
+}
+
+async function setProvince(id, data) {
+    await provincesFetchDataRef.value.fetch();
+    const newProvince = provincesOptions.value.find((province) => province.id == id);
+    if (!newProvince) return;
+
+    data.countryFk = newProvince.countryFk;
+}
 </script>

 <template>
-    <FetchData
-        ref="townsFetchDataRef"
-        @on-fetch="(data) => (townsLocationOptions = data)"
-        auto-load
-        url="Towns/location"
-    />
    <FetchData
        ref="provincesFetchDataRef"
        @on-fetch="(data) => (provincesOptions = data)"
        auto-load
-        url="Provinces"
+        url="Provinces/location"
    />
    <FetchData
        @on-fetch="(data) => (countriesOptions = data)"
@ -88,10 +87,11 @@ const onProvinceCreated = async ({ name }, formData) => {
        :title="t('New postcode')"
        :subtitle="t('Please, ensure you put the correct data!')"
        :form-initial-data="postcodeFormData"
+        :mapper="(data) => (data.townFk = data.townFk.id) && data"
        @on-data-saved="onDataSaved"
    >
        <template #form-inputs="{ data, validate }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                <VnInput
                    :label="t('Postcode')"
                    v-model="data.code"
@ -99,38 +99,43 @@ const onProvinceCreated = async ({ name }, formData) => {
                />
                <VnSelectDialog
                    :label="t('City')"
-                    :options="townsLocationOptions"
+                    url="Towns/location"
+                    @update:model-value="(value) => setTown(value, data)"
                    v-model="data.townFk"
-                    hide-selected
                    option-label="name"
                    option-value="id"
                    :rules="validate('postcode.city')"
-                    :roles-allowed-to-create="['deliveryAssistant']"
+                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
+                    :emit-value="false"
+                    clearable
                >
+                    <template #option="{ itemProps, opt }">
+                        <QItem v-bind="itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{ opt.name }}</QItemLabel>
+                                <QItemLabel caption>
+                                    {{ opt.province.name }},
+                                    {{ opt.province.country.name }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
                    <template #form>
-                        <CreateNewCityForm @on-data-saved="onCityCreated($event, data)" />
+                        <CreateNewCityForm
+                            @on-data-saved="
+                                (_, requestResponse) =>
+                                    onCityCreated(requestResponse, data)
+                            "
+                        />
                    </template>
                </VnSelectDialog>
            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-xl">
-                <VnSelectDialog
-                    :label="t('Province')"
-                    :options="provincesOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
+            <VnRow>
+                <VnSelectProvince
+                    @update:model-value="(value) => setProvince(value, data)"
                    v-model="data.provinceFk"
-                    :rules="validate('postcode.provinceFk')"
-                    :roles-allowed-to-create="['deliveryAssistant']"
-                >
-                    <template #form>
-                        <CreateNewProvinceForm
-                            @on-data-saved="onProvinceCreated($event, data)"
                />
-                    </template> </VnSelectDialog
-            ></VnRow>
-            <VnRow class="row q-gutter-md q-mb-xl"
-                ><VnSelect
+                <VnSelect
                    :label="t('Country')"
                    :options="countriesOptions"
                    hide-selected
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@ -19,8 +19,11 @@ const provinceFormData = reactive({

 const autonomiesOptions = ref([]);

-const onDataSaved = (dataSaved) => {
-    emit('onDataSaved', dataSaved);
+const onDataSaved = (dataSaved, requestResponse) => {
+    requestResponse.autonomy = autonomiesOptions.value.find(
+        (autonomy) => autonomy.id == requestResponse.autonomyFk
+    );
+    emit('onDataSaved', dataSaved, requestResponse);
 };
 </script>

@ -28,7 +31,7 @@ const onDataSaved = (dataSaved) => {
    <FetchData
        @on-fetch="(data) => (autonomiesOptions = data)"
        auto-load
-        url="Autonomies"
+        url="Autonomies/location"
    />
    <FormModelPopup
        :title="t('New province')"
@ -36,10 +39,10 @@ const onDataSaved = (dataSaved) => {
        url-create="provinces"
        model="province"
        :form-initial-data="provinceFormData"
-        @on-data-saved="onDataSaved($event)"
+        @on-data-saved="onDataSaved"
    >
        <template #form-inputs="{ data, validate }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                <VnInput
                    :label="t('Name')"
                    v-model="data.name"
@ -53,7 +56,16 @@ const onDataSaved = (dataSaved) => {
                    option-value="id"
                    v-model="data.autonomyFk"
                    :rules="validate('province.autonomyFk')"
-                />
+                >
+                    <template #option="{ itemProps, opt }">
+                        <QItem v-bind="itemProps">
+                            <QItemSection>
+                                <QItemLabel>{{ opt.name }}</QItemLabel>
+                                <QItemLabel caption> {{ opt.country.name }} </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
            </VnRow>
        </template>
    </FormModelPopup>
--- a/src/components/CreateThermographForm.vue
+++ b/src/components/CreateThermographForm.vue
@ -53,7 +53,7 @@ const onDataSaved = (dataSaved) => {
        @on-data-saved="onDataSaved($event)"
    >
        <template #form-inputs="{ data, validate }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                <VnInput
                    :label="t('Identifier')"
                    v-model="data.thermographId"
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { computed, ref, watch } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRouter, onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useValidator } from 'src/composables/useValidator';
@ -97,6 +97,19 @@ defineExpose({
    vnPaginateRef,
 });

+onBeforeRouteLeave((to, from, next) => {
+    if (hasChanges.value)
+        quasar.dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('globals.unsavedPopup.title'),
+                message: t('globals.unsavedPopup.subtitle'),
+                promise: () => next(),
+            },
+        });
+    else next();
+});
+
 async function fetch(data) {
    resetData(data);
    emit('onFetch', data);
@ -176,11 +189,11 @@ async function saveChanges(data) {
    });
 }

-async function insert() {
+async function insert(pushData = $props.dataRequired) {
    const $index = formData.value.length
        ? formData.value[formData.value.length - 1].$index + 1
        : 0;
-    formData.value.push(Object.assign({ $index }, $props.dataRequired));
+    formData.value.push(Object.assign({ $index }, pushData));
    hasChanges.value = true;
 }

--- a/src/components/EditPictureForm.vue
+++ b/src/components/EditPictureForm.vue
@ -245,14 +245,14 @@ const makeRequest = async () => {
                </div>

                <div class="column">
-                    <VnRow class="row q-gutter-md q-mb-md">
+                    <VnRow>
                        <QOptionGroup
                            :options="uploadMethodsOptions"
                            type="radio"
                            v-model="uploadMethodSelected"
                        />
                    </VnRow>
-                    <VnRow class="row q-gutter-md q-mb-md">
+                    <VnRow>
                        <QFile
                            v-if="uploadMethodSelected === 'computer'"
                            ref="inputFileRef"
@ -287,7 +287,7 @@ const makeRequest = async () => {
                            placeholder="https://"
                        />
                    </VnRow>
-                    <VnRow class="row q-gutter-md q-mb-md">
+                    <VnRow>
                        <VnSelect
                            :label="t('Orientation')"
                            :options="viewportTypes"
--- a/src/components/EditTableCellValueForm.vue
+++ b/src/components/EditTableCellValueForm.vue
@ -82,7 +82,7 @@ const closeForm = () => {
            <span class="title">{{ t('Edit') }}</span>
            <span class="countLines">{{ ` ${rows.length} ` }}</span>
            <span class="title">{{ t('buy(s)') }}</span>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                <VnSelect
                    :label="t('Field to edit')"
                    :options="fieldsOptions"
--- a/src/components/FilterItemForm.vue
+++ b/src/components/FilterItemForm.vue
@ -151,7 +151,7 @@ const selectItem = ({ id }) => {
                <QIcon name="close" size="sm" />
            </span>
            <h1 class="title">{{ t('Filter item') }}</h1>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                <VnInput :label="t('entry.buys.name')" v-model="itemFilterParams.name" />
                <VnInput :label="t('entry.buys.size')" v-model="itemFilterParams.size" />
                <VnSelect
--- a/src/components/FilterTravelForm.vue
+++ b/src/components/FilterTravelForm.vue
@ -144,7 +144,7 @@ const selectTravel = ({ id }) => {
                <QIcon name="close" size="sm" />
            </span>
            <h1 class="title">{{ t('Filter travels') }}</h1>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                <VnSelect
                    :label="t('entry.basicData.agency')"
                    :options="agenciesOptions"
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@ -22,7 +22,7 @@ const { t } = useI18n();
 const { validate } = useValidator();
 const { notify } = useNotify();
 const route = useRoute();
-
+const myForm = ref(null);
 const $props = defineProps({
    url: {
        type: String,
@ -87,6 +87,10 @@ const $props = defineProps({
        type: Boolean,
        default: false,
    },
+    defaultTrim: {
+        type: Boolean,
+        default: true,
+    },
 });
 const emit = defineEmits(['onFetch', 'onDataSaved']);
 const modelValue = computed(
@ -100,17 +104,19 @@ const isResetting = ref(false);
 const hasChanges = ref(!$props.observeFormChanges);
 const originalData = ref({});
 const formData = computed(() => state.get(modelValue));
-const formUrl = computed(() => $props.url);
 const defaultButtons = computed(() => ({
    save: {
        color: 'primary',
        icon: 'save',
        label: 'globals.save',
+        click: () => myForm.value.submit(),
+        type: 'submit',
    },
    reset: {
        color: 'primary',
        icon: 'restart_alt',
        label: 'globals.reset',
+        click: () => reset(),
    },
    ...$props.defaultButtons,
 }));
@ -148,19 +154,22 @@ if (!$props.url)
        (val) => updateAndEmit('onFetch', val)
    );

-watch(formUrl, async () => {
+watch(
+    () => [$props.url, $props.filter],
+    async () => {
        originalData.value = null;
        reset();
        await fetch();
-});
+    }
+);

 onBeforeRouteLeave((to, from, next) => {
    if (hasChanges.value && $props.observeFormChanges)
        quasar.dialog({
            component: VnConfirm,
            componentProps: {
-                title: t('Unsaved changes will be lost'),
-                message: t('Are you sure exit without saving?'),
+                title: t('globals.unsavedPopup.title'),
+                message: t('globals.unsavedPopup.subtitle'),
                promise: () => next(),
            },
        });
@ -193,6 +202,7 @@ async function save() {

    isLoading.value = true;
    try {
+        formData.value = trimData(formData.value);
        const body = $props.mapper ? $props.mapper(formData.value) : formData.value;
        const method = $props.urlCreate ? 'post' : 'patch';
        const url =
@ -251,6 +261,14 @@ function updateAndEmit(evt, val, res) {
    emit(evt, state.get(modelValue), res);
 }

+function trimData(data) {
+    if (!$props.defaultTrim) return data;
+    for (const key in data) {
+        if (typeof data[key] == 'string') data[key] = data[key].trim();
+    }
+    return data;
+}
+
 defineExpose({
    save,
    isLoading,
@ -261,7 +279,14 @@ defineExpose({
 </script>
 <template>
    <div class="column items-center full-width">
-        <QForm @submit="save" @reset="reset" class="q-pa-md" id="formModel">
+        <QForm
+            ref="myForm"
+            v-if="formData"
+            @submit="save"
+            @reset="reset"
+            class="q-pa-md"
+            id="formModel"
+        >
            <QCard>
                <slot
                    v-if="formData"
@ -289,7 +314,7 @@ defineExpose({
                :color="defaultButtons.reset.color"
                :icon="defaultButtons.reset.icon"
                flat
-                @click="reset"
+                @click="defaultButtons.reset.click"
                :disable="!hasChanges"
                :title="t(defaultButtons.reset.label)"
            />
@ -329,7 +354,7 @@ defineExpose({
                :label="tMobile('globals.save')"
                color="primary"
                icon="save"
-                @click="save"
+                @click="defaultButtons.save.click"
                :disable="!hasChanges"
                :title="t(defaultButtons.save.label)"
            />
@ -356,8 +381,3 @@ defineExpose({
    padding: 32px;
 }
 </style>
-<i18n>
-es:
-    Unsaved changes will be lost: Los cambios que no haya guardado se perderán
-    Are you sure exit without saving?: ¿Seguro que quiere salir sin guardar?
-</i18n>
--- a/src/components/ItemsFilterPanel.vue
+++ b/src/components/ItemsFilterPanel.vue
@ -112,6 +112,7 @@ const getCategoryClass = (category, params) => {

 const getSelectedTagValues = async (tag) => {
    try {
+        if (!tag?.selectedTag?.id) return;
        tag.value = null;
        const filter = {
            fields: ['value'],
@ -158,8 +159,8 @@ const removeTag = (index, params, search) => {
    />
    <VnFilterPanel
        :data-key="props.dataKey"
-        :expr-builder="exprBuilder"
-        :custom-tags="customTags"
+        :expr-builder="props.exprBuilder"
+        :custom-tags="props.customTags"
    >
        <template #tags="{ tag, formatFn }">
            <strong v-if="tag.label === 'categoryFk'">
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { onMounted, ref, reactive } from 'vue';
+import { onMounted, watch, ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { QSeparator, useQuasar } from 'quasar';
 import { useRoute } from 'vue-router';
@ -29,6 +29,15 @@ onMounted(async () => {
    getRoutes();
 });

+watch(
+    () => route.matched,
+    () => {
+        items.value = [];
+        getRoutes();
+    },
+    { deep: true }
+);
+
 function findMatches(search, item) {
    const matches = [];
    function findRoute(search, item) {
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@ -33,7 +33,12 @@ const itemComputed = computed(() => {
        <QItemSection avatar v-if="!itemComputed.icon">
            <QIcon name="disabled_by_default" />
        </QItemSection>
-        <QItemSection>{{ t(itemComputed.title) }}</QItemSection>
+        <QItemSection>
+            {{ t(itemComputed.title) }}
+            <QTooltip>
+                {{ 'Ctrl + Alt + ' + item?.keyBinding?.toUpperCase() }}
+            </QTooltip>
+        </QItemSection>
        <QItemSection side>
            <slot name="side" :item="itemComputed" />
        </QItemSection>
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@ -7,7 +7,7 @@ import { useQuasar } from 'quasar';
 import PinnedModules from './PinnedModules.vue';
 import UserPanel from 'components/UserPanel.vue';
 import VnBreadcrumbs from './common/VnBreadcrumbs.vue';
-import VnImg from 'src/components/ui/VnImg.vue';
+import VnAvatar from './ui/VnAvatar.vue';

 const { t } = useI18n();
 const stateStore = useStateStore();
@ -24,7 +24,13 @@ const pinnedModulesRef = ref();
 <template>
    <QHeader color="white" elevated>
        <QToolbar class="q-py-sm q-px-md">
-            <QBtn @click="stateStore.toggleLeftDrawer()" icon="menu" round dense flat>
+            <QBtn
+                @click="stateStore.toggleLeftDrawer()"
+                icon="dock_to_right"
+                round
+                dense
+                flat
+            >
                <QTooltip bottom anchor="bottom right">
                    {{ t('globals.collapseMenu') }}
                </QTooltip>
@ -72,22 +78,13 @@ const pinnedModulesRef = ref();
                    </QTooltip>
                    <PinnedModules ref="pinnedModulesRef" />
                </QBtn>
-                <QBtn
-                    :class="{ 'q-pa-none': quasar.platform.is.mobile }"
-                    rounded
-                    dense
-                    flat
-                    no-wrap
-                    id="user"
-                >
-                    <QAvatar size="lg">
-                        <VnImg
-                            :id="user.id"
-                            collection="user"
-                            size="160x160"
-                            :zoom-size="null"
+                <QBtn class="q-pa-none" rounded dense flat no-wrap id="user">
+                    <VnAvatar
+                        :worker-id="user.id"
+                        :title="user.name"
+                        size="lg"
+                        color="transparent"
                    />
-                    </QAvatar>
                    <QTooltip bottom>
                        {{ t('globals.userPanel') }}
                    </QTooltip>
--- a/src/components/RefundInvoiceForm.vue
+++ b/src/components/RefundInvoiceForm.vue
@ -0,0 +1,174 @@
+<script setup>
+import { ref, reactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import { useDialogPluginComponent } from 'quasar';
+import VnRow from 'components/ui/VnRow.vue';
+import FetchData from 'components/FetchData.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import FormPopup from './FormPopup.vue';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const $props = defineProps({
+    invoiceOutData: {
+        type: Object,
+        default: () => {},
+    },
+});
+
+const { dialogRef } = useDialogPluginComponent();
+const { t } = useI18n();
+const router = useRouter();
+const { notify } = useNotify();
+
+const rectificativeTypeOptions = ref([]);
+const siiTypeInvoiceOutsOptions = ref([]);
+const inheritWarehouse = ref(true);
+const invoiceParams = reactive({
+    id: $props.invoiceOutData?.id,
+});
+const invoiceCorrectionTypesOptions = ref([]);
+
+const refund = async () => {
+    const params = {
+        id: invoiceParams.id,
+        withWarehouse: invoiceParams.inheritWarehouse,
+        cplusRectificationTypeFk: invoiceParams.cplusRectificationTypeFk,
+        siiTypeInvoiceOutFk: invoiceParams.siiTypeInvoiceOutFk,
+        invoiceCorrectionTypeFk: invoiceParams.invoiceCorrectionTypeFk,
+    };
+
+    try {
+        const { data } = await axios.post('InvoiceOuts/refundAndInvoice', params);
+        notify(t('Refunded invoice'), 'positive');
+        const [id] = data?.refundId || [];
+        if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
+    } catch (err) {
+        console.error('Error refunding invoice', err);
+    }
+};
+</script>
+
+<template>
+    <FetchData
+        url="CplusRectificationTypes"
+        :filter="{ order: 'description' }"
+        @on-fetch="
+            (data) => (
+                (rectificativeTypeOptions = data),
+                (invoiceParams.cplusRectificationTypeFk = data.filter(
+                    (type) => type.description == 'I – Por diferencias'
+                )[0].id)
+            )
+        "
+        auto-load
+    />
+    <FetchData
+        url="SiiTypeInvoiceOuts"
+        :filter="{ where: { code: { like: 'R%' } } }"
+        @on-fetch="
+            (data) => (
+                (siiTypeInvoiceOutsOptions = data),
+                (invoiceParams.siiTypeInvoiceOutFk = data.filter(
+                    (type) => type.code == 'R4'
+                )[0].id)
+            )
+        "
+        auto-load
+    />
+    <FetchData
+        url="InvoiceCorrectionTypes"
+        @on-fetch="(data) => (invoiceCorrectionTypesOptions = data)"
+        auto-load
+    />
+
+    <QDialog ref="dialogRef">
+        <FormPopup
+            @on-submit="refund()"
+            :custom-submit-button-label="t('Accept')"
+            :default-cancel-button="false"
+        >
+            <template #form-inputs>
+                <VnRow>
+                    <VnSelect
+                        :label="t('Rectificative type')"
+                        :options="rectificativeTypeOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="id"
+                        v-model="invoiceParams.cplusRectificationTypeFk"
+                        :required="true"
+                    />
+                </VnRow>
+                <VnRow>
+                    <VnSelect
+                        :label="t('Class')"
+                        :options="siiTypeInvoiceOutsOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="id"
+                        v-model="invoiceParams.siiTypeInvoiceOutFk"
+                        :required="true"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt?.code }} -
+                                        {{ scope.opt?.description }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </VnRow>
+
+                <VnRow>
+                    <VnSelect
+                        :label="t('Type')"
+                        :options="invoiceCorrectionTypesOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="id"
+                        v-model="invoiceParams.invoiceCorrectionTypeFk"
+                        :required="true"
+                    /> </VnRow
+                ><VnRow>
+                    <div>
+                        <QCheckbox
+                            :label="t('Inherit warehouse')"
+                            v-model="inheritWarehouse"
+                        />
+                        <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
+                            <QTooltip>{{ t('Inherit warehouse tooltip') }}</QTooltip>
+                        </QIcon>
+                    </div>
+                </VnRow>
+            </template>
+        </FormPopup>
+    </QDialog>
+</template>
+
+<i18n>
+en:
+    Refund invoice: Refund invoice
+    Rectificative type: Rectificative type
+    Class: Class
+    Type: Type
+    Refunded invoice: Refunded invoice
+    Inherit warehouse: Inherit the warehouse
+    Inherit warehouse tooltip: Select this option to inherit the warehouse when refunding the invoice
+    Accept: Accept
+    Error refunding invoice: Error refunding invoice
+es:
+    Refund invoice: Abonar factura
+    Rectificative type: Tipo rectificativa
+    Class: Clase
+    Type: Tipo
+    Refunded invoice: Factura abonada
+    Inherit warehouse: Heredar el almacén
+    Inherit warehouse tooltip: Seleccione esta opción para heredar el almacén al abonar la factura.
+    Accept: Aceptar
+    Error refunding invoice: Error abonando factura
+</i18n>
--- a/src/components/RegularizeStockForm.vue
+++ b/src/components/RegularizeStockForm.vue
@ -15,7 +15,7 @@ const props = defineProps({
        default: null,
    },
    warehouseFk: {
-        type: Boolean,
+        type: Number,
        default: null,
    },
 });
@ -23,7 +23,7 @@ const props = defineProps({
 const { t } = useI18n();

 const regularizeFormData = reactive({
-    itemFk: props.itemFk,
+    itemFk: Number(props.itemFk),
    warehouseFk: props.warehouseFk,
    quantity: null,
 });
@ -49,18 +49,19 @@ const onDataSaved = (data) => {
        @on-data-saved="onDataSaved($event)"
    >
        <template #form-inputs="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                <QInput
                    :label="t('Type the visible quantity')"
                    v-model.number="data.quantity"
+                    type="number"
                    autofocus
                />
            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                <div class="col">
                    <VnSelect
                        :label="t('Warehouse')"
-                        v-model="data.warehouseFk"
+                        v-model.number="data.warehouseFk"
                        :options="warehousesOptions"
                        option-value="id"
                        option-label="name"
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@ -2,13 +2,12 @@
 import { ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import { useQuasar } from 'quasar';
+import { useQuasar, useDialogPluginComponent } from 'quasar';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import FormPopup from './FormPopup.vue';
-import { useDialogPluginComponent } from 'quasar';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';

@ -18,19 +17,19 @@ const $props = defineProps({
        default: () => {},
    },
 });
+
 const { dialogRef } = useDialogPluginComponent();
 const quasar = useQuasar();
 const { t } = useI18n();
 const router = useRouter();
 const { notify } = useNotify();
-const checked = ref(true);
-const transferInvoiceParams = reactive({
-    id: $props.invoiceOutData?.id,
-    refFk: $props.invoiceOutData?.ref,
-});

 const rectificativeTypeOptions = ref([]);
 const siiTypeInvoiceOutsOptions = ref([]);
+const checked = ref(true);
+const transferInvoiceParams = reactive({
+    id: $props.invoiceOutData?.id,
+});
 const invoiceCorrectionTypesOptions = ref([]);

 const selectedClient = (client) => {
@ -44,10 +43,9 @@ const makeInvoice = async () => {
    const params = {
        id: transferInvoiceParams.id,
        cplusRectificationTypeFk: transferInvoiceParams.cplusRectificationTypeFk,
+        siiTypeInvoiceOutFk: transferInvoiceParams.siiTypeInvoiceOutFk,
        invoiceCorrectionTypeFk: transferInvoiceParams.invoiceCorrectionTypeFk,
        newClientFk: transferInvoiceParams.newClientFk,
-        refFk: transferInvoiceParams.refFk,
-        siiTypeInvoiceOutFk: transferInvoiceParams.siiTypeInvoiceOutFk,
        makeInvoice: checked.value,
    };

@ -74,7 +72,7 @@ const makeInvoice = async () => {
            }
        }

-        const { data } = await axios.post('InvoiceOuts/transferInvoice', params);
+        const { data } = await axios.post('InvoiceOuts/transfer', params);
        notify(t('Transferred invoice'), 'positive');
        const id = data?.[0];
        if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
@ -124,7 +122,7 @@ const makeInvoice = async () => {
            :default-cancel-button="false"
        >
            <template #form-inputs>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                    <VnSelect
                        :label="t('Client')"
                        :options="clientsOptions"
@ -160,7 +158,7 @@ const makeInvoice = async () => {
                        :required="true"
                    />
                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                    <VnSelect
                        :label="t('Class')"
                        :options="siiTypeInvoiceOutsOptions"
@ -191,9 +189,12 @@ const makeInvoice = async () => {
                        :required="true"
                    />
                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                    <div>
-                        <QCheckbox :label="t('Bill destination client')" v-model="checked" />
+                        <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>
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@ -11,8 +11,8 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import { useClipboard } from 'src/composables/useClipboard';
-import VnImg from 'src/components/ui/VnImg.vue';
 import { useRole } from 'src/composables/useRole';
+import VnAvatar from './ui/VnAvatar.vue';

 const state = useState();
 const session = useSession();
@ -136,7 +136,7 @@ const isEmployee = computed(() => useRole().isEmployee());
                    @update:model-value="saveLanguage"
                    :label="t(`globals.lang['${userLocale}']`)"
                    icon="public"
-                    color="orange"
+                    color="primary"
                    false-value="es"
                    true-value="en"
                />
@ -145,7 +145,7 @@ const isEmployee = computed(() => useRole().isEmployee());
                    @update:model-value="saveDarkMode"
                    :label="t(`globals.darkMode`)"
                    checked-icon="dark_mode"
-                    color="orange"
+                    color="primary"
                    unchecked-icon="light_mode"
                />
            </div>
@ -153,10 +153,20 @@ const isEmployee = computed(() => useRole().isEmployee());
            <QSeparator vertical inset class="q-mx-lg" />

            <div class="col column items-center q-mb-sm">
-                <QAvatar size="80px">
-                    <VnImg :id="user.id" collection="user" size="160x160" />
-                </QAvatar>
-
+                <VnAvatar
+                    :worker-id="user.id"
+                    :title="user.name"
+                    size="xxl"
+                    color="transparent"
+                />
+                <QBtn
+                    v-if="isEmployee"
+                    class="q-mt-sm q-px-md"
+                    :to="`/worker/${user.id}`"
+                    color="primary"
+                    :label="t('globals.myAccount')"
+                    dense
+                />
                <div class="text-subtitle1 q-mt-md">
                    <strong>{{ user.nickname }}</strong>
                </div>
@ -168,7 +178,7 @@ const isEmployee = computed(() => useRole().isEmployee());
                </div>
                <QBtn
                    id="logout"
-                    color="orange"
+                    color="primary"
                    flat
                    :label="t('globals.logOut')"
                    size="sm"
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@ -0,0 +1,59 @@
+<script setup>
+import { ref, watch } from 'vue';
+import { useValidator } from 'src/composables/useValidator';
+import { useI18n } from 'vue-i18n';
+
+import VnSelectDialog from 'components/common/VnSelectDialog.vue';
+import FetchData from 'components/FetchData.vue';
+import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
+
+const emit = defineEmits(['onProvinceCreated']);
+const provinceFk = defineModel({ type: Number });
+watch(provinceFk, async () => await provincesFetchDataRef.value.fetch());
+
+const { validate } = useValidator();
+const { t } = useI18n();
+
+const provincesOptions = ref();
+const provincesFetchDataRef = ref();
+
+async function onProvinceCreated(_, data) {
+    await provincesFetchDataRef.value.fetch();
+    provinceFk.value = data.id;
+    emit('onProvinceCreated', data);
+}
+</script>
+
+<template>
+    <FetchData
+        ref="provincesFetchDataRef"
+        :filter="{ include: { relation: 'country' } }"
+        @on-fetch="(data) => (provincesOptions = data)"
+        auto-load
+        url="Provinces"
+    />
+    <VnSelectDialog
+        :label="t('Province')"
+        :options="provincesOptions"
+        hide-selected
+        v-model="provinceFk"
+        :rules="validate && validate('postcode.provinceFk')"
+        :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
+    >
+        <template #option="{ itemProps, opt }">
+            <QItem v-bind="itemProps">
+                <QItemSection>
+                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                    <QItemLabel caption> {{ opt.country.name }} </QItemLabel>
+                </QItemSection>
+            </QItem>
+        </template>
+        <template #form>
+            <CreateNewProvinceForm @on-data-saved="onProvinceCreated" />
+        </template>
+    </VnSelectDialog>
+</template>
+<i18n>
+    es:
+        Province: Provincia
+</i18n>
--- a/src/components/VnTable/VnChip.vue
+++ b/src/components/VnTable/VnChip.vue
@ -35,7 +35,9 @@ function stopEventPropagation(event) {
            dense
            square
        >
-            <span v-if="!col.chip.icon">{{ row[col.name] }}</span>
+            <span v-if="!col.chip.icon">
+                {{ col.format ? col.format(row) : row[col.name] }}
+            </span>
            <QIcon v-else :name="col.chip.icon" color="primary-light" />
        </QChip>
    </span>
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@ -7,11 +7,13 @@ import { dashIfEmpty } from 'src/filters';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnSelectCache from 'components/common/VnSelectCache.vue';
 import VnInput from 'components/common/VnInput.vue';
+import VnInputNumber from 'components/common/VnInputNumber.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 import VnComponent from 'components/common/VnComponent.vue';
 import VnDescriptor from 'components/VnTable/VnDescriptor.vue';
 import { QBtn } from 'quasar';
+import VnUserLink from 'components/ui/VnUserLink.vue';

 const model = defineModel(undefined, { required: true });
 const $props = defineProps({
@ -68,7 +70,7 @@ const defaultComponents = {
        },
    },
    number: {
-        component: markRaw(VnInput),
+        component: markRaw(VnInputNumber),
        attrs: {
            disable: !$props.isEditable,
            class: 'fit',
@ -100,14 +102,14 @@ const defaultComponents = {
    },
    checkbox: {
        component: markRaw(QCheckbox),
-        attrs: (prop) => {
+        attrs: ({ model }) => {
            const defaultAttrs = {
                disable: !$props.isEditable,
-                'model-value': Boolean(prop),
+                'model-value': Boolean(model),
                class: 'no-padding fit',
            };

-            if (typeof prop == 'number') {
+            if (typeof model == 'number') {
                defaultAttrs['true-value'] = 1;
                defaultAttrs['false-value'] = 0;
            }
@ -139,6 +141,9 @@ const defaultComponents = {
            row: $props.row,
        },
    },
+    userLink: {
+        component: markRaw(VnUserLink),
+    },
 };

 const value = computed(() => {
@ -159,8 +164,8 @@ const col = computed(() => {
        };
    }
    if (
-        (newColumn.name.startsWith('is') || newColumn.name.startsWith('has')) &&
-        !newColumn.component
+        (/^is[A-Z]/.test(newColumn.name) || /^has[A-Z]/.test(newColumn.name)) &&
+        newColumn.component == null
    )
        newColumn.component = 'checkbox';
    if ($props.default && !newColumn.component) newColumn.component = $props.default;
@ -176,14 +181,14 @@ const components = computed(() => $props.components ?? defaultComponents);
            v-if="col.before"
            :prop="col.before"
            :components="components"
-            :value="model"
+            :value="{ row, model }"
            v-model="model"
        />
        <VnComponent
            v-if="col.component"
            :prop="col"
            :components="components"
-            :value="model"
+            :value="{ row, model }"
            v-model="model"
        />
        <span :title="value" v-else>{{ value }}</span>
@ -191,7 +196,7 @@ const components = computed(() => $props.components ?? defaultComponents);
            v-if="col.after"
            :prop="col.after"
            :components="components"
-            :value="model"
+            :value="{ row, model }"
            v-model="model"
        />
    </div>
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@ -10,6 +10,8 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';

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

-const updateEvent = { 'update:modelValue': addFilter };
+const updateEvent = { 'update:modelValue': addFilter, remove: () => addFilter(null) };
 const enterEvent = {
    'keyup.enter': () => addFilter(model.value),
    remove: () => addFilter(null),
@ -45,7 +47,7 @@ const defaultAttrs = {
 };

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

 const selectComponent = {
@ -75,6 +77,7 @@ const components = {
        attrs: {
            ...defaultAttrs,
            clearable: true,
+            type: 'number',
        },
        forceAttrs,
    },
--- a/src/components/VnTable/VnOrder.vue
+++ b/src/components/VnTable/VnOrder.vue
@ -1,7 +1,7 @@
 <script setup>
 import { ref } from 'vue';
 import { useArrayData } from 'composables/useArrayData';
-const model = defineModel({ type: Object, required: true });
+const model = defineModel({ type: Object });
 const $props = defineProps({
    name: {
        type: String,
@ -56,7 +56,7 @@ defineExpose({ orderBy });
        <span :title="label">{{ label }}</span>
        <QChip
            v-if="name"
-            :label="!vertical && model?.index"
+            :label="!vertical ? model?.index : ''"
            :icon="
                (model?.index || hover) && !vertical
                    ? model?.direction == 'DESC'
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@ -37,6 +37,10 @@ const $props = defineProps({
        type: [Function, Boolean],
        default: null,
    },
+    rowCtrlClick: {
+        type: [Function, Boolean],
+        default: null,
+    },
    redirect: {
        type: String,
        default: null,
@ -45,6 +49,10 @@ const $props = defineProps({
        type: Object,
        default: null,
    },
+    createAsDialog: {
+        type: Boolean,
+        default: true,
+    },
    cardClass: {
        type: String,
        default: 'flex-one',
@ -81,6 +89,10 @@ const $props = defineProps({
        type: Object,
        default: () => ({}),
    },
+    crudModel: {
+        type: Object,
+        default: () => ({}),
+    },
    tableHeight: {
        type: String,
        default: '90vh',
@ -92,9 +104,9 @@ const route = useRoute();
 const router = useRouter();
 const quasar = useQuasar();

-const DEFAULT_MODE = 'card';
+const CARD_MODE = 'card';
 const TABLE_MODE = 'table';
-const mode = ref(DEFAULT_MODE);
+const mode = ref(CARD_MODE);
 const selected = ref([]);
 const hasParams = ref(false);
 const routeQuery = JSON.parse(route?.query[$props.searchUrl] ?? '{}');
@ -103,7 +115,9 @@ const orders = ref(parseOrder(routeQuery.filter?.order));
 const CrudModelRef = ref({});
 const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
-const columnsVisibilitySkiped = ref();
+const columnsVisibilitySkipped = ref();
+const createForm = ref();
+
 const tableModes = [
    {
        icon: 'view_column',
@ -114,24 +128,35 @@ const tableModes = [
    {
        icon: 'grid_view',
        title: t('grid view'),
-        value: DEFAULT_MODE,
+        value: CARD_MODE,
        disable: $props.disableOption?.card,
    },
 ];
 onBeforeMount(() => {
    setUserParams(route.query[$props.searchUrl]);
-    hasParams.value = Object.keys(params.value).length !== 0;
+    hasParams.value = params.value && Object.keys(params.value).length !== 0;
 });

 onMounted(() => {
-    mode.value = quasar.platform.is.mobile ? DEFAULT_MODE : $props.defaultMode;
+    mode.value =
+        quasar.platform.is.mobile && !$props.disableOption?.card
+            ? CARD_MODE
+            : $props.defaultMode;
    stateStore.rightDrawer = true;
-    columnsVisibilitySkiped.value = [
+    columnsVisibilitySkipped.value = [
        ...splittedColumns.value.columns
            .filter((c) => c.visible == false)
            .map((c) => c.name),
        ...['tableActions'],
    ];
+    createForm.value = $props.create;
+    if ($props.create && route?.query?.createForm) {
+        showForm.value = true;
+        createForm.value = {
+            ...createForm.value,
+            ...{ formInitialData: JSON.parse(route?.query?.createForm) },
+        };
+    }
 });

 watch(
@ -147,21 +172,34 @@ watch(

 const isTableMode = computed(() => mode.value == TABLE_MODE);

-function setUserParams(watchedParams) {
+function setUserParams(watchedParams, watchedOrder) {
    if (!watchedParams) return;

    if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
-    const filter = JSON.parse(watchedParams?.filter);
+    const filter =
+        typeof watchedParams?.filter == 'string'
+            ? JSON.parse(watchedParams?.filter ?? '{}')
+            : watchedParams?.filter;
    const where = filter?.where;
-    const order = filter?.order;
+    const order = watchedOrder ?? filter?.order;

    watchedParams = { ...watchedParams, ...where };
    delete watchedParams.filter;
    delete params.value?.filter;
-    params.value = { ...params.value, ...watchedParams };
+    params.value = { ...params.value, ...sanitizer(watchedParams) };
    orders.value = parseOrder(order);
 }

+function sanitizer(params) {
+    for (const [key, value] of Object.entries(params)) {
+        if (typeof value == 'object') {
+            const param = Object.values(value)[0];
+            if (typeof param == 'string') params[key] = param.replaceAll('%', '');
+        }
+    }
+    return params;
+}
+
 function splitColumns(columns) {
    splittedColumns.value = {
        columns: [],
@ -171,13 +209,17 @@ function splitColumns(columns) {
    };

    for (const col of columns) {
-        if (col.name == 'tableActions') splittedColumns.value.actions = col;
+        if (col.name == 'tableActions') {
+            col.orderBy = false;
+            splittedColumns.value.actions = col;
+        }
        if (col.chip) splittedColumns.value.chips.push(col);
        if (col.isTitle) splittedColumns.value.title = col;
        if (col.create) splittedColumns.value.create.push(col);
        if (col.cardVisible) splittedColumns.value.cardVisible.push(col);
        if ($props.isEditable && col.disable == null) col.disable = false;
-        if ($props.useModel) col.columnFilter = { ...col.columnFilter, inWhere: true };
+        if ($props.useModel && col.columnFilter != false)
+            col.columnFilter = { ...col.columnFilter, inWhere: true };
        splittedColumns.value.columns.push(col);
    }
    // Status column
@ -202,6 +244,16 @@ const rowClickFunction = computed(() => {
    return () => {};
 });

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

 function reload(params) {
+    selected.value = [];
    CrudModelRef.value.reload(params);
 }

@ -239,10 +292,17 @@ function parseOrder(urlOrders) {

 const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
 defineExpose({
+    create: createForm,
    reload,
    redirect: redirectFn,
    selected,
+    CrudModelRef,
 });
+
+function handleOnDataSaved(_, res) {
+    if (_.onDataSaved) _.onDataSaved(this);
+    else $props.create.onDataSaved(_);
+}
 </script>
 <template>
    <QDrawer
@ -259,11 +319,14 @@ defineExpose({
                v-model="params"
                :search-url="searchUrl"
                :redirect="!!redirect"
+                @set-user-params="setUserParams"
            >
                <template #body>
                    <div
                        class="row no-wrap flex-center"
-                        v-for="col of splittedColumns.columns"
+                        v-for="col of splittedColumns.columns.filter(
+                            (c) => c.columnFilter ?? true
+                        )"
                        :key="col.id"
                    >
                        <VnTableFilter
@ -273,7 +336,11 @@ defineExpose({
                            :search-url="searchUrl"
                        />
                        <VnTableOrder
-                            v-model="orders[col.name]"
+                            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"
@ -285,32 +352,25 @@ defineExpose({
                        :params="params"
                        :columns="splittedColumns.columns"
                    />
-                    <slot
-                        name="moreFilterPanel"
-                        :params="params"
-                        :columns="splittedColumns.columns"
-                    />
                </template>
            </VnFilterPanel>
        </QScrollArea>
    </QDrawer>
    <!-- class in div to fix warn-->
-    <div class="q-px-md">
+
    <CrudModel
        v-bind="$attrs"
+        :class="$attrs['class'] ?? 'q-px-md'"
        :limit="20"
        ref="CrudModelRef"
+        @on-fetch="(...args) => emit('onFetch', ...args)"
        :search-url="searchUrl"
        :disable-infinite-scroll="isTableMode"
        @save-changes="reload"
        :has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
        :auto-load="hasParams || $attrs['auto-load']"
    >
-            <template
-                v-for="(_, slotName) in $slots"
-                #[slotName]="slotData"
-                :key="slotName"
-            >
+        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
        </template>
        <template #body="{ rows }">
@ -329,6 +389,7 @@ defineExpose({
                @virtual-scroll="
                    (event) =>
                        event.index > rows.length - 2 &&
+                        ($props.crudModel?.paginate ?? true) &&
                        CrudModelRef.vnPaginateRef.paginate()
                "
                @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
@ -337,42 +398,39 @@ defineExpose({
                <template #top-left v-if="!$props.withoutHeader">
                    <slot name="top-left"></slot>
                </template>
-                    <template #top-right>
+                <template #top-right v-if="!$props.withoutHeader">
                    <VnVisibleColumn
                        v-if="isTableMode"
                        v-model="splittedColumns.columns"
                        :table-code="tableCode ?? route.name"
-                            :skip="columnsVisibilitySkiped"
+                        :skip="columnsVisibilitySkipped"
                    />
                    <QBtnToggle
                        v-model="mode"
                        toggle-color="primary"
                        class="bg-vn-section-color"
                        dense
-                            :options="tableModes"
+                        :options="tableModes.filter((mode) => !mode.disable)"
                    />
                    <QBtn
                        v-if="$props.rightSearch"
                        icon="filter_alt"
-                            title="asd"
                        class="bg-vn-section-color q-ml-md"
                        dense
                        @click="stateStore.toggleRightDrawer()"
                    />
                </template>
                <template #header-cell="{ col }">
-                        <QTh v-if="col.visible ?? true" auto-width>
+                    <QTh v-if="col.visible ?? true">
                        <div
                            class="column self-start q-ml-xs ellipsis"
                            :class="`text-${col?.align ?? 'left'}`"
-                                style="height: 75px"
-                            >
-                                <div
-                                    class="row items-center no-wrap"
-                                    style="height: 30px"
+                            :style="$props.columnSearch ? 'height: 75px' : ''"
                        >
+                            <div class="row items-center no-wrap" style="height: 30px">
+                                <QTooltip v-if="col.toolTip">{{ col.toolTip }}</QTooltip>
                                <VnTableOrder
-                                        v-model="orders[col.name]"
+                                    v-model="orders[col.orderBy ?? col.name]"
                                    :name="col.orderBy ?? col.name"
                                    :label="col?.label"
                                    :data-key="$attrs['data-key']"
@ -386,6 +444,7 @@ defineExpose({
                                :data-key="$attrs['data-key']"
                                v-model="params[columnName(col)]"
                                :search-url="searchUrl"
+                                class="full-width"
                            />
                        </div>
                    </QTh>
@ -395,25 +454,31 @@ defineExpose({
                </template>
                <template #body-cell-tableStatus="{ col, row }">
                    <QTd auto-width :class="getColAlign(col)">
-                            <VnTableChip
-                                :columns="splittedColumns.columnChips"
-                                :row="row"
-                            >
+                        <VnTableChip :columns="splittedColumns.columnChips" :row="row">
                            <template #afterChip>
                                <slot name="afterChip" :row="row"></slot>
                            </template>
                        </VnTableChip>
                    </QTd>
                </template>
-                    <template #body-cell="{ col, row }">
+                <template #body-cell="{ col, row, rowIndex }">
                    <!-- Columns -->
                    <QTd
                        auto-width
                        class="no-margin q-px-xs"
-                            :class="[getColAlign(col), col.class, col.columnField?.class]"
+                        :class="[getColAlign(col), col.columnClass]"
                        v-if="col.visible ?? true"
+                        @click.ctrl="
+                            ($event) =>
+                                rowCtrlClickFunction && rowCtrlClickFunction($event, row)
+                        "
+                    >
+                        <slot
+                            :name="`column-${col.name}`"
+                            :col="col"
+                            :row="row"
+                            :row-index="rowIndex"
                        >
-                            <slot :name="`column-${col.name}`" :col="col" :row="row">
                            <VnTableColumn
                                :column="col"
                                :row="row"
@ -433,16 +498,18 @@ defineExpose({
                    >
                        <QBtn
                            v-for="(btn, index) of col.actions"
+                            v-show="btn.show ? btn.show(row) : true"
                            :key="index"
                            :title="btn.title"
                            :icon="btn.icon"
                            class="q-px-sm"
                            flat
                            :class="
-                                    btn.isPrimary
-                                        ? 'text-primary-light'
-                                        : 'color-vn-text '
+                                btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
                            "
+                            :style="`visibility: ${
+                                (btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden'
+                            }`"
                            @click="btn.action(row)"
                        />
                    </QTd>
@ -500,7 +567,9 @@ defineExpose({
                                    :class="$props.cardClass"
                                >
                                    <div
-                                            v-for="col of splittedColumns.cardVisible"
+                                        v-for="(
+                                            col, index
+                                        ) of splittedColumns.cardVisible"
                                        :key="col.name"
                                        class="fields"
                                    >
@ -513,14 +582,13 @@ defineExpose({
                                        >
                                            <template #value>
                                                <span
-                                                        @click="
-                                                            stopEventPropagation($event)
-                                                        "
+                                                    @click="stopEventPropagation($event)"
                                                >
                                                    <slot
                                                        :name="`column-${col.name}`"
                                                        :col="col"
                                                        :row="row"
+                                                        :row-index="index"
                                                    >
                                                        <VnTableColumn
                                                            :column="col"
@ -565,24 +633,38 @@ defineExpose({
            </QTable>
        </template>
    </CrudModel>
-    </div>
-    <QPageSticky v-if="create" :offset="[20, 20]" style="z-index: 2">
-        <QBtn @click="showForm = !showForm" color="primary" fab icon="add" />
+    <QPageSticky :offset="[20, 20]" style="z-index: 2">
+        <QBtn
+            @click="
+                () =>
+                    createAsDialog ? (showForm = !showForm) : handleOnDataSaved(create)
+            "
+            color="primary"
+            fab
+            icon="add"
+            shortcut="+"
+        />
        <QTooltip>
-            {{ create.title }}
+            {{ createForm.title }}
        </QTooltip>
    </QPageSticky>
    <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
        <FormModelPopup
-            v-bind="create"
+            v-bind="createForm"
            :model="$attrs['data-key'] + 'Create'"
-            @on-data-saved="(_, res) => create.onDataSaved(res)"
+            @on-data-saved="(_, res) => createForm.onDataSaved(res)"
        >
            <template #form-inputs="{ data }">
                <div class="grid-create">
-                    <VnTableColumn
+                    <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"
@ -590,6 +672,7 @@ defineExpose({
                            :show-label="true"
                            component-prop="columnCreate"
                        />
+                    </slot>
                    <slot name="more-create-dialog" :data="data" />
                </div>
            </template>
--- a/src/components/VnTable/VnVisibleColumn.vue
+++ b/src/components/VnTable/VnVisibleColumn.vue
@ -65,7 +65,7 @@ async function fetchViewConfigData() {
        const userConfig = await getConfig('UserConfigViews', {
            where: {
                ...defaultFilter.where,
-                ...{ userFk: user.id },
+                ...{ userFk: user.value.id },
            },
        });

@ -81,7 +81,7 @@ async function fetchViewConfigData() {
            return;
        }
    } catch (err) {
-        console.err('Error fetching config view data', err);
+        console.error('Error fetching config view data', err);
    }
 }

--- a/src/components/common/RightMenu.vue
+++ b/src/components/common/RightMenu.vue
@ -37,7 +37,7 @@ const stateStore = useStateStore();
                @click="stateStore.toggleRightDrawer()"
                round
                dense
-                icon="menu"
+                icon="dock_to_left"
            >
                <QTooltip bottom anchor="bottom right">
                    {{ t('globals.collapseMenu') }}
@ -46,7 +46,7 @@ const stateStore = useStateStore();
        </div>
    </Teleport>
    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+        <QScrollArea class="fit">
            <div id="right-panel"></div>
            <slot v-if="!hasContent" name="right-panel" />
        </QScrollArea>
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@ -84,7 +84,7 @@ const fetchViewConfigData = async () => {
            setUserConfigViewData(defaultColumns);
        }
    } catch (err) {
-        console.err('Error fetching config view data', err);
+        console.error('Error fetching config view data', err);
    }
 };

--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@ -1,6 +1,6 @@
 <script setup>
 import { onBeforeMount, computed } from 'vue';
-import { useRoute, onBeforeRouteUpdate } from 'vue-router';
+import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
@ -8,7 +8,6 @@ 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 },
    baseUrl: { type: String, default: undefined },
@ -17,29 +16,33 @@ const props = defineProps({
    descriptor: { type: Object, required: true },
    filterPanel: { type: Object, default: undefined },
    searchDataKey: { type: String, default: undefined },
-    searchUrl: { type: String, default: undefined },
-    searchbarLabel: { type: String, default: '' },
-    searchbarInfo: { type: String, default: '' },
-    searchCustomRouteRedirect: { type: String, default: undefined },
-    searchRedirect: { type: Boolean, default: true },
-    searchMakeFetch: { type: Boolean, default: true },
+    searchbarProps: { type: Object, default: undefined },
+    redirectOnError: { type: Boolean, default: false },
 });

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

 onBeforeMount(async () => {
+    try {
        if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
        await arrayData.fetch({ append: false, updateRouter: false });
+    } catch (e) {
+        router.push({ name: 'WorkerList' });
+    }
 });

 if (props.baseUrl) {
@ -65,26 +68,18 @@ if (props.baseUrl) {
        </QScrollArea>
    </QDrawer>
    <slot name="searchbar" v-if="props.searchDataKey">
-        <VnSearchbar
-            :data-key="props.searchDataKey"
-            :url="props.searchUrl"
-            :label="props.searchbarLabel"
-            :info="props.searchbarInfo"
-            :custom-route-redirect-name="searchCustomRouteRedirect"
-            :redirect="searchRedirect"
-        />
+        <VnSearchbar :data-key="props.searchDataKey" v-bind="props.searchbarProps" />
    </slot>
-    <slot v-else name="searchbar" />
    <RightMenu>
        <template #right-panel v-if="props.filterPanel">
-            <component :is="props.filterPanel" :data-key="props.searchDataKey" />
+            <component :is="props.filterPanel" :data-key="searchRightDataKey" />
        </template>
    </RightMenu>
    <QPageContainer>
        <QPage>
            <VnSubToolbar />
            <div :class="[useCardSize(), $attrs.class]">
-                <RouterView />
+                <RouterView :key="route.fullPath" />
            </div>
        </QPage>
    </QPageContainer>
--- a/src/components/common/VnComponent.vue
+++ b/src/components/common/VnComponent.vue
@ -17,15 +17,17 @@ const $props = defineProps({
    },
 });

+let mixed;
 const componentArray = computed(() => {
    if (typeof $props.prop === 'object') return [$props.prop];
    return $props.prop;
 });

 function mix(toComponent) {
+    if (mixed) return mixed;
    const { component, attrs, event } = toComponent;
    const customComponent = $props.components[component];
-    return {
+    mixed = {
        component: customComponent?.component ?? component,
        attrs: {
            ...toValueAttrs(attrs),
@ -33,8 +35,9 @@ function mix(toComponent) {
            ...toComponent,
            ...toValueAttrs(customComponent?.forceAttrs),
        },
-        event: event ?? customComponent?.event,
+        event: { ...customComponent?.event, ...event },
    };
+    return mixed;
 }

 function toValueAttrs(attrs) {
--- a/src/components/common/VnCurrency.vue
+++ b/src/components/common/VnCurrency.vue
@ -1,34 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useCapitalize } from 'src/composables/useCapitalize';
-import VnInput from 'src/components/common/VnInput.vue';
-
-const props = defineProps({
-    modelValue: { type: [String, Number], default: '' },
-});
-
-const { t } = useI18n();
-const emit = defineEmits(['update:modelValue']);
-
-const amount = computed({
-    get() {
-        return props.modelValue;
-    },
-    set(val) {
-        emit('update:modelValue', val);
-    },
-});
-</script>
-<template>
-    <VnInput
-        v-model="amount"
-        type="number"
-        step="any"
-        :label="useCapitalize(t('amount'))"
-    />
-</template>
-<i18n>
-es:
-    amount: importe
-</i18n>
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@ -135,6 +135,7 @@ const columns = computed(() => [
        field: 'hasFile',
        label: t('globals.original'),
        name: 'hasFile',
+        toolTip: t('The documentation is available in paper form'),
        component: QCheckbox,
        props: (prop) => ({
            disable: true,
@ -297,6 +298,14 @@ defineExpose({
                row-key="clientFk"
                :grid="$q.screen.lt.sm"
            >
+                <template #header="props">
+                    <QTr :props="props" class="bg">
+                        <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                            <QTooltip v-if="col.toolTip">{{ col.toolTip }}</QTooltip
+                            >{{ col.label }}
+                        </QTh>
+                    </QTr>
+                </template>
                <template #body-cell="props">
                    <QTd :props="props">
                        <QTr :props="props">
@ -397,8 +406,10 @@ defineExpose({
 <i18n>
 en:
    contentTypesInfo: Allowed file types {allowedContentTypes}
+    The documentation is available in paper form: The documentation is available in paper form
 es:
    contentTypesInfo: Tipos de archivo permitidos {allowedContentTypes}
    Generate identifier for original file: Generar identificador para archivo original
    Upload file: Subir fichero
+    the documentation is available in paper form: Se tiene la documentación en papel
 </i18n>
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@ -1,6 +1,7 @@
 <script setup>
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useValidator } from 'src/composables/useValidator';

 const emit = defineEmits([
    'update:modelValue',
@ -27,9 +28,11 @@ const $props = defineProps({
        default: true,
    },
 });
+const { validations } = useValidator();

 const { t } = useI18n();
-const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
+
 const vnInputRef = ref(null);
 const value = computed({
    get() {
@ -57,21 +60,22 @@ const focus = () => {
 defineExpose({
    focus,
 });
+import { useAttrs } from 'vue';
+const $attrs = useAttrs();

-const inputRules = [
+const mixinRules = [
+    requiredFieldRule,
+    ...($attrs.rules ?? []),
    (val) => {
        const { min } = vnInputRef.value.$attrs;
+        if (!min) return null;
        if (min >= 0) if (Math.floor(val) < min) return t('inputMin', { value: min });
    },
 ];
 </script>

 <template>
-    <div
-        @mouseover="hover = true"
-        @mouseleave="hover = false"
-        :rules="$attrs.required ? [requiredFieldRule] : null"
-    >
+    <div @mouseover="hover = true" @mouseleave="hover = false">
        <QInput
            ref="vnInputRef"
            v-model="value"
@ -80,7 +84,7 @@ const inputRules = [
            :class="{ required: $attrs.required }"
            @keyup.enter="emit('keyup.enter')"
            :clearable="false"
-            :rules="inputRules"
+            :rules="mixinRules"
            :lazy-rules="true"
            hide-bottom-space
        >
@ -88,7 +92,6 @@ const inputRules = [
                <slot name="prepend" />
            </template>
            <template #append>
-                <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                <QIcon
                    name="close"
                    size="xs"
@ -100,6 +103,7 @@ const inputRules = [
                        }
                    "
                ></QIcon>
+                <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                <QIcon v-if="info" name="info">
                    <QTooltip max-width="350px">
                        {{ info }}
@ -115,3 +119,8 @@ const inputRules = [
    es:
        inputMin: Debe ser mayor a {value}
 </i18n>
+<style lang="scss">
+.q-field__append {
+    padding-inline: 0;
+}
+</style>
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@ -3,12 +3,16 @@ import { onMounted, watch, computed, ref } from 'vue';
 import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';

-const model = defineModel({ type: String });
+const model = defineModel({ type: [String, Date] });
 const $props = defineProps({
    isOutlined: {
        type: Boolean,
        default: false,
    },
+    showEvent: {
+        type: Boolean,
+        default: true,
+    },
 });

 const { t } = useI18n();
@ -94,6 +98,7 @@ watch(
            :class="{ required: $attrs.required }"
            :rules="$attrs.required ? [requiredFieldRule] : null"
            :clearable="false"
+            @click="isPopupOpen = true"
        >
            <template #append>
                <QIcon
@ -111,6 +116,7 @@ watch(
                    "
                />
                <QIcon
+                    v-if="showEvent"
                    name="event"
                    class="cursor-pointer"
                    @click="isPopupOpen = !isPopupOpen"
@ -130,6 +136,7 @@ watch(
                    v-model="popupDate"
                    :landscape="true"
                    :today-btn="true"
+                    :options="$attrs.options"
                    @update:model-value="
                        (date) => {
                            formattedDate = date;
--- a/src/components/common/VnInputNumber.vue
+++ b/src/components/common/VnInputNumber.vue
@ -0,0 +1,8 @@
+<script setup>
+import VnInput from 'src/components/common/VnInput.vue';
+const model = defineModel({ type: [Number, String] });
+</script>
+
+<template>
+    <VnInput v-bind="$attrs" v-model.number="model" type="number" />
+</template>
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@ -1,5 +1,5 @@
 <script setup>
-import { watch, computed, ref, nextTick } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';

@ -14,13 +14,13 @@ const props = defineProps({
        default: false,
    },
 });
+const initialDate = ref(model.value ?? Date.vnNew());
 const { t } = useI18n();
 const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');

 const dateFormat = 'HH:mm';
 const isPopupOpen = ref();
 const hover = ref();
-const inputRef = ref();

 const styleAttrs = computed(() => {
    return props.isOutlined
@ -50,7 +50,8 @@ const formattedTime = computed({
            }
            if (!props.timeOnly) {
                const [hh, mm] = time.split(':');
-                const date = model.value ?? Date.vnNew();
+
+                const date = new Date(model.value ? model.value : initialDate.value);
                date.setHours(hh, mm, 0);
                time = date?.toISOString();
            }
@ -62,37 +63,10 @@ const formattedTime = computed({
 function dateToTime(newDate) {
    return date.formatDate(new Date(newDate), dateFormat);
 }
-const timeField = ref();
-watch(
-    () => model.value,
-    (val) => (formattedTime.value = val),
-    { immediate: true }
-);
-
-watch(
-    () => formattedTime.value,
-    async (val) => {
-        let position = 3;
-        const input = inputRef.value?.getNativeElement();
-        if (!val || !input) return;
-
-        let [hh, mm] = val.split(':');
-        hh = parseInt(hh);
-        if (hh >= 10 || mm != '00') return;
-
-        await nextTick();
-        await nextTick();
-        if (!hh) position = 0;
-        input.setSelectionRange(position, position);
-    },
-    { immediate: true }
-);
 </script>
-
 <template>
    <div @mouseover="hover = true" @mouseleave="hover = false">
        <QInput
-            ref="inputRef"
            class="vn-input-time"
            mask="##:##"
            placeholder="--:--"
@ -102,7 +76,7 @@ watch(
            style="min-width: 100px"
            :rules="$attrs.required ? [requiredFieldRule] : null"
            @click="isPopupOpen = false"
-            @focus="inputRef.getNativeElement().setSelectionRange(0, 0)"
+            type="time"
        >
            <template #append>
                <QIcon
@ -149,8 +123,12 @@ watch(
    border-style: solid;
 }
 </style>
+<style lang="scss" scoped>
+:deep(input[type='time']::-webkit-calendar-picker-indicator) {
+    display: none;
+}
+</style>
 <i18n>
    es:
        Open time: Abrir tiempo
 </i18n>
-, nextTick
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@ -1,123 +1,33 @@
 <script setup>
-import { ref, toRefs, computed, watch, onMounted } from 'vue';
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
-import FetchData from 'components/FetchData.vue';
-const emit = defineEmits(['update:modelValue', 'update:options']);
 import { useI18n } from 'vue-i18n';

 const { t } = useI18n();
-const postcodesOptions = ref([]);
-const postcodesRef = ref(null);
-
-const $props = defineProps({
-    modelValue: {
-        type: [String, Number, Object],
-        default: null,
-    },
-    options: {
-        type: Array,
-        default: () => [],
-    },
-    optionLabel: {
-        type: String,
-        default: '',
-    },
-    optionValue: {
-        type: String,
-        default: '',
-    },
-    filterOptions: {
-        type: Array,
-        default: () => [],
-    },
-    isClearable: {
-        type: Boolean,
-        default: true,
-    },
-    defaultFilter: {
-        type: Boolean,
-        default: true,
-    },
-});
-
-const { options } = toRefs($props);
-const myOptions = ref([]);
-const myOptionsOriginal = ref([]);
-
-const value = computed({
-    get() {
-        return $props.modelValue;
-    },
-    set(value) {
-        emit(
-            'update:modelValue',
-            postcodesOptions.value.find((p) => p.code === value)
-        );
-    },
-});
-
-onMounted(() => {
-    locationFilter($props.modelValue);
-});
-
-function setOptions(data) {
-    myOptions.value = JSON.parse(JSON.stringify(data));
-    myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
-}
-setOptions(options.value);
-
-watch(options, (newValue) => {
-    setOptions(newValue);
-});
+const value = defineModel({ type: [String, Number, Object] });

 function showLabel(data) {
    return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
-
-function locationFilter(search = '') {
-    if (
-        search &&
-        (search.includes('undefined') || search.startsWith(`${$props.modelValue} - `))
-    )
-        return;
-    let where = { search };
-    postcodesRef.value.fetch({ filter: { where }, limit: 30 });
-}
-
-function handleFetch(data) {
-    postcodesOptions.value = data;
-}
-function onDataSaved(newPostcode) {
-    postcodesOptions.value.push(newPostcode);
-    value.value = newPostcode.code;
-}
 </script>
 <template>
-    <FetchData
-        ref="postcodesRef"
-        url="Postcodes/filter"
-        @on-fetch="(data) => handleFetch(data)"
-    />
    <VnSelectDialog
-        v-if="postcodesRef"
-        :option-label="(opt) => showLabel(opt) ?? 'code'"
-        :option-value="(opt) => opt.code"
        v-model="value"
-        :options="postcodesOptions"
+        option-value="code"
+        option-filter-value="search"
+        :option-label="(opt) => showLabel(opt)"
+        url="Postcodes/filter"
+        :use-like="false"
        :label="t('Location')"
        :placeholder="t('search_by_postalcode')"
-        @input-value="locationFilter"
-        :default-filter="false"
        :input-debounce="300"
        :class="{ required: $attrs.required }"
        v-bind="$attrs"
        clearable
+        :emit-value="false"
    >
        <template #form>
-            <CreateNewPostcode
-                @on-data-saved="onDataSaved"
-            />
+            <CreateNewPostcode @on-data-saved="(newValue) => (value = newValue)" />
        </template>
        <template #option="{ itemProps, opt }">
            <QItem v-bind="itemProps">
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@ -1,7 +1,7 @@
 <script setup>
-import { ref, onUnmounted } from 'vue';
+import { ref, onUnmounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import axios from 'axios';
 import { date } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
@ -14,11 +14,13 @@ import VnJsonValue from '../common/VnJsonValue.vue';
 import FetchData from '../FetchData.vue';
 import VnSelect from './VnSelect.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
+import VnPaginate from '../ui/VnPaginate.vue';

 const stateStore = useStateStore();
 const validationsStore = useValidator();
 const { models } = validationsStore;
 const route = useRoute();
+const router = useRouter();
 const { t } = useI18n();
 const props = defineProps({
    model: {
@ -65,9 +67,10 @@ const filter = {
            },
        },
    ],
+    where: { and: [{ originFk: route.params.id }] },
 };

-const workers = ref();
+const paginate = ref();
 const actions = ref();
 const changeInput = ref();
 const searchInput = ref();
@ -213,7 +216,7 @@ function getLogTree(data) {
        }
        nLogs++;
        modelLog.logs.push(log);
-
+        modelLog.summaryId = modelLog.logs[0].summaryId;
        // Changes
        const notDelete = log.action != 'delete';
        const olds = (notDelete ? log.oldInstance : null) || {};
@ -234,9 +237,7 @@ async function openPointRecord(id, modelLog) {
    const locale = validations[modelLog.model]?.locale || {};
    pointRecord.value = parseProps(propNames, locale, data);
 }
-async function setLogTree() {
-    filter.where = { and: [{ originFk: route.params.id }] };
-    const { data } = await getLogs(filter);
+async function setLogTree(data) {
    logTree.value = getLogTree(data);
 }

@ -265,15 +266,7 @@ async function applyFilter() {
        filter.where.and.push(selectedFilters.value);
    }

-    const { data } = await getLogs(filter);
-
-    logTree.value = getLogTree(data);
-}
-
-async function getLogs(filter) {
-    return axios.get(props.url ?? `${props.model}Logs`, {
-        params: { filter: JSON.stringify(filter) },
-    });
+    paginate.value.fetch(filter);
 }

 function setDate(type) {
@ -376,37 +369,45 @@ async function clearFilter() {
    await applyFilter();
 }

-setLogTree();
-
 onUnmounted(() => {
    stateStore.rightDrawer = false;
 });
+
+watch(
+    () => router.currentRoute.value.params.id,
+    () => {
+        applyFilter();
+    }
+);
 </script>
 <template>
-    <FetchData
-        :url="`${props.model}Logs/${route.params.id}/editors`"
-        :filter="{
-            fields: ['id', 'nickname', 'name', 'image'],
-            order: 'nickname',
-            limit: 30,
-        }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
    <FetchData
        :url="`${props.model}Logs/${route.params.id}/models`"
        :filter="{ order: ['changedModel'] }"
        @on-fetch="
            (data) =>
                (actions = data.map((item) => {
+                    const changedModel = item.changedModel;
                    return {
-                        locale: useCapitalize(validations[item.changedModel].locale.name),
-                        value: item.changedModel,
+                        locale: useCapitalize(
+                            validations[changedModel]?.locale?.name ?? changedModel
+                        ),
+                        value: changedModel,
                    };
                }))
        "
        auto-load
    />
+    <VnPaginate
+        ref="paginate"
+        :data-key="`${model}Log`"
+        :url="`${model}Logs`"
+        :filter="filter"
+        :skeleton="false"
+        auto-load
+        @on-fetch="setLogTree"
+    >
+        <template #body>
            <div
                class="column items-center logs origin-log q-mt-md"
                v-for="(originLog, originLogIndex) in logTree"
@ -454,8 +455,10 @@ onUnmounted(() => {
                                        size="md"
                                        class="model-name q-mr-xs text-white"
                                        v-if="
-                                    !(modelLog.changedModel && modelLog.changedModelId) &&
-                                    modelLog.model
+                                            !(
+                                                modelLog.changedModel &&
+                                                modelLog.changedModelId
+                                            ) && modelLog.model
                                        "
                                        :style="{
                                            backgroundColor: useColor(modelLog.model),
@ -464,12 +467,17 @@ onUnmounted(() => {
                                    >
                                        {{ t(modelLog.modelI18n) }}
                                    </QChip>
-                            <span class="model-id" v-if="modelLog.summaryId"
-                                >#{{ modelLog.summaryId }}</span
-                            >
-                            <span class="model-value" :title="modelLog.showValue">
-                                {{ modelLog.showValue }}
-                            </span>
+
+                                    <span
+                                        class="model-id q-mr-xs"
+                                        v-if="modelLog.summaryId"
+                                        v-text="`#${modelLog.summaryId}`"
+                                    />
+                                    <span
+                                        class="model-value"
+                                        :title="modelLog.showValue"
+                                        v-text="modelLog.showValue"
+                                    />
                                    <QBtn
                                        flat
                                        round
@ -524,7 +532,9 @@ onUnmounted(() => {
                                                            >
                                                                {{ modelLog.modelI18n }}
                                                                <span v-if="modelLog.id"
-                                                            >#{{ modelLog.id }}</span
+                                                                    >#{{
+                                                                        modelLog.id
+                                                                    }}</span
                                                                >
                                                            </div>
                                                            <QCardSection
@ -539,12 +549,18 @@ onUnmounted(() => {
                                                                >
                                                                    <span
                                                                        class="json-field q-mr-xs text-grey"
-                                                                :title="value.name"
+                                                                        :title="
+                                                                            value.name
+                                                                        "
                                                                    >
-                                                                {{ value.nameI18n }}:
+                                                                        {{
+                                                                            value.nameI18n
+                                                                        }}:
                                                                    </span>
                                                                    <VnJsonValue
-                                                                :value="value.val.val"
+                                                                        :value="
+                                                                            value.val.val
+                                                                        "
                                                                    />
                                                                </QItem>
                                                            </QCardSection>
@ -556,7 +572,11 @@ onUnmounted(() => {
                                                    :class="actionsClass[log.action]"
                                                    :name="actionsIcon[log.action]"
                                                    :title="
-                                                t(`actions.${actionsText[log.action]}`)
+                                                        t(
+                                                            `actions.${
+                                                                actionsText[log.action]
+                                                            }`
+                                                        )
                                                    "
                                                />
                                            </div>
@ -576,17 +596,27 @@ onUnmounted(() => {
                                            @click="log.expand = !log.expand"
                                        />
                                        <span v-if="log.props.length" class="attributes">
-                                    <span v-if="!log.expand" class="q-pa-none text-grey">
+                                            <span
+                                                v-if="!log.expand"
+                                                class="q-pa-none text-grey"
+                                            >
                                                <span
                                                    v-for="(prop, propIndex) in log.props"
                                                    :key="propIndex"
                                                    class="basic-json"
                                                >
-                                            <span class="json-field" :title="prop.name">
+                                                    <span
+                                                        class="json-field"
+                                                        :title="prop.name"
+                                                    >
                                                        {{ prop.nameI18n }}:
                                                    </span>
                                                    <VnJsonValue :value="prop.val.val" />
-                                            <span v-if="propIndex < log.props.length - 1"
+                                                    <span
+                                                        v-if="
+                                                            propIndex <
+                                                            log.props.length - 1
+                                                        "
                                                        >,&nbsp;
                                                    </span>
                                                </span>
@ -596,28 +626,44 @@ onUnmounted(() => {
                                                class="expanded-json column q-pa-none"
                                            >
                                                <div
-                                            v-for="(prop, prop2Index) in log.props"
+                                                    v-for="(
+                                                        prop, prop2Index
+                                                    ) in log.props"
                                                    :key="prop2Index"
                                                    class="q-pa-none text-grey"
                                                >
-                                            <span class="json-field" :title="prop.name">
+                                                    <span
+                                                        class="json-field"
+                                                        :title="prop.name"
+                                                    >
                                                        {{ prop.nameI18n }}:
                                                    </span>
                                                    <VnJsonValue :value="prop.val.val" />
-                                            <span v-if="prop.val.id" class="id-value">
+                                                    <span
+                                                        v-if="prop.val.id"
+                                                        class="id-value"
+                                                    >
                                                        #{{ prop.val.id }}
                                                    </span>
                                                    <span v-if="log.action == 'update'">
                                                        ←
-                                                <VnJsonValue :value="prop.old.val" />
-                                                <span v-if="prop.old.id" class="id-value">
+                                                        <VnJsonValue
+                                                            :value="prop.old.val"
+                                                        />
+                                                        <span
+                                                            v-if="prop.old.id"
+                                                            class="id-value"
+                                                        >
                                                            #{{ prop.old.id }}
                                                        </span>
                                                    </span>
                                                </div>
                                            </span>
                                        </span>
-                                <span v-if="!log.props.length" class="description">
+                                        <span
+                                            v-if="!log.props.length"
+                                            class="description"
+                                        >
                                            {{ log.description }}
                                        </span>
                                    </QCardSection>
@ -627,6 +673,8 @@ onUnmounted(() => {
                    </QList>
                </div>
            </div>
+        </template>
+    </VnPaginate>
    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
        <QList dense>
            <QSeparator />
@ -675,17 +723,16 @@ onUnmounted(() => {
                </QOptionGroup>
            </QItem>
            <QItem class="q-mt-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers && userRadio !== null">
+                <QItemSection v-if="userRadio !== null">
                    <VnSelect
                        class="full-width"
                        :label="t('globals.user')"
                        v-model="userSelect"
                        option-label="name"
                        option-value="id"
-                        :options="workers"
+                        :url="`${model}Logs/${$route.params.id}/editors`"
+                        :fields="['id', 'nickname', 'name', 'image']"
+                        sort-by="nickname"
                        @update:model-value="selectFilter('userSelect')"
                        hide-selected
                    >
--- a/src/components/common/VnSectionMain.vue
+++ b/src/components/common/VnSectionMain.vue
@ -1,8 +1,16 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import LeftMenu from 'components/LeftMenu.vue';
+import { onMounted } from 'vue';

 const stateStore = useStateStore();
+const $props = defineProps({
+    leftDrawer: {
+        type: Boolean,
+        default: true,
+    },
+});
+onMounted(() => (stateStore.leftDrawer = $props.leftDrawer));
 </script>

 <template>
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@ -2,7 +2,7 @@
 import { ref, toRefs, computed, watch, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'src/components/FetchData.vue';
-const emit = defineEmits(['update:modelValue', 'update:options']);
+const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);

 const $props = defineProps({
    modelValue: {
@ -25,9 +25,13 @@ const $props = defineProps({
        type: String,
        default: null,
    },
+    optionFilterValue: {
+        type: String,
+        default: null,
+    },
    url: {
        type: String,
-        default: '',
+        default: null,
    },
    filterOptions: {
        type: [Array],
@ -45,6 +49,10 @@ const $props = defineProps({
        type: Array,
        default: null,
    },
+    include: {
+        type: [Object, Array],
+        default: null,
+    },
    where: {
        type: Object,
        default: null,
@ -69,23 +77,38 @@ const $props = defineProps({
        type: Boolean,
        default: true,
    },
+    params: {
+        type: Object,
+        default: null,
+    },
+    noOne: {
+        type: Boolean,
+        default: false,
+    },
 });

 const { t } = useI18n();
 const requiredFieldRule = (val) => val ?? t('globals.fieldRequired');

-const { optionLabel, optionValue, optionFilter, options, modelValue } = toRefs($props);
+const { optionLabel, optionValue, optionFilter, optionFilterValue, options, modelValue } =
+    toRefs($props);
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
 const dataRef = ref();
 const lastVal = ref();
+const noOneText = t('globals.noOne');
+const noOneOpt = ref({
+    [optionValue.value]: false,
+    [optionLabel.value]: noOneText,
+});

 const value = computed({
    get() {
        return $props.modelValue;
    },
    set(value) {
+        setOptions(myOptionsOriginal.value);
        emit('update:modelValue', value);
    },
 });
@ -94,9 +117,11 @@ watch(options, (newValue) => {
    setOptions(newValue);
 });

-watch(modelValue, (newValue) => {
+watch(modelValue, async (newValue) => {
    if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
-        fetchFilter(newValue);
+        await fetchFilter(newValue);
+
+    if ($props.noOne) myOptions.value.unshift(noOneOpt.value);
 });

 onMounted(() => {
@ -117,7 +142,7 @@ function setOptions(data) {
 }

 function filter(val, options) {
-    const search = val.toString().toLowerCase();
+    const search = val?.toString()?.toLowerCase();

    if (!search) return options;

@ -140,17 +165,26 @@ function filter(val, options) {
 async function fetchFilter(val) {
    if (!$props.url || !dataRef.value) return;

-    const { fields, sortBy, limit } = $props;
-    let key = optionFilter.value ?? optionLabel.value;
+    const { fields, include, sortBy, limit } = $props;
+    const key =
+        optionFilterValue.value ??
+        (new RegExp(/\d/g).test(val)
+            ? optionValue.value
+            : optionFilter.value ?? optionLabel.value);

-    if (new RegExp(/\d/g).test(val)) key = optionValue.value;
-
-    const defaultWhere = $props.useLike
-        ? { [key]: { like: `%${val}%` } }
-        : { [key]: val };
+    let defaultWhere = {};
+    if ($props.filterOptions.length) {
+        defaultWhere = $props.filterOptions.reduce((obj, prop) => {
+            if (!obj.or) obj.or = [];
+            obj.or.push({ [prop]: getVal(val) });
+            return obj;
+        }, {});
+    } else defaultWhere = { [key]: getVal(val) };
    const where = { ...(val ? defaultWhere : {}), ...$props.where };
-    const fetchOptions = { where, order: sortBy, limit };
+    const fetchOptions = { where, include, limit };
    if (fields) fetchOptions.fields = fields;
+    if (sortBy) fetchOptions.order = sortBy;
+
    return dataRef.value.fetch(fetchOptions);
 }

@ -163,11 +197,17 @@ async function filterHandler(val, update) {
    let newOptions;

    if (!$props.defaultFilter) return update();
-    if ($props.url) {
+    if (
+        $props.url &&
+        ($props.limit || (!$props.limit && Object.keys(myOptions.value).length === 0))
+    ) {
        newOptions = await fetchFilter(val);
    } else newOptions = filter(val, myOptionsOriginal.value);
    update(
        () => {
+            if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
+                newOptions.unshift(noOneOpt.value);
+
            myOptions.value = newOptions;
        },
        (ref) => {
@ -178,6 +218,12 @@ async function filterHandler(val, update) {
        }
    );
 }
+
+function nullishToTrue(value) {
+    return value ?? true;
+}
+
+const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 </script>

 <template>
@ -189,6 +235,7 @@ async function filterHandler(val, update) {
        :limit="limit"
        :sort-by="sortBy"
        :fields="fields"
+        :params="params"
    />
    <QSelect
        v-model="value"
@ -196,12 +243,12 @@ async function filterHandler(val, update) {
        :option-label="optionLabel"
        :option-value="optionValue"
        v-bind="$attrs"
-        emit-value
-        map-options
-        use-input
        @filter="filterHandler"
-        hide-selected
-        fill-input
+        :emit-value="nullishToTrue($attrs['emit-value'])"
+        :map-options="nullishToTrue($attrs['map-options'])"
+        :use-input="nullishToTrue($attrs['use-input'])"
+        :hide-selected="nullishToTrue($attrs['hide-selected'])"
+        :fill-input="nullishToTrue($attrs['fill-input'])"
        ref="vnSelectRef"
        lazy-rules
        :class="{ required: $attrs.required }"
@ -212,7 +259,12 @@ async function filterHandler(val, update) {
            <QIcon
                v-show="value"
                name="close"
-                @click.stop="value = null"
+                @click.stop="
+                    () => {
+                        value = null;
+                        emit('remove');
+                    }
+                "
                class="cursor-pointer"
                size="xs"
            />
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@ -1,25 +1,21 @@
 <script setup>
 import { ref, computed } from 'vue';
+import { useRole } from 'src/composables/useRole';
+import { useAcl } from 'src/composables/useAcl';

 import VnSelect from 'src/components/common/VnSelect.vue';
-
-import { useRole } from 'src/composables/useRole';
-
 const emit = defineEmits(['update:modelValue']);

+const value = defineModel({ type: [String, Number, Object] });
 const $props = defineProps({
-    modelValue: {
-        type: [String, Number, Object],
-        default: null,
-    },
-    options: {
-        type: Array,
-        default: () => [],
-    },
    rolesAllowedToCreate: {
        type: Array,
        default: () => ['developer'],
    },
+    acls: {
+        type: Array,
+        default: () => [],
+    },
    actionIcon: {
        type: String,
        default: 'add',
@ -31,31 +27,24 @@ const $props = defineProps({
 });

 const role = useRole();
+const acl = useAcl();
 const showForm = ref(false);

-const value = computed({
-    get() {
-        return $props.modelValue;
-    },
-    set(value) {
-        emit('update:modelValue', value);
-    },
-});
-
 const isAllowedToCreate = computed(() => {
+    if ($props.acls.length) return acl.hasAny($props.acls);
    return role.hasAny($props.rolesAllowedToCreate);
 });
-
-const toggleForm = () => {
-    showForm.value = !showForm.value;
-};
 </script>

 <template>
-    <VnSelect v-model="value" :options="options" v-bind="$attrs">
+    <VnSelect
+        v-model="value"
+        v-bind="$attrs"
+        @update:model-value="(...args) => emit('update:modelValue', ...args)"
+    >
        <template v-if="isAllowedToCreate" #append>
            <QIcon
-                @click.stop.prevent="toggleForm()"
+                @click.stop.prevent="$refs.dialog.show()"
                :name="actionIcon"
                :size="actionIcon === 'add' ? 'xs' : 'sm'"
                :class="['default-icon', { '--add-icon': actionIcon === 'add' }]"
@ -65,7 +54,7 @@ const toggleForm = () => {
            >
                <QTooltip v-if="tooltip">{{ tooltip }}</QTooltip>
            </QIcon>
-            <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
+            <QDialog ref="dialog" transition-show="scale" transition-hide="scale">
                <slot name="form" />
            </QDialog>
        </template>
--- a/src/components/common/VnTitle.vue
+++ b/src/components/common/VnTitle.vue
@ -7,7 +7,7 @@ defineProps({
 </script>
 <template>
    <div :class="$q.screen.gt.md ? 'q-pb-lg' : 'q-pb-md'">
-        <div class="header-link">
+        <div class="header-link" :style="{ cursor: url ? 'pointer' : 'default' }">
            <a :href="url" :class="url ? 'link' : 'color-vn-text'">
                {{ text }}
                <QIcon v-if="url" :name="icon" />
--- a/src/components/ui/CatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@ -31,7 +31,7 @@ const dialog = ref(null);
    <div class="container order-catalog-item overflow-hidden">
        <QCard class="card shadow-6">
            <div class="img-wrapper">
-                <VnImg :id="item.id" zoom-size="lg" class="image" />
+                <VnImg :id="item.id" class="image" />
                <div v-if="item.hex && isCatalog" class="item-color-container">
                    <div
                        class="item-color"
--- a/src/components/ui/FetchedTags.vue
+++ b/src/components/ui/FetchedTags.vue
@ -2,10 +2,6 @@
 import { computed } from 'vue';

 const $props = defineProps({
-    maxLength: {
-        type: Number,
-        required: true,
-    },
    item: {
        type: Object,
        required: true,
--- a/src/components/ui/QCalendarMonthWrapper.vue
+++ b/src/components/ui/QCalendarMonthWrapper.vue
@ -73,8 +73,7 @@ const containerClasses = computed(() => {
 .q-calendar-month__head--workweek,
 .q-calendar-month__head--weekday,
 // .q-calendar-month__workweek.q-past-day,
-.q-calendar-month__week :nth-child(6),
-:nth-child(7) {
+.q-calendar-month__week :nth-child(n+6):nth-child(-n+7) {
    color: var(--vn-label-color);
 }

--- a/src/components/ui/VnAvatar.vue
+++ b/src/components/ui/VnAvatar.vue
@ -1,45 +1,62 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useSession } from 'src/composables/useSession';
 import { useColor } from 'src/composables/useColor';
+import { getCssVar } from 'quasar';

 const $props = defineProps({
    workerId: { type: Number, required: true },
    description: { type: String, default: null },
-    size: { type: String, default: null },
    title: { type: String, default: null },
+    color: { type: String, default: null },
 });
+
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 const { t } = useI18n();

-const title = computed(() => $props.title ?? t('globals.system'));
+const src = computed(
+    () => `/api/Images/user/160x160/${$props.workerId}/download?access_token=${token}`
+);
+const title = computed(() => $props.title?.toUpperCase() || t('globals.system'));
 const showLetter = ref(false);
+const backgroundColor = computed(() => {
+    const color = $props.color || useColor(title.value);
+    return getCssVar(color) || color;
+});
+
+watch(src, () => (showLetter.value = false));
 </script>
 <template>
-    <div class="avatar-picture column items-center">
+    <div class="column items-center">
        <QAvatar
-            :style="{
-                backgroundColor: useColor(title),
-            }"
-            :size="$props.size"
-            :title="title"
+            :style="{ backgroundColor }"
+            v-bind="$attrs"
+            :title="title || t('globals.system')"
        >
-            <template v-if="showLetter">{{ title.charAt(0) }}</template>
-            <QImg
-                v-else
-                :src="`/api/Images/user/160x160/${$props.workerId}/download?access_token=${token}`"
-                spinner-color="white"
-                @error="showLetter = true"
-            />
+            <template v-if="showLetter">
+                {{ title.charAt(0) }}
+            </template>
+            <QImg v-else :src="src" spinner-color="white" @error="showLetter = true" />
        </QAvatar>
        <div class="description">
-            <slot name="description" v-if="$props.description">
-                <p>
-                    {{ $props.description }}
-                </p>
+            <slot name="description" v-if="description">
+                <p v-text="description" />
            </slot>
        </div>
    </div>
 </template>
+<style lang="scss" scoped>
+[size='xxl'] {
+    .q-avatar,
+    .q-img {
+        width: 80px;
+        height: 80px;
+    }
+
+    .q-img {
+        object-fit: cover;
+    }
+}
+</style>
--- a/src/components/ui/VnConfirm.vue
+++ b/src/components/ui/VnConfirm.vue
@ -15,7 +15,7 @@ const props = defineProps({
        default: null,
    },
    message: {
-        type: String,
+        type: [String, Boolean],
        default: null,
    },
    data: {
@ -35,7 +35,10 @@ defineEmits(['confirm', ...useDialogPluginComponent.emits]);
 const { dialogRef, onDialogOK } = useDialogPluginComponent();

 const title = props.title || t('Confirm');
-const message = props.message || t('Are you sure you want to continue?');
+const message =
+    props.message ||
+    (props.message !== false ? t('Are you sure you want to continue?') : false);
+
 const isLoading = ref(false);

 async function confirm() {
@ -61,12 +64,12 @@ async function confirm() {
                    size="xl"
                    v-if="icon"
                />
-                <span class="text-h6 text-grey">{{ title }}</span>
+                <span class="text-h6">{{ title }}</span>
                <QSpace />
                <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
            </QCardSection>
            <QCardSection class="row items-center">
-                <span id="spanHTML" v-html="message"></span>
+                <span id="spanHTML" v-if="message !== false" v-html="message" />
                <slot name="customHTML"></slot>
            </QCardSection>
            <QCardActions align="right">
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@ -24,7 +24,7 @@ const $props = defineProps({
        type: Boolean,
        default: true,
    },
-    unRemovableParams: {
+    unremovableParams: {
        type: Array,
        required: false,
        default: () => [],
@ -37,7 +37,7 @@ const $props = defineProps({
    },
    hiddenTags: {
        type: Array,
-        default: () => ['filter'],
+        default: () => ['filter', 'search', 'or', 'and'],
    },
    customTags: {
        type: Array,
@ -57,7 +57,7 @@ const $props = defineProps({
    },
 });

-defineExpose({ search });
+defineExpose({ search, sanitizer });
 const emit = defineEmits([
    'update:modelValue',
    'refresh',
@ -65,6 +65,7 @@ const emit = defineEmits([
    'search',
    'init',
    'remove',
+    'setUserParams',
 ]);

 const arrayData = useArrayData($props.dataKey, {
@ -81,22 +82,28 @@ onMounted(() => {
 });

 function setUserParams(watchedParams) {
-    if (!watchedParams) return;
+    if (!watchedParams || Object.keys(watchedParams).length == 0) return;

    if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
+    if (typeof watchedParams?.filter == 'string')
+        watchedParams.filter = JSON.parse(watchedParams.filter);
+
    watchedParams = { ...watchedParams, ...watchedParams.filter?.where };
+    const order = watchedParams.filter?.order;
+
    delete watchedParams.filter;
-    userParams.value = { ...userParams.value, ...watchedParams };
+    userParams.value = sanitizer(watchedParams);
+    emit('setUserParams', userParams.value, order);
 }

 watch(
    () => route.query[$props.searchUrl],
-    (val) => setUserParams(val)
+    (val, oldValue) => (val || oldValue) && setUserParams(val)
 );

 watch(
    () => arrayData.store.userParams,
-    (val) => setUserParams(val)
+    (val, oldValue) => (val || oldValue) && setUserParams(val)
 );

 watch(
@ -106,6 +113,7 @@ watch(

 const isLoading = ref(false);
 async function search(evt) {
+    try {
        if (evt && $props.disableSubmitEvent) return;

        store.filter.where = {};
@ -118,29 +126,20 @@ async function search(evt) {
        userParams.value = newParams;

        if (!$props.showAll && !Object.values(filter).length) store.data = [];
-
-    isLoading.value = false;
        emit('search');
-}
-
-async function reload() {
-    isLoading.value = true;
-    const params = Object.values(userParams.value).filter((param) => param);
-    store.skip = 0;
-    store.page = 1;
-    await arrayData.fetch({ append: false });
-    if (!$props.showAll && !params.length) store.data = [];
+    } finally {
        isLoading.value = false;
-    emit('refresh');
+    }
 }

 async function clearFilters() {
+    try {
        isLoading.value = true;
        store.userParamsChanged = true;
        arrayData.reset(['skip', 'filter.skip', 'page']);
        // Filtrar los params no removibles
        const removableFilters = Object.keys(userParams.value).filter((param) =>
-        $props.unRemovableParams.includes(param)
+            $props.unremovableParams.includes(param)
        );
        const newParams = {};
        // Conservar solo los params que no son removibles
@ -154,10 +153,11 @@ async function clearFilters() {
        if (!$props.showAll) {
            store.data = [];
        }
-
-    isLoading.value = false;
        emit('clear');
        emit('update:modelValue', userParams.value);
+    } finally {
+        isLoading.value = false;
+    }
 }

 const tagsList = computed(() => {
@ -171,10 +171,10 @@ const tagsList = computed(() => {
 });

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

 async function remove(key) {
@ -190,6 +190,16 @@ function formatValue(value) {

    return `"${value}"`;
 }
+
+function sanitizer(params) {
+    for (const [key, value] of Object.entries(params)) {
+        if (value && typeof value === 'object') {
+            const param = Object.values(value)[0];
+            if (typeof param == 'string') params[key] = param.replaceAll('%', '');
+        }
+    }
+    return params;
+}
 </script>

 <template>
@ -210,7 +220,6 @@ function formatValue(value) {
                    </QItemLabel>
                </QItemSection>
                <QItemSection top side>
-                    <div class="q-gutter-xs">
                    <QBtn
                        @click="clearFilters"
                        color="primary"
@ -223,19 +232,6 @@ function formatValue(value) {
                    >
                        <QTooltip>{{ t('Remove filters') }}</QTooltip>
                    </QBtn>
-                        <QBtn
-                            @click="reload"
-                            color="primary"
-                            dense
-                            flat
-                            icon="refresh"
-                            padding="none"
-                            round
-                            size="sm"
-                        >
-                            <QTooltip>{{ t('Refresh') }}</QTooltip>
-                        </QBtn>
-                    </div>
                </QItemSection>
            </QItem>
            <QItem class="q-mb-sm">
@ -249,7 +245,7 @@ function formatValue(value) {
                    <VnFilterPanelChip
                        v-for="chip of tags"
                        :key="chip.label"
-                        :removable="!unRemovableParams.includes(chip.label)"
+                        :removable="!unremovableParams?.includes(chip.label)"
                        @remove="remove(chip.label)"
                    >
                        <slot name="tags" :tag="chip" :format-fn="formatValue">
@ -272,7 +268,7 @@ function formatValue(value) {
            <QSeparator />
        </QList>
        <QList dense class="list q-gutter-y-sm q-mt-sm">
-            <slot name="body" :params="userParams" :search-fn="search"></slot>
+            <slot name="body" :params="sanitizer(userParams)" :search-fn="search"></slot>
        </QList>
    </QForm>
    <QInnerLoading
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@ -1,6 +1,8 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref } from 'vue';
 import { useSession } from 'src/composables/useSession';
+import noImage from '/no-user.png';
+import { useRole } from 'src/composables/useRole';

 const $props = defineProps({
    storage: {
@ -11,14 +13,17 @@ const $props = defineProps({
        type: String,
        default: 'catalog',
    },
-    size: {
+    resolution: {
        type: String,
        default: '200x200',
    },
-    zoomSize: {
+    zoomResolution: {
        type: String,
-        required: false,
-        default: 'lg',
+        default: null,
+    },
+    zoom: {
+        type: Boolean,
+        default: true,
    },
    id: {
        type: Number,
@ -28,14 +33,16 @@ const $props = defineProps({
 const show = ref(false);
 const token = useSession().getTokenMultimedia();
 const timeStamp = ref(`timestamp=${Date.now()}`);
-import noImage from '/no-user.png';
-import { useRole } from 'src/composables/useRole';
-const url = computed(() => {
-    const isEmployee = useRole().isEmployee();
+const isEmployee = useRole().isEmployee();
+
+const getUrl = (zoom = false) => {
+    const curResolution = zoom
+        ? $props.zoomResolution || $props.resolution
+        : $props.resolution;
    return isEmployee
-        ? `/api/${$props.storage}/${$props.collection}/${$props.size}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
+        ? `/api/${$props.storage}/${$props.collection}/${curResolution}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
        : noImage;
-});
+};
 const reload = () => {
    timeStamp.value = `timestamp=${Date.now()}`;
 };
@ -45,23 +52,21 @@ defineExpose({
 </script>
 <template>
    <QImg
-        :class="{ zoomIn: $props.zoomSize }"
-        :src="url"
+        :class="{ zoomIn: zoom }"
+        :src="getUrl()"
        v-bind="$attrs"
-        @click="show = !show"
+        @click.stop="show = $props.zoom ? true : false"
        spinner-color="primary"
    />
-    <QDialog v-model="show" v-if="$props.zoomSize">
+    <QDialog v-if="$props.zoom" v-model="show">
        <QImg
-            :src="url"
-            size="full"
-            class="img_zoom"
+            :src="getUrl(true)"
            v-bind="$attrs"
            spinner-color="primary"
+            class="img_zoom"
        />
    </QDialog>
 </template>
-
 <style lang="scss" scoped>
 .q-img {
    &.zoomIn {
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@ -1,13 +1,18 @@
 <script setup>
-import VnAvatar from 'src/components/ui/VnAvatar.vue';
-import { toDateHourMin } from 'src/filters';
-import { ref } from 'vue';
 import axios from 'axios';
+import { ref } from 'vue';
+import { onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import VnPaginate from './VnPaginate.vue';
-import VnUserLink from '../ui/VnUserLink.vue';
+import { useQuasar } from 'quasar';
+
+import { toDateHourMin } from 'src/filters';
 import { useState } from 'src/composables/useState';

+import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnUserLink from 'components/ui/VnUserLink.vue';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import VnAvatar from 'components/ui/VnAvatar.vue';
+
 const $props = defineProps({
    url: { type: String, default: null },
    filter: { type: Object, default: () => {} },
@ -17,6 +22,7 @@ const $props = defineProps({

 const { t } = useI18n();
 const state = useState();
+const quasar = useQuasar();
 const currentUser = ref(state.getUser());
 const newNote = ref('');
 const vnPaginateRef = ref();
@ -28,11 +34,24 @@ function handleKeyUp(event) {
 }
 async function insert() {
    const body = $props.body;
-    Object.assign(body, { text: newNote.value });
-    await axios.post($props.url, body);
+    const newBody = { ...body, ...{ text: newNote.value } };
+    await axios.post($props.url, newBody);
    await vnPaginateRef.value.fetch();
    newNote.value = '';
 }
+
+onBeforeRouteLeave((to, from, next) => {
+    if (newNote.value)
+        quasar.dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('globals.unsavedPopup.title'),
+                message: t('globals.unsavedPopup.subtitle'),
+                promise: () => next(),
+            },
+        });
+    else next();
+});
 </script>
 <template>
    <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
--- a/src/components/ui/VnOutForm.vue
+++ b/src/components/ui/VnOutForm.vue
@ -0,0 +1,32 @@
+<script setup>
+const emit = defineEmits(['submit']);
+defineProps({
+    icon: { type: String, required: false, default: 'phonelink_lock' },
+    title: { type: String, required: true },
+});
+</script>
+<template>
+    <QForm @submit="emit('submit')" class="q-gutter-y-md q-pa-lg formCard">
+        <div class="column items-center">
+            <QIcon v-if="icon != false" :name="icon" size="xl" color="primary" />
+            <h5 class="text-center q-my-md">
+                {{ title }}
+            </h5>
+        </div>
+        <slot></slot>
+        <div class="q-mt-lg">
+            <slot name="buttons"></slot>
+        </div>
+    </QForm>
+</template>
+<style lang="scss" scoped>
+.formCard {
+    max-width: 350px;
+    min-width: 300px;
+}
+@media (max-width: $breakpoint-xs-max) {
+    .formCard {
+        min-width: 100%;
+    }
+}
+</style>
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@ -14,6 +14,10 @@ const props = defineProps({
        type: String,
        required: true,
    },
+    class: {
+        type: String,
+        default: '',
+    },
    autoLoad: {
        type: Boolean,
        default: false,
@ -119,8 +123,8 @@ watch(
 );

 watch(
-    () => props.url,
-    (url) => fetch({ url })
+    () => [props.url, props.filter, props.userParams],
+    ([url, filter, userParams]) => mounted.value && fetch({ url, filter, userParams })
 );

 const addFilter = async (filter, params) => {
@ -219,13 +223,13 @@ defineExpose({ fetch, addFilter, paginate });
        v-if="store.data"
        @load="onLoad"
        :offset="offset"
-        class="full-width"
+        :class="['full-width', props.class]"
        :disable="disableInfiniteScroll || !store.hasMoreData"
        v-bind="$attrs"
    >
        <slot name="body" :rows="store.data"></slot>
        <div v-if="isLoading" class="info-row q-pa-md text-center">
-            <QSpinner color="orange" size="md" />
+            <QSpinner color="primary" size="md" />
        </div>
    </QInfiniteScroll>
 </template>
--- a/src/components/ui/VnRow.vue
+++ b/src/components/ui/VnRow.vue
@ -1,18 +1,26 @@
+<script setup>
+defineProps({ wrap: { type: Boolean, default: false } });
+</script>
 <template>
    <div class="vn-row q-gutter-md q-mb-md">
-        <slot></slot>
+        <slot />
    </div>
 </template>
-<style lang="scss" scopped>
+<style lang="scss" scoped>
 .vn-row {
    display: flex;
-    > * {
+    > :deep(*) {
        flex: 1;
    }
+    &[wrap] {
+        flex-wrap: wrap;
+    }
 }
@media screen and (max-width: 800px) {
    .vn-row {
+        &:not(.wrap) {
            flex-direction: column;
        }
+    }
 }
 </style>
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@ -63,13 +63,13 @@ const props = defineProps({
        type: String,
        default: '',
    },
-    makeFetch: {
-        type: Boolean,
-        default: true,
+    whereFilter: {
+        type: Function,
+        default: undefined,
    },
 });

-const searchText = ref('');
+const searchText = ref();
 let arrayDataProps = { ...props };
 if (props.redirect)
    arrayDataProps = {
@ -100,18 +100,23 @@ onMounted(() => {
 });

 async function search() {
-    const staticParams = Object.entries(store.userParams).filter(
-        ([key, value]) => value && (props.staticParams || []).includes(key)
-    );
+    const staticParams = Object.entries(store.userParams);
    arrayData.reset(['skip', 'page']);

-    if (props.makeFetch)
-        await arrayData.applyFilter({
+    const filter = {
        params: {
            ...Object.fromEntries(staticParams),
            search: searchText.value,
        },
-        });
+    };
+
+    if (props.whereFilter) {
+        filter.filter = {
+            where: props.whereFilter(searchText.value),
+        };
+        delete filter.params.search;
+    }
+    await arrayData.applyFilter(filter);
 }
 </script>
 <template>
@ -119,7 +124,7 @@ async function search() {
        <QForm @submit="search" id="searchbarForm">
            <VnInput
                id="searchbar"
-                v-model="searchText"
+                v-model.trim="searchText"
                :placeholder="t(props.label)"
                dense
                standout
--- a/src/components/ui/VnSms.vue
+++ b/src/components/ui/VnSms.vue
@ -1,5 +1,5 @@
 <script setup>
-import { onBeforeMount } from 'vue';
+import { computed } from 'vue';
 import { date } from 'quasar';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnAvatar from '../ui/VnAvatar.vue';
@ -10,7 +10,8 @@ const $props = defineProps({
    where: { type: Object, default: () => {} },
 });

-const filter = {
+const filter = computed(() => {
+    return {
        fields: ['smsFk'],
        include: {
            relation: 'sms',
@ -32,9 +33,9 @@ const filter = {
                },
            },
        },
-};
-
-onBeforeMount(() => (filter.where = $props.where));
+        ...{ where: $props.where },
+    };
+});

 function formatNumber(number) {
    if (number.length <= 10) return number;
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@ -43,20 +43,9 @@ onBeforeUnmount(() => stateStore.toggleSubToolbar());
        </slot>
    </QToolbar>
 </template>
-<style lang="scss">
-.q-toolbar {
-    background: var(--vn-section-color);
-}
-</style>
 <style lang="scss" scoped>
 .sticky {
    position: sticky;
-    top: 61px;
    z-index: 1;
 }
-@media (max-width: $breakpoint-sm) {
-    .sticky {
-        top: 90px;
-    }
-}
 </style>
--- a/src/components/ui/VnUserLink.vue
+++ b/src/components/ui/VnUserLink.vue
@ -18,4 +18,3 @@ const { t } = useI18n();
    </slot>
    <WorkerDescriptorProxy v-if="$props.workerId" :id="$props.workerId" />
 </template>
-<style scoped></style>
--- a/src/composables/getDateQBadgeColor.js
+++ b/src/composables/getDateQBadgeColor.js
@ -7,5 +7,5 @@ export function getDateQBadgeColor(date) {
    let comparation = today - timeTicket;

    if (comparation == 0) return 'warning';
-    if (comparation < 0) return 'negative';
+    if (comparation < 0) return 'success';
 }
--- a/src/composables/getTotal.js
+++ b/src/composables/getTotal.js
@ -0,0 +1,10 @@
+import { toCurrency } from 'src/filters';
+
+export function getTotal(rows, key, opts = {}) {
+    const { currency, cb } = opts;
+    const total = rows.reduce((acc, row) => acc + +(cb ? cb(row) : row[key] || 0), 0);
+
+    return currency
+        ? toCurrency(total, currency == 'default' ? undefined : currency)
+        : total;
+}
--- a/src/composables/useAcl.js
+++ b/src/composables/useAcl.js
@ -16,14 +16,19 @@ export function useAcl() {
        state.setAcls(acls);
    }

-    function hasAny(model, prop, accessType) {
-        const acls = state.getAcls().value[model];
-        if (acls) 
-            return ['*', prop].some((key) => {
-                const acl = acls[key];
+    function hasAny(acls) {
+        for (const acl of acls) {
+            let { model, props, accessType } = acl;
+            const modelAcls = state.getAcls().value[model];
+            Array.isArray(props) || (props = [props]);
+            if (modelAcls)
+                return ['*', ...props].some((key) => {
+                    const acl = modelAcls[key];
                    return acl && (acl['*'] || acl[accessType]);
                });
        }
+        return false;
+    }

    return {
        fetch,
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@ -28,7 +28,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
            delete params.filter;
            store.userParams = { ...params, ...store.userParams };
            store.userFilter = { ...filter, ...store.userFilter };
-            if (filter.order) store.order = filter.order;
+            if (filter?.order) store.order = filter.order;
        }
    });

--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@ -3,12 +3,14 @@ import { useRole } from './useRole';
 import { useAcl } from './useAcl';
 import { useUserConfig } from './useUserConfig';
 import axios from 'axios';
+import { useRouter } from 'vue-router';
 import useNotify from './useNotify';
 import { useTokenConfig } from './useTokenConfig';
 const TOKEN_MULTIMEDIA = 'tokenMultimedia';
 const TOKEN = 'token';

 export function useSession() {
+    const router = useRouter();
    const { notify } = useNotify();
    let isCheckingToken = false;
    let intervalId = null;
@ -102,6 +104,31 @@ export function useSession() {
        startInterval();
    }

+    async function setLogin(data) {
+        const {
+            data: { multimediaToken },
+        } = await axios.get('VnUsers/ShareToken', {
+            headers: { Authorization: data.token },
+        });
+
+        if (!multimediaToken) return;
+
+        await login({
+            ...data,
+            created: Date.now(),
+            tokenMultimedia: multimediaToken.id,
+        });
+
+        notify('login.loginSuccess', 'positive');
+
+        const currentRoute = router.currentRoute.value;
+        if (currentRoute.query?.redirect) {
+            router.push(currentRoute.query.redirect);
+        } else {
+            router.push({ name: 'Dashboard' });
+        }
+    }
+
    function isLoggedIn() {
        const localToken = localStorage.getItem(TOKEN);
        const sessionToken = sessionStorage.getItem(TOKEN);
@ -163,6 +190,7 @@ export function useSession() {
        setToken,
        destroy,
        login,
+        setLogin,
        isLoggedIn,
        checkValidity,
        setSession,
--- a/src/composables/useValidator.js
+++ b/src/composables/useValidator.js
@ -28,7 +28,7 @@ export function useValidator() {
    }

    const { t } = useI18n();
-    const validations = function (validation) {
+    const validations = function (validation = {}) {
        return {
            format: (value) => {
                const { allowNull, with: format, allowBlank } = validation;
@ -40,12 +40,15 @@ export function useValidator() {
                if (!isValid) return message;
            },
            presence: (value) => {
-                let message = `Value can't be empty`;
+                let message = t(`globals.valueCantBeEmpty`);
                if (validation.message)
                    message = t(validation.message) || validation.message;

                return !validator.isEmpty(value ? String(value) : '') || message;
            },
+            required: (required, value) => {
+                return required ? !!value || t('globals.fieldRequired') : null;
+            },
            length: (value) => {
                const options = {
                    min: validation.min || validation.is,
@ -71,12 +74,17 @@ export function useValidator() {
                    return validator.isInt(value) || 'Value should be integer';
                return validator.isNumeric(value) || 'Value should be a number';
            },
+            min: (value, min) => {
+                if (min >= 0)
+                    if (Math.floor(value) < min) return t('inputMin', { value: min });
+            },
            custom: (value) => validation.bindedFunction(value) || 'Invalid value',
        };
    };

    return {
        validate,
+        validations,
        models,
    };
 }
--- a/src/css/app.scss
+++ b/src/css/app.scss
@ -37,6 +37,10 @@ a {
 .link {
    color: $color-link;
    cursor: pointer;
+
+    &--white {
+        color: white;
+    }
 }

 .tx-color-link {
@ -103,10 +107,6 @@ select:-webkit-autofill {
    border-radius: 8px;
 }

-.card-width {
-    width: 770px;
-}
-
 .vn-card-list {
    width: 100%;
    max-width: 60em;
@ -153,6 +153,12 @@ select:-webkit-autofill {
    background-color: var(--vn-section-color);
 }

+.q-table td[shrink] {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    max-width: 80px;
+}
+
 .tr-header {
    color: var(--vn-label-color);
 }
@ -184,15 +190,12 @@ select:-webkit-autofill {
    font-size: medium;
 }

-.q-card__actions {
-    justify-content: center;
+.q-toolbar {
+    background: var(--vn-section-color);
 }

-.q-card,
-.q-table,
-.q-table__bottom,
-.q-drawer {
-    background-color: var(--vn-section-color);
+.q-card__actions {
+    justify-content: center;
 }

 input[type='number'] {
@ -214,37 +217,38 @@ input::-webkit-inner-spin-button {
    mix-blend-mode: multiply;
 }

-/* ===== Scrollbar CSS ===== /
-/ Firefox */
+.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;
-}
+    }

-/* Chrome, Edge, and Safari */
-*::-webkit-scrollbar {
+    /* Chrome, Edge, and Safari */
+    *::-webkit-scrollbar {
        width: 10px;
        height: 10px;
-}
+    }

-*::-webkit-scrollbar-thumb {
+    *::-webkit-scrollbar-thumb {
        background-color: var(--vn-label-color);
        border-radius: 10px;
-}
+    }

-*::-webkit-scrollbar-track {
+    *::-webkit-scrollbar-track {
        background: transparent;
+    }
 }

 .q-table {
-    thead,
-    tbody {
-        th {
-            .q-select {
-                max-width: 120px;
-            }
-        }
+    th,
    td {
        padding: 1px 10px 1px 10px;
        max-width: 100px;
@ -257,8 +261,27 @@ input::-webkit-inner-spin-button {
        white-space: nowrap;
        text-overflow: ellipsis;
    }
+    tr {
+        th {
+            font-size: 11pt;
+        }
+        td {
+            font-size: 11pt;
+            border-top: 1px solid var(--vn-page-color);
+            border-collapse: collapse;
+        }
+    }
+    .shrink {
+        max-width: 75px;
+    }
    .expand {
        max-width: 400px;
    }
-    }
+}
+.edit-photo-btn {
+    position: absolute;
+    right: 12px;
+    bottom: 12px;
+    z-index: 1;
+    cursor: pointer;
 }
--- a/src/filters/date.js
+++ b/src/filters/date.js
@ -20,21 +20,21 @@ export function isValidDate(date) {
 * Converts a given date to a specific format.
 *
 * @param {number|string|Date} date - The date to be formatted.
+ * @param {Object} opts - Optional parameters to customize the output format.
 * @returns {string} The formatted date as a string in 'dd/mm/yyyy' format. If the provided date is not valid, an empty string is returned.
 *
 * @example
 * // returns "02/12/2022"
 * toDateFormat(new Date(2022, 11, 2));
 */
-export function toDateFormat(date, locale = 'es-ES') {
-    if (!isValidDate(date)) {
-        return '';
-    }
-    return new Date(date).toLocaleDateString(locale, {
-        year: 'numeric',
-        month: '2-digit',
-        day: '2-digit',
-    });
+export function toDateFormat(date, locale = 'es-ES', opts = {}) {
+    if (!isValidDate(date)) return '';
+
+    const format = Object.assign(
+        { year: 'numeric', month: '2-digit', day: '2-digit' },
+        opts
+    );
+    return new Date(date).toLocaleDateString(locale, format);
 }

 /**
--- a/src/filters/dateRange.js
+++ b/src/filters/dateRange.js
@ -1,7 +1,7 @@
 export default function dateRange(value) {
    const minHour = new Date(value);
    minHour.setHours(0, 0, 0, 0);
-    const maxHour = new Date();
+    const maxHour = new Date(value);
    maxHour.setHours(23, 59, 59, 59);

    return [minHour, maxHour];
--- a/src/filters/getParamWhere.js
+++ b/src/filters/getParamWhere.js
@ -0,0 +1,21 @@
+// parsing JSON safely
+function parseJSON(str, fallback) {
+    try {
+        return JSON.parse(str ?? '{}');
+    } catch (e) {
+        console.error('Error parsing JSON:', e);
+        return fallback;
+    }
+}
+export default function (route, param) {
+    // catch route query params
+    const params = parseJSON(route?.query?.params, {});
+
+    // extract and parse filter from params
+    const { filter: filterStr = '{}' } = params;
+    const where = parseJSON(filterStr, {})?.where;
+    if (where && where[param] !== undefined) {
+        return where[param];
+    }
+    return null;
+}
--- a/src/filters/index.js
+++ b/src/filters/index.js
@ -11,6 +11,7 @@ import dashIfEmpty from './dashIfEmpty';
 import dateRange from './dateRange';
 import toHour from './toHour';
 import dashOrCurrency from './dashOrCurrency';
+import getParamWhere from './getParamWhere';

 export {
    toLowerCase,
@ -26,4 +27,5 @@ export {
    toPercentage,
    dashIfEmpty,
    dateRange,
+    getParamWhere,
 };
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@ -43,6 +43,8 @@ globals:
    noChanges: No changes to save
    changesToSave: You have changes pending to save
    confirmRemove: You are about to delete this row. Are you sure?
+    rowWillBeRemoved: This row will be removed
+    sureToContinue: Are you sure you want to continue?
    rowAdded: Row added
    rowRemoved: Row removed
    pleaseWait: Please wait...
@ -71,6 +73,7 @@ globals:
    allRows: 'All { numberRows } row(s)'
    markAll: Mark all
    requiredField: Required field
+    valueCantBeEmpty: Value cannot be empty
    class: clase
    type: Type
    reason: reason
@ -88,13 +91,18 @@ globals:
    description: Description
    id: Id
    order: Order
-    original: Original
+    original: Phys. Doc
    file: File
    selectFile: Select a file
    copyClipboard: Copy on clipboard
    salesPerson: SalesPerson
    send: Send
    code: Code
+    since: Since
+    from: From
+    to: To
+    notes: Notes
+    refresh: Refresh
    pageTitles:
        logIn: Login
        summary: Summary
@ -251,7 +259,16 @@ globals:
        mailForwarding: Mail forwarding
        mailAlias: Mail alias
        privileges: Privileges
-        labeler: Labeler
+        ldap: LDAP
+        samba: Samba
+        twoFactor: Two factor
+        recoverPassword: Recover password
+        resetPassword: Reset password
+        ticketsMonitor: Tickets monitor
+        clientsActionsMonitor: Clients and actions
+        serial: Serial
+        medical: Mutual
+    supplier: Supplier
    created: Created
    worker: Worker
    now: Now
@ -260,6 +277,12 @@ globals:
    comment: Comment
    observations: Observations
    goToModuleIndex: Go to module index
+    unsavedPopup:
+        title: Unsaved changes will be lost
+        subtitle: Are you sure exit without saving?
+    createInvoiceIn: Create invoice in
+    myAccount: My account
+    noOne: No one
 errors:
    statusUnauthorized: Access denied
    statusInternalServerError: An internal server error has ocurred
@ -285,14 +308,17 @@ twoFactor:
    explanation: >-
        Please, enter the verification code that we have sent to your email in the
        next 5 minutes
-    pageTitles:
-        twoFactor: Two-Factor
 verifyEmail:
    pageTitles:
        verifyEmail: Email verification
-dashboard:
-    pageTitles:
-
+recoverPassword:
+    userOrEmail: User or recovery email
+    explanation: >-
+        We will sent you an email to recover your password
+resetPassword:
+    repeatPassword: Repeat password
+    passwordNotMatch: Passwords don't match
+    passwordChanged: Password changed
 customer:
    list:
        phone: Phone
@ -392,8 +418,8 @@ customer:
    extendedList:
        tableVisibleColumns:
            id: Identifier
-            name: Comercial name
-            socialName: Business name
+            name: Name
+            socialName: Social name
            fi: Tax number
            salesPersonFk: Salesperson
            credit: Credit
@ -443,6 +469,7 @@ entry:
            travelFk: Travel
            isExcludedFromAvailable: Inventory
            isRaid: Raid
+            invoiceAmount: Import
    summary:
        commission: Commission
        currency: Currency
@ -680,6 +707,7 @@ invoiceOut:
            chooseValidClient: Choose a valid client
            chooseValidCompany: Choose a valid company
            chooseValidPrinter: Choose a valid printer
+            chooseValidSerialType: Choose a serial type
            fillDates: Invoice date and the max date should be filled
            invoiceDateLessThanMaxDate: Invoice date can not be less than max date
            invoiceWithFutureDate: Exists an invoice with a future date
@ -734,56 +762,6 @@ parking:
    searchBar:
        info: You can search by parking code
        label: Search parking...
-invoiceIn:
-    list:
-        ref: Reference
-        supplier: Supplier
-        supplierRef: Supplier ref.
-        serialNumber: Serial number
-        serial: Serial
-        file: File
-        issued: Issued
-        isBooked: Is booked
-        awb: AWB
-        amount: Amount
-    card:
-        issued: Issued
-        amount: Amount
-        client: Client
-        company: Company
-        customerCard: Customer card
-        ticketList: Ticket List
-        vat: Vat
-        dueDay: Due day
-        intrastat: Intrastat
-    summary:
-        supplier: Supplier
-        supplierRef: Supplier ref.
-        currency: Currency
-        docNumber: Doc number
-        issued: Expedition date
-        operated: Operation date
-        bookEntried: Entry date
-        bookedDate: Booked date
-        sage: Sage withholding
-        vat: Undeductible VAT
-        company: Company
-        booked: Booked
-        expense: Expense
-        taxableBase: Taxable base
-        rate: Rate
-        sageVat: Sage vat
-        sageTransaction: Sage transaction
-        dueDay: Date
-        bank: Bank
-        amount: Amount
-        foreignValue: Foreign value
-        dueTotal: Due day
-        noMatch: Do not match
-        code: Code
-        net: Net
-        stems: Stems
-        country: Country
 order:
    field:
        salesPersonFk: Sales Person
@ -860,6 +838,7 @@ worker:
        timeControl: Time control
        locker: Locker
        balance: Balance
+        medical: Medical
    list:
        name: Name
        email: Email
@ -939,6 +918,15 @@ worker:
            amount: Importe
            remark: Bonficado
            hasDiploma: Diploma
+    medical:
+        tableVisibleColumns:
+            date: Date
+            time: Hour
+            center: Formation Center
+            invoice: Invoice
+            amount: Amount
+            isFit: Fit
+            remark: Observations
    imageNotFound: Image not found
    balance:
        tableVisibleColumns:
@ -1004,18 +992,6 @@ route:
            shipped: Preparation date
            viewCmr: View CMR
            downloadCmrs: Download CMRs
-    columnLabels:
-        Id: Id
-        vehicle: Vehicle
-        description: Description
-        isServed: Served
-        worker: Worker
-        date: Date
-        started: Started
-        actions: Actions
-        agency: Agency
-        volume: Volume
-        finished: Finished
 supplier:
    list:
        payMethod: Pay method
@ -1123,9 +1099,12 @@ travel:
            agency: Agency
            shipped: Shipped
            landed: Landed
+            shipHour: Shipment Hour
+            landHour: Landing Hour
            warehouseIn: Warehouse in
            warehouseOut: Warehouse out
            totalEntries: Total entries
+            totalEntriesTooltip: Total entries
    summary:
        confirmed: Confirmed
        entryId: Entry Id
@ -1278,6 +1257,7 @@ components:
        active: Is active
        visible: Is visible
        floramondo: Is floramondo
+        showBadDates: Show future items
    userPanel:
        copyToken: Token copied to clipboard
        settings: Settings
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@ -42,6 +42,8 @@ globals:
    noChanges: Sin cambios que guardar
    changesToSave: Tienes cambios pendientes de guardar
    confirmRemove: Vas a eliminar este registro. ¿Continuar?
+    rowWillBeRemoved: Esta linea se eliminará
+    sureToContinue: ¿Seguro que quieres continuar?
    rowAdded: Fila añadida
    rowRemoved: Fila eliminada
    pleaseWait: Por favor espera...
@ -82,6 +84,9 @@ globals:
    warehouse: Almacén
    company: Empresa
    fieldRequired: Campo requerido
+    valueCantBeEmpty: El valor no puede estar vacío
+    Value can't be blank: El valor no puede estar en blanco
+    Value can't be null: El valor no puede ser nulo
    allowedFilesText: 'Tipos de archivo permitidos: { allowedContentTypes }'
    smsSent: SMS enviado
    confirmDeletion: Confirmar eliminación
@ -89,13 +94,18 @@ globals:
    description: Descripción
    id: Id
    order: Orden
-    original: Original
+    original: Doc. física
    file: Fichero
    selectFile: Seleccione un fichero
    copyClipboard: Copiar en portapapeles
    salesPerson: Comercial
    send: Enviar
    code: Código
+    since: Desde
+    from: Desde
+    to: Hasta
+    notes: Notas
+    refresh: Actualizar
    pageTitles:
        logIn: Inicio de sesión
        summary: Resumen
@ -238,7 +248,7 @@ globals:
        purchaseRequest: Petición de compra
        weeklyTickets: Tickets programados
        formation: Formación
-        locations: Ubicaciones
+        locations: Localizaciones
        warehouses: Almacenes
        roles: Roles
        connections: Conexiones
@ -254,7 +264,16 @@ globals:
        components: Componentes
        pictures: Fotos
        packages: Bultos
-        labeler: Etiquetas
+        ldap: LDAP
+        samba: Samba
+        twoFactor: Doble factor
+        recoverPassword: Recuperar contraseña
+        resetPassword: Restablecer contraseña
+        ticketsMonitor: Monitor de tickets
+        clientsActionsMonitor: Clientes y acciones
+        serial: Facturas por serie
+        medical: Mutua
+    supplier: Proveedor
    created: Fecha creación
    worker: Trabajador
    now: Ahora
@ -263,6 +282,12 @@ globals:
    comment: Comentario
    observations: Observaciones
    goToModuleIndex: Ir al índice del módulo
+    unsavedPopup:
+        title: Los cambios que no haya guardado se perderán
+        subtitle: ¿Seguro que quiere salir sin guardar?
+    createInvoiceIn: Crear factura recibida
+    myAccount: Mi cuenta
+    noOne: Nadie
 errors:
    statusUnauthorized: Acceso denegado
    statusInternalServerError: Ha ocurrido un error interno del servidor
@ -286,14 +311,17 @@ twoFactor:
    validate: Validar
    insert: Introduce el código de verificación
    explanation: Por favor introduce el código de verificación que te hemos enviado a tu email en los próximos 5 minutos
-    pageTitles:
-        twoFactor: Doble factor
 verifyEmail:
    pageTitles:
        verifyEmail: Verificación de correo
-dashboard:
-    pageTitles:
-
+recoverPassword:
+    userOrEmail: Usuario o correo de recuperación
+    explanation: >-
+        Te enviaremos un correo para restablecer tu contraseña
+resetPassword:
+    repeatPassword: Repetir contraseña
+    passwordNotMatch: Las contraseñas no coinciden
+    passwordChanged: Contraseña cambiada
 customer:
    list:
        phone: Teléfono
@ -392,7 +420,7 @@ customer:
    extendedList:
        tableVisibleColumns:
            id: Identificador
-            name: Nombre Comercial
+            name: Nombre
            socialName: Razón social
            fi: NIF / CIF
            salesPersonFk: Comercial
@ -443,6 +471,7 @@ entry:
            travelFk: Envio
            isExcludedFromAvailable: Inventario
            isRaid: Redada
+            invoiceAmount: Importe
    summary:
        commission: Comisión
        currency: Moneda
@ -687,6 +716,7 @@ invoiceOut:
            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
@ -700,8 +730,6 @@ invoiceOut:
            percentageText: '{getPercentage}% {getAddressNumber} de {getNAddresses}'
            pdfsNumberText: '{nPdfs} de {totalPdfs} PDFs'
    negativeBases:
-        from: Desde
-        to: Hasta
        company: Empresa
        country: País
        clientId: Id cliente
@ -781,54 +809,6 @@ parking:
    searchBar:
        info: Puedes buscar por código de parking
        label: Buscar parking...
-invoiceIn:
-    list:
-        ref: Referencia
-        supplier: Proveedor
-        supplierRef: Ref. proveedor
-        serialNumber: Num. serie
-        shortIssued: F. emisión
-        serial: Serie
-        file: Fichero
-        issued: Fecha emisión
-        isBooked: Conciliada
-        awb: AWB
-        amount: Importe
-    card:
-        issued: Fecha emisión
-        amount: Importe
-        client: Cliente
-        company: Empresa
-        customerCard: Ficha del cliente
-        ticketList: Listado de tickets
-        vat: Iva
-        dueDay: Fecha de vencimiento
-    summary:
-        supplier: Proveedor
-        supplierRef: Ref. proveedor
-        currency: Divisa
-        docNumber: Número documento
-        issued: Fecha de expedición
-        operated: Fecha operación
-        bookEntried: Fecha asiento
-        bookedDate: Fecha contable
-        sage: Retención sage
-        vat: Iva no deducible
-        company: Empresa
-        booked: Contabilizada
-        expense: Gasto
-        taxableBase: Base imp.
-        rate: Tasa
-        sageTransaction: Sage transación
-        dueDay: Fecha
-        bank: Caja
-        amount: Importe
-        foreignValue: Divisa
-        dueTotal: Vencimiento
-        code: Código
-        net: Neto
-        stems: Tallos
-        country: País
 department:
    pageTitles:
        basicData: Basic data
@ -864,6 +844,8 @@ worker:
        timeControl: Control de horario
        locker: Taquilla
        balance: Balance
+        formation: Formación
+        medical: Mutua
    list:
        name: Nombre
        email: Email
@ -876,7 +858,7 @@ worker:
    card:
        workerId: ID Trabajador
        name: Nombre
-        email: Email
+        email: Correo personal
        phone: Teléfono
        mobile: Móvil
        active: Activo
@ -934,6 +916,15 @@ worker:
            amount: Importe
            remark: Bonficado
            hasDiploma: Diploma
+    medical:
+        tableVisibleColumns:
+            date: Fecha
+            time: Hora
+            center: Centro de Formación
+            invoice: Factura
+            amount: Importe
+            isFit: Apto
+            remark: Observaciones
    imageNotFound: No se ha encontrado la imagen
    balance:
        tableVisibleColumns:
@ -986,18 +977,6 @@ route:
            shipped: Fecha preparación
            viewCmr: Ver CMR
            downloadCmrs: Descargar CMRs
-    columnLabels:
-        Id: Id
-        vehicle: Vehículo
-        description: Descripción
-        isServed: Servida
-        worker: Trabajador
-        date: Fecha
-        started: Iniciada
-        actions: Acciones
-        agency: Agencia
-        volume: Volumen
-        finished: Finalizada
 supplier:
    list:
        payMethod: Método de pago
@ -1103,11 +1082,14 @@ travel:
            id: Id
            ref: Referencia
            agency: Agencia
-            shipped: Enviado
-            landed: Llegada
-            warehouseIn: Almacén de salida
-            warehouseOut: Almacén de entrada
-            totalEntries: Total de entradas
+            shipped: F.envío
+            shipHour: Hora de envío
+            landHour: Hora de llegada
+            landed: F.entrega
+            warehouseIn: Alm.salida
+            warehouseOut: Alm.entrada
+            totalEntries: ∑
+            totalEntriesTooltip: Entradas totales
    summary:
        confirmed: Confirmado
        entryId: Id entrada
@ -1255,11 +1237,10 @@ components:
        # LatestBuysFilter
        salesPersonFk: Comprador
        supplierFk: Proveedor
-        from: Desde
-        to: Hasta
        active: Activo
        visible: Visible
        floramondo: Floramondo
+        showBadDates: Ver items a futuro
    userPanel:
        copyToken: Token copiado al portapapeles
        settings: Configuración
@ -1274,6 +1255,7 @@ components:
        clone: Clonar
        openCard: Ficha
        openSummary: Detalles
+        viewSummary: Vista previa
    cardDescriptor:
        mainList: Listado principal
        summary: Resumen
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@ -5,7 +5,7 @@ const quasar = useQuasar();
 </script>

 <template>
-    <QLayout view="hHh LpR fFf">
+    <QLayout view="hHh LpR fFf" v-shortcut>
        <Navbar />
        <RouterView></RouterView>
        <QFooter v-if="quasar.platform.is.mobile"></QFooter>
--- a/src/pages/Account/AccountAccounts.vue
+++ b/src/pages/Account/AccountAccounts.vue
@ -1,11 +1,9 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';

--- a/src/pages/Account/AccountAcls.vue
+++ b/src/pages/Account/AccountAcls.vue
@ -1,19 +1,14 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { ref } from 'vue';
-import FetchData from 'components/FetchData.vue';
-
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import CardList from 'src/components/ui/CardList.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import AclFilter from './Acls/AclFilter.vue';
-import AclFormView from './Acls/AclFormView.vue';
-
-import { useVnConfirm } from 'composables/useVnConfirm';
+import { ref, computed } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
+import { useQuasar } from 'quasar';
+
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import VnConfirm from 'components/ui/VnConfirm.vue';

 defineProps({
    id: {
@ -25,11 +20,9 @@ defineProps({
 const { notify } = useNotify();
 const { t } = useI18n();
 const stateStore = useStateStore();
-const { openConfirmationModal } = useVnConfirm();
+const quasar = useQuasar();

-const paginateRef = ref();
-const formDialog = ref(false);
-const rolesOptions = ref([]);
+const tableRef = ref();

 const exprBuilder = (param, value) => {
    switch (param) {
@ -40,32 +33,94 @@ const exprBuilder = (param, value) => {
    }
 };

-const deleteAcl = async (id) => {
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('id'),
+        isId: true,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'model',
+        label: t('model'),
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'principalId',
+        label: t('principalId'),
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'VnRoles',
+            optionLabel: 'name',
+            optionValue: 'name',
+        },
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'property',
+        label: t('property'),
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'accessType',
+        label: t('accessType'),
+        component: 'select',
+        attrs: {
+            options: ['READ', 'WRITE', '*'],
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('Delete'),
+                icon: 'delete',
+                action: deleteAcl,
+                isPrimary: true,
+            },
+        ],
+    },
+]);
+const deleteAcl = async ({ id }) => {
    try {
+        await new Promise((resolve) => {
+            quasar
+                .dialog({
+                    component: VnConfirm,
+                    componentProps: {
+                        title: t('Remove ACL'),
+                        message: t('Do you want to remove this ACL?'),
+                    },
+                })
+                .onOk(() => {
+                    resolve(true);
+                })
+                .onCancel(() => {
+                    resolve(false);
+                });
+        });
        await axios.delete(`ACLs/${id}`);
-        paginateRef.value.fetch();
+        tableRef.value.reload();
        notify('ACL removed', 'positive');
    } catch (error) {
        console.error('Error deleting Acl: ', error);
    }
 };
-function showFormDialog(data) {
-    formDialog.value = {
-        show: true,
-        formInitialData: { ...data },
-    };
-}
 </script>

 <template>
-    <FetchData
-        url="VnRoles"
-        :filter="{ fields: ['name'], order: 'name ASC' }"
-        @on-fetch="(data) => (rolesOptions = data)"
-        auto-load
-    />
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
    <VnSearchbar
        data-key="AccountAcls"
        url="ACLs"
@ -73,73 +128,26 @@ function showFormDialog(data) {
        :label="t('acls.search')"
        :info="t('acls.searchInfo')"
    />
-        </Teleport>
-    </template>
    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
-            <AclFilter data-key="AccountAcls" />
-        </QScrollArea>
    </QDrawer>
-
-    <QPage class="flex justify-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                ref="paginateRef"
+    <VnTable
+        ref="tableRef"
        data-key="AccountAcls"
-                url="ACLs"
-                :expr-builder="exprBuilder"
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :id="row.id"
-                        :key="row.id"
-                        :title="`${row.model}.${row.property}`"
-                        @click="showFormDialog(row)"
-                    >
-                        <template #list-items>
-                            <VnLv :label="t('acls.role')" :value="row.principalId" />
-                            <VnLv :label="t('acls.accessType')" :value="row.accessType" />
-                            <VnLv
-                                :label="t('acls.permissions')"
-                                :value="row.permission"
+        :url="`ACLs`"
+        :create="{
+            urlCreate: 'ACLs',
+            title: 'Create ACL',
+            onDataSaved: () => tableRef.reload(),
+            formInitialData: {},
+        }"
+        order="id DESC"
+        :disable-option="{ card: true }"
+        :columns="columns"
+        default-mode="table"
+        :right-search="true"
+        :is-editable="true"
+        :use-model="true"
    />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('globals.delete')"
-                                @click.stop="
-                                    openConfirmationModal(
-                                        t('ACL will be removed'),
-                                        t('Are you sure you want to continue?'),
-                                        () => deleteAcl(row.id)
-                                    )
-                                "
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QDialog
-            v-model="formDialog.show"
-            transition-show="scale"
-            transition-hide="scale"
-        >
-            <AclFormView
-                :form-initial-data="formDialog.formInitialData"
-                @on-data-change="paginateRef.fetch()"
-                :roles-options="rolesOptions"
-            />
-        </QDialog>
-        <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn fab icon="add" color="primary" @click="showFormDialog()">
-                <QTooltip class="text-no-wrap">{{ t('New ACL') }}</QTooltip>
-            </QBtn>
-        </QPageSticky>
-    </QPage>
 </template>

 <i18n>
@ -148,4 +156,17 @@ es:
    ACL removed: ACL eliminado
    ACL will be removed: El ACL será eliminado
    Are you sure you want to continue?: ¿Seguro que quieres continuar?
+    Remove ACL: Eliminar Acl
+    Do you want to remove this ACL?: ¿Quieres eliminar este ACL?
+    principalId: Rol
+    model: Modelo
+en:
+    New ACL: New ACL
+    ACL removed: ACL removed
+    ACL will be removed: ACL will be removed
+    Are you sure you want to continue?: Are you sure you want to continue?
+    Remove ACL: Remove ACL
+    Do you want to remove this ACL?: Do you want to remove this ACL?
+    principalId: Rol
+    model: Models
 </i18n>
--- a/src/pages/Account/AccountAliasList.vue
+++ b/src/pages/Account/AccountAliasList.vue
@ -1,30 +1,13 @@
 <script setup>
-import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { ref } from 'vue';
-
-import VnPaginate from 'components/ui/VnPaginate.vue';
+import { ref, computed } from 'vue';
+import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import CardList from 'src/components/ui/CardList.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import AliasSummary from './Alias/Card/AliasSummary.vue';
-import AliasCreateForm from './Alias/AliasCreateForm.vue';
-
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useStateStore } from 'stores/useStateStore';

-defineProps({
-    id: {
-        type: Number,
-        default: 0,
-    },
-});
-
+const tableRef = ref();
 const { t } = useI18n();
-const { viewSummary } = useSummaryDialog();
-const router = useRouter();
 const stateStore = useStateStore();
-const aliasCreateDialogRef = ref(null);

 const exprBuilder = (param, value) => {
    switch (param) {
@ -34,10 +17,29 @@ const exprBuilder = (param, value) => {
                : { alias: { like: `%${value}%` } };
    }
 };
-
-const navigate = (id) => router.push({ name: 'AliasSummary', params: { id } });
-
-const openCreateModal = () => aliasCreateDialogRef.value.show();
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('Id'),
+        isId: true,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'alias',
+        label: t('Alias'),
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'description',
+        label: t('Description'),
+        cardVisible: true,
+        create: true,
+    },
+]);
 </script>

 <template>
@ -52,54 +54,29 @@ const openCreateModal = () => aliasCreateDialogRef.value.show();
            />
        </Teleport>
    </template>
-    <QPage class="flex justify-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                ref="paginateRef"
+    <VnTable
+        ref="tableRef"
        data-key="AccountAliasList"
        url="MailAliases"
-                :expr-builder="exprBuilder"
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :id="row.id"
-                        :key="row.id"
-                        :title="row.alias"
-                        @click="navigate(row.id)"
-                    >
-                        <template #list-items>
-                            <VnLv :label="t('mailAlias.alias')" :value="row.alias">
-                            </VnLv>
-                            <VnLv
-                                :label="t('mailAlias.description')"
-                                :value="row.description"
-                            >
-                            </VnLv>
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, AliasSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
+        :create="{
+            urlCreate: 'MailAliases',
+            title: 'Create MailAlias',
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {},
+        }"
+        order="id DESC"
+        :columns="columns"
+        :disable-option="{ card: true }"
+        default-mode="table"
+        redirect="account/alias"
+        :is-editable="true"
+        :use-model="true"
    />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QDialog
-            ref="aliasCreateDialogRef"
-            transition-show="scale"
-            transition-hide="scale"
-        >
-            <AliasCreateForm />
-        </QDialog>
-        <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn fab icon="add" color="primary" @click="openCreateModal()">
-                <QTooltip class="text-no-wrap">{{ t('mailAlias.newAlias') }}</QTooltip>
-            </QBtn>
-        </QPageSticky>
-    </QPage>
 </template>
+
+<i18n>
+    es:
+        Id: Id
+        Alias: Alias
+        Description: Descripción
+</i18n>
--- a/src/pages/Account/AccountConnections.vue
+++ b/src/pages/Account/AccountConnections.vue
@ -2,11 +2,9 @@
 import { ref } from 'vue';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-
 import { toDateTimeFormat } from 'src/filters/date.js';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@ -29,15 +27,15 @@ const filter = {
    order: 'created DESC',
 };

-const urlPath = 'AccessTokens';
+const urlPath = 'VnTokens';

 const refresh = () => paginateRef.value.fetch();

 const navigate = (id) => router.push({ name: 'AccountSummary', params: { id } });

-const killSession = async (id) => {
+const killSession = async ({ userId, created }) => {
    try {
-        await axios.delete(`${urlPath}/${id}`);
+        await axios.post(`${urlPath}/killSession`, { userId, created });
        paginateRef.value.fetch();
        notify(t('Session killed'), 'positive');
    } catch (error) {
@ -86,7 +84,7 @@ const killSession = async (id) => {
                                    openConfirmationModal(
                                        t('Session will be killed'),
                                        t('Are you sure you want to continue?'),
-                                        () => killSession(row.id)
+                                        () => killSession(row)
                                    )
                                "
                                outline
--- a/src/pages/Account/AccountCreate.vue
+++ b/src/pages/Account/AccountCreate.vue
@ -2,7 +2,6 @@
 import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-
 import FormModelPopup from 'components/FormModelPopup.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'components/FetchData.vue';
@ -15,7 +14,6 @@ const newAccountForm = reactive({
    active: true,
 });
 const rolesOptions = ref([]);
-
 const redirectToAccountBasicData = (_, { id }) => {
    router.push({ name: 'AccountBasicData', params: { id } });
 };
--- a/src/pages/Account/AccountFilter.vue
+++ b/src/pages/Account/AccountFilter.vue
@ -1,7 +1,6 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
--- a/src/pages/Account/AccountLdap.vue
+++ b/src/pages/Account/AccountLdap.vue
@ -1,12 +1,10 @@
 <script setup>
 import { ref, onMounted, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
 import { useArrayData } from 'src/composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
@ -15,7 +13,6 @@ const { t } = useI18n();
 const { notify } = useNotify();

 const arrayData = useArrayData('AccountLdap');
-
 const URL_UPDATE = `LdapConfigs/${1}`;
 const URL_CREATE = `LdapConfigs`;
 const DEFAULT_DATA = {
@ -27,11 +24,9 @@ const DEFAULT_DATA = {
    server: null,
    userDn: null,
 };
-
 const initialData = ref({
    ...DEFAULT_DATA,
 });
-
 const hasData = computed({
    get: () => initialData.value.hasData,
    set: (val) => {
@ -40,12 +35,10 @@ const hasData = computed({
        else formCustomFn.value = null;
    },
 });
-
 const initialDataLoaded = ref(false);
 const formUrlCreate = ref(null);
 const formUrlUpdate = ref(null);
 const formCustomFn = ref(null);
-
 const onTestConection = async () => {
    try {
        await axios.get(`LdapConfigs/test`);
@ -54,7 +47,6 @@ const onTestConection = async () => {
        console.error('Error testing connection', error);
    }
 };
-
 const getInitialLdapConfig = async () => {
    try {
        initialDataLoaded.value = false;
@ -79,7 +71,6 @@ const getInitialLdapConfig = async () => {
        initialDataLoaded.value = true;
    }
 };
-
 const deleteMailForward = async () => {
    try {
        await axios.delete(URL_UPDATE);
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@ -1,33 +1,83 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import { computed, ref } from 'vue';
-
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import { ref, computed } from 'vue';
+import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import CardList from 'src/components/ui/CardList.vue';
 import AccountSummary from './Card/AccountSummary.vue';
-import AccountFilter from './AccountFilter.vue';
-import AccountCreate from './AccountCreate.vue';
-
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { useStateStore } from 'stores/useStateStore';
-import { useRole } from 'src/composables/useRole';
-import { QDialog } from 'quasar';

-const stateStore = useStateStore();
-const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const accountCreateDialogRef = ref(null);
-const showNewUserBtn = computed(() => useRole().hasAny(['itManagement']));
-
-const filter = {
-    fields: ['id', 'nickname', 'name', 'role'],
-    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
-};
+const tableRef = ref();

+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('Id'),
+        isId: true,
+        field: 'id',
+        cardVisible: true,
+        columnFilter: {
+            component: 'select',
+            name: 'search',
+            attrs: {
+                url: 'VnUsers/preview',
+                fields: ['id', 'name'],
+            },
+        },
+    },
+    {
+        align: 'left',
+        name: 'username',
+        label: t('Nickname'),
+        isTitle: true,
+        component: 'input',
+        columnField: {
+            component: null,
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'name',
+        label: t('Name'),
+        component: 'input',
+        columnField: {
+            component: null,
+        },
+        columnFilter: {
+            inWhere: true,
+        },
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'email',
+        label: t('email'),
+        component: 'input',
+        create: true,
+        visible: false,
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('View Summary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, AccountSummary),
+                isPrimary: true,
+            },
+        ],
+    },
+]);
 const exprBuilder = (param, value) => {
    switch (param) {
        case 'search':
@ -46,99 +96,31 @@ const exprBuilder = (param, value) => {
            return { [param]: value };
    }
 };
-
-const getApiUrl = () => new URL(window.location).origin;
-
-const navigate = (event, id) => {
-    if (event.ctrlKey || event.metaKey)
-        return window.open(`${getApiUrl()}/#/account/${id}/summary`);
-    router.push({ path: `/account/${id}` });
-};
-
-const openCreateModal = () => accountCreateDialogRef.value.show();
 </script>

 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
    <VnSearchbar
-                data-key="AccountList"
-                url="VnUsers/preview"
+        data-key="AccountUsers"
        :expr-builder="exprBuilder"
        :label="t('account.search')"
        :info="t('account.searchInfo')"
    />
-        </Teleport>
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
-            <AccountFilter data-key="AccountList" :expr-builder="exprBuilder" />
-        </QScrollArea>
-    </QDrawer>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                :filter="filter"
-                data-key="AccountList"
+
+    <VnTable
+        ref="tableRef"
+        data-key="AccountUsers"
        url="VnUsers/preview"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :id="row.id"
-                        :key="row.id"
-                        :title="row.nickname"
-                        @click="navigate($event, row.id)"
-                    >
-                        <template #list-items>
-                            <VnLv :label="t('account.card.name')" :value="row.nickname">
-                            </VnLv>
-                            <VnLv
-                                :label="t('account.card.nickname')"
-                                :value="row.username"
-                            >
-                            </VnLv>
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, AccountSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
+        order="id DESC"
+        :columns="columns"
+        default-mode="table"
+        redirect="account"
+        :use-model="true"
    />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QDialog
-            ref="accountCreateDialogRef"
-            transition-hide="scale"
-            transition-show="scale"
-        >
-            <AccountCreate />
-        </QDialog>
-        <QPageSticky :offset="[20, 20]" v-if="showNewUserBtn">
-            <QBtn @click="openCreateModal" color="primary" fab icon="add" />
-            <QTooltip class="text-no-wrap">
-                {{ t('account.card.newUser') }}
-            </QTooltip>
-        </QPageSticky>
-    </QPage>
 </template>
+
+<i18n>
+    es:
+        Id: Id
+        Nickname: Nickname
+        Name: Nombre
+</i18n>
--- a/src/pages/Account/AccountMain.vue
+++ b/src/pages/Account/AccountMain.vue
@ -1,17 +0,0 @@
-<script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'components/LeftMenu.vue';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>
--- a/src/pages/Account/AccountSamba.vue
+++ b/src/pages/Account/AccountSamba.vue
@ -1,23 +1,18 @@
 <script setup>
 import { ref, onMounted, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
 import { useArrayData } from 'src/composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';

 const { t } = useI18n();
 const { notify } = useNotify();
-
 const arrayData = useArrayData('AccountSamba');
-
 const formModel = ref(null);
-
 const URL_UPDATE = `SambaConfigs/${1}`;
 const URL_CREATE = `SambaConfigs`;

--- a/src/pages/Account/Alias/AliasCreateForm.vue
+++ b/src/pages/Account/Alias/AliasCreateForm.vue
@ -34,12 +34,12 @@ const onDataSaved = ({ id }) => {
        @on-data-saved="onDataSaved"
    >
        <template #form-inputs="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                <div class="col">
                    <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
                </div>
            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                <div class="col">
                    <VnInput
                        v-model="data.description"
--- a/src/pages/Account/Alias/Card/AliasCard.vue
+++ b/src/pages/Account/Alias/Card/AliasCard.vue
@ -1,22 +1,8 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-import { computed } from 'vue';
-
 import VnCard from 'components/common/VnCard.vue';
 import AliasDescriptor from './AliasDescriptor.vue';
-
 const { t } = useI18n();
-const route = useRoute();
-
-const routeName = computed(() => route.name);
-const customRouteRedirectName = computed(() => {
-    return routeName.value;
-});
-const searchBarDataKeys = {
-    AliasBasicData: 'AliasBasicData',
-    AliasUsers: 'AliasUsers',
-};
 </script>

 <template>
@ -24,10 +10,12 @@ const searchBarDataKeys = {
        data-key="Alias"
        base-url="MailAliases"
        :descriptor="AliasDescriptor"
-        :search-data-key="searchBarDataKeys[routeName]"
-        :search-custom-route-redirect="customRouteRedirectName"
-        :search-redirect="!!customRouteRedirectName"
-        :searchbar-label="t('mailAlias.search')"
-        :searchbar-info="t('mailAlias.searchInfo')"
+        search-data-key="AccountAliasList"
+        :searchbar-props="{
+            url: 'MailAliases',
+            info: t('mailAlias.searchInfo'),
+            label: t('mailAlias.search'),
+            searchUrl: 'table',
+        }"
    />
 </template>
--- a/src/pages/Account/Alias/Card/AliasSummary.vue
+++ b/src/pages/Account/Alias/Card/AliasSummary.vue
@ -28,6 +28,7 @@ const entityId = computed(() => $props.id || route.params.id);
        ref="summary"
        :url="`MailAliases/${entityId}`"
        @on-fetch="(data) => (alias = data)"
+        data-key="MailAliasesSummary"
    >
        <template #header> {{ alias.id }} - {{ alias.alias }} </template>
        <template #body>
--- a/src/pages/Account/Card/AccountBasicData.vue
+++ b/src/pages/Account/Card/AccountBasicData.vue
@ -37,9 +37,11 @@ watch(
                <VnInput v-model="data.nickname" :label="t('account.card.alias')" />
                <VnInput v-model="data.email" :label="t('account.card.email')" />
                <VnSelect
+                    url="Languages"
                    v-model="data.lang"
-                    :options="['es', 'en']"
                    :label="t('account.card.lang')"
+                    option-value="code"
+                    option-label="code"
                />
            </div>
        </template>
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@ -1,34 +1,20 @@
 <script setup>
-import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-
 import VnCard from 'components/common/VnCard.vue';
 import AccountDescriptor from './AccountDescriptor.vue';

 const { t } = useI18n();
-const route = useRoute();
-
-const routeName = computed(() => route.name);
-const customRouteRedirectName = computed(() => routeName.value);
-const searchBarDataKeys = {
-    AccountSummary: 'AccountSummary',
-    AccountInheritedRoles: 'AccountInheritedRoles',
-    AccountMailForwarding: 'AccountMailForwarding',
-    AccountMailAlias: 'AccountMailAlias',
-    AccountPrivileges: 'AccountPrivileges',
-    AccountLog: 'AccountLog',
-};
 </script>

 <template>
    <VnCard
        data-key="Account"
        :descriptor="AccountDescriptor"
-        :search-data-key="searchBarDataKeys[routeName]"
-        :search-custom-route-redirect="customRouteRedirectName"
-        :search-redirect="!!customRouteRedirectName"
-        :searchbar-label="t('account.search')"
-        :searchbar-info="t('account.searchInfo')"
+        search-data-key="AccountUsers"
+        :searchbar-props="{
+            url: 'VnUsers/preview',
+            label: t('account.search'),
+            info: t('account.searchInfo'),
+        }"
    />
 </template>
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@ -54,7 +54,7 @@ const hasAccount = ref(false);
        </template>
        <template #before>
            <!-- falla id :id="entityId.value" collection="user" size="160x160" -->
-            <VnImg :id="entityId" collection="user" size="160x160" class="photo">
+            <VnImg :id="entityId" collection="user" resolution="160x160" class="photo">
                <template #error>
                    <div
                        class="absolute-full picture text-center q-pa-md flex flex-center"
@ -72,7 +72,7 @@ const hasAccount = ref(false);
            </VnImg>
        </template>
        <template #body="{ entity }">
-            <VnLv :label="t('account.card.nickname')" :value="entity.nickname" />
+            <VnLv :label="t('account.card.nickname')" :value="entity.name" />
            <VnLv :label="t('account.card.role')" :value="entity.role.name" />
        </template>
        <template #actions="{ entity }">
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				`module.exports = { extends: ['@commitlint/config-conventional'] };`