Merge branch 'dev' into 8450-AddIconsV1-76

.eslintrc.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
     // https://eslint.org/docs/user-guide/configuring#configuration-cascading-and-hierarchy
     // This option interrupts the configuration hierarchy at this file
     // Remove this if you have an higher level ESLint config file (it usually happens into a monorepos)
@@ -58,7 +58,7 @@ module.exports = {
     rules: {
         'prefer-promise-reject-errors': 'off',
         'no-unused-vars': 'warn',
-        "vue/no-multiple-template-root": "off" ,
+        'vue/no-multiple-template-root': 'off',
         // allow debugger during development only
         'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     },

.gitignore

@@ -29,5 +29,5 @@ yarn-error.log*
 *.sln
 
 # Cypress directories and files
-/tests/cypress/videos
-/tests/cypress/screenshots
+/test/cypress/videos
+/test/cypress/screenshots

.husky/addReferenceTag.js

@@ -1,23 +1,24 @@
-const fs = require('fs');
-const path = require('path');
+import { existsSync, readFileSync, writeFileSync } from 'fs';
+import { join, resolve } from 'path';
 
 function getCurrentBranchName(p = process.cwd()) {
-    if (!fs.existsSync(p)) return false;
+    if (!existsSync(p)) return false;
 
-    const gitHeadPath = path.join(p, '.git', 'HEAD');
+    const gitHeadPath = join(p, '.git', 'HEAD');
 
-    if (!fs.existsSync(gitHeadPath))
-        return getCurrentBranchName(path.resolve(p, '..'));
+    if (!existsSync(gitHeadPath)) {
+        return getCurrentBranchName(resolve(p, '..'));
+    }
 
-    const headContent = fs.readFileSync(gitHeadPath, 'utf-8');
+    const headContent = 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 msgPath = '.git/COMMIT_EDITMSG';
+    const msg = readFileSync(msgPath, 'utf-8');
     const reference = branchName.match(/^\d+/);
 
     const referenceTag = `refs #${reference}`;
@@ -26,8 +27,7 @@ if (branchName) {
 
         if (splitedMsg.length > 1) {
             const finalMsg = splitedMsg[0] + ': ' + referenceTag + splitedMsg.slice(1).join(':');
-            fs.writeFileSync(msgPath, finalMsg);
+            writeFileSync(msgPath, finalMsg);
         }
     }
 }
-

.prettierrc.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
     singleQuote: true,
     printWidth: 90,
     tabWidth: 4,

commitlint.config.js

@@ -1 +1 @@
-module.exports = { extends: ['@commitlint/config-conventional'] };
+export default { extends: ['@commitlint/config-conventional'] };

cypress.config.js

@@ -1,9 +1,9 @@
-const { defineConfig } = require('cypress');
+import { defineConfig } from 'cypress';
 // https://docs.cypress.io/app/tooling/reporters
 // https://docs.cypress.io/app/references/configuration
 // https://www.npmjs.com/package/cypress-mochawesome-reporter
 
-module.exports = defineConfig({
+export default defineConfig({
     e2e: {
         baseUrl: 'http://localhost:9000/',
         experimentalStudio: true,
@@ -31,7 +31,7 @@ module.exports = defineConfig({
             supportFile: 'test/cypress/support/unit.js',
         },
         setupNodeEvents(on, config) {
-            require('cypress-mochawesome-reporter/plugin')(on);
+            import('cypress-mochawesome-reporter/plugin').then((plugin) => plugin.default(on));
             // implement node event listeners here
         },
         viewportWidth: 1280,

package.json

@@ -6,6 +6,7 @@
     "author": "Verdnatura",
     "private": true,
     "packageManager": "pnpm@8.15.1",
+    "type": "module",
     "scripts": {
         "resetDatabase": "cd ../salix && gulp docker",
         "lint": "eslint --ext .js,.vue ./",
@@ -20,14 +21,14 @@
         "addReferenceTag": "node .husky/addReferenceTag.js"
     },
     "dependencies": {
-        "@quasar/cli": "^2.3.0",
-        "@quasar/extras": "^1.16.14",
+        "@quasar/cli": "^2.4.1",
+        "@quasar/extras": "^1.16.16",
         "axios": "^1.4.0",
         "chromium": "^3.0.3",
         "croppie": "^2.6.5",
         "moment": "^2.30.1",
         "pinia": "^2.1.3",
-        "quasar": "^2.17.4",
+        "quasar": "^2.17.7",
         "validator": "^13.9.0",
         "vue": "^3.5.13",
         "vue-i18n": "^9.3.0",
@@ -36,22 +37,23 @@
     "devDependencies": {
         "@commitlint/cli": "^19.2.1",
         "@commitlint/config-conventional": "^19.1.0",
-        "@intlify/unplugin-vue-i18n": "^0.8.1",
+        "@intlify/unplugin-vue-i18n": "^0.8.2",
         "@pinia/testing": "^0.1.2",
-        "@quasar/app-vite": "^1.11.0",
-        "@quasar/quasar-app-extension-qcalendar": "4.0.0-beta.15",
+        "@quasar/app-vite": "^2.0.8",
+        "@quasar/quasar-app-extension-qcalendar": "^4.0.2",
         "@quasar/quasar-app-extension-testing-unit-vitest": "^0.4.0",
         "@vue/test-utils": "^2.4.4",
         "autoprefixer": "^10.4.14",
         "cypress": "^13.6.6",
         "cypress-mochawesome-reporter": "^3.8.2",
-        "eslint": "^8.41.0",
-        "eslint-config-prettier": "^8.8.0",
-        "eslint-plugin-cypress": "^2.13.3",
-        "eslint-plugin-vue": "^9.14.1",
+        "eslint": "^9.18.0",
+        "eslint-config-prettier": "^10.0.1",
+        "eslint-plugin-cypress": "^4.1.0",
+        "eslint-plugin-vue": "^9.32.0",
         "husky": "^8.0.0",
         "postcss": "^8.4.23",
-        "prettier": "^2.8.8",
+        "prettier": "^3.4.2",
+        "sass": "^1.83.4",
         "vitest": "^0.34.0"
     },
     "engines": {
@@ -61,8 +63,8 @@
         "bun": ">= 1.0.25"
     },
     "overrides": {
-        "@vitejs/plugin-vue": "^5.0.4",
-        "vite": "^5.1.4",
+        "@vitejs/plugin-vue": "^5.2.1",
+        "vite": "^6.0.11",
         "vitest": "^0.31.1"
     }
 }

postcss.config.js

@@ -1,10 +1,14 @@
 /* eslint-disable */
 // https://github.com/michael-ciniawsky/postcss-load-config
 
-module.exports = {
+import autoprefixer from 'autoprefixer';
+// Uncomment the following line if you want to support RTL CSS
+// import rtlcss from 'postcss-rtlcss';
+
+export default {
     plugins: [
         // https://github.com/postcss/autoprefixer
-        require('autoprefixer')({
+        autoprefixer({
             overrideBrowserslist: [
                 'last 4 Chrome versions',
                 'last 4 Firefox versions',
@@ -18,10 +22,7 @@ module.exports = {
         }),
 
         // https://github.com/elchininet/postcss-rtlcss
-        // If you want to support RTL css, then
-        // 1. yarn/npm install postcss-rtlcss
-        // 2. optionally set quasar.config.js > framework > lang to an RTL language
-        // 3. uncomment the following line:
-        // require('postcss-rtlcss')
+        // If you want to support RTL CSS, uncomment the following line:
+        // rtlcss(),
     ],
 };

quasar.config.js

@@ -8,11 +8,11 @@
 // Configuration for your app
 // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js
 
-const { configure } = require('quasar/wrappers');
-const VueI18nPlugin = require('@intlify/unplugin-vue-i18n/vite');
-const path = require('path');
+import { configure } from 'quasar/wrappers';
+import VueI18nPlugin from '@intlify/unplugin-vue-i18n/vite';
+import path from 'path';
 
-module.exports = configure(function (/* ctx */) {
+export default configure(function (/* ctx */) {
     return {
         eslint: {
             // fix: true,

quasar.extensions.json

@@ -1,6 +1,8 @@
 {
     "@quasar/testing-unit-vitest": {
-        "options": ["scripts"]
+        "options": [
+            "scripts"
+        ]
     },
     "@quasar/qcalendar": {}
 }

src/boot/__tests__/axios.spec.js

@@ -20,7 +20,7 @@ describe('Axios boot', () => {
     describe('onRequest()', async () => {
         it('should set the "Authorization" property on the headers', async () => {
             const config = { headers: {} };
-
+            localStorage.setItem('token', 'DEFAULT_TOKEN');
             const resultConfig = onRequest(config);
 
             expect(resultConfig).toEqual(

src/boot/axios.js

@@ -3,9 +3,9 @@ import { useSession } from 'src/composables/useSession';
 import { Router } from 'src/router';
 import useNotify from 'src/composables/useNotify.js';
 import { useStateQueryStore } from 'src/stores/useStateQueryStore';
+import { getToken, isLoggedIn } from 'src/utils/session';
 import { i18n } from 'src/boot/i18n';
 
-const session = useSession();
 const { notify } = useNotify();
 const stateQuery = useStateQueryStore();
 const baseUrl = '/api/';
@@ -13,7 +13,7 @@ axios.defaults.baseURL = baseUrl;
 const axiosNoError = axios.create({ baseURL: baseUrl });
 
 const onRequest = (config) => {
-    const token = session.getToken();
+    const token = getToken();
     if (token.length && !config.headers.Authorization) {
         config.headers.Authorization = token;
         config.headers['Accept-Language'] = i18n.global.locale.value;
@@ -37,15 +37,15 @@ const onResponse = (response) => {
     return response;
 };
 
-const onResponseError = (error) => {
+const onResponseError = async (error) => {
     stateQuery.remove(error.config);
 
-    if (session.isLoggedIn() && error.response?.status === 401) {
-        session.destroy(false);
+    if (isLoggedIn() && error.response?.status === 401) {
+        await useSession().destroy(false);
         const hash = window.location.hash;
         const url = hash.slice(1);
         Router.push(`/login?redirect=${url}`);
-    } else if (!session.isLoggedIn()) {
+    } else if (!isLoggedIn()) {
         return Promise.reject(error);
     }
 

src/components/CrudModel.vue

@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, watch } from 'vue';
+import { computed, ref, useAttrs, watch } from 'vue';
 import { useRouter, onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -17,6 +17,7 @@ const quasar = useQuasar();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { validate } = useValidator();
+const $attrs = useAttrs();
 
 const $props = defineProps({
     model: {
@@ -113,9 +114,11 @@ onBeforeRouteLeave((to, from, next) => {
 });
 
 async function fetch(data) {
-    resetData(data);
-    emit('onFetch', data);
-    return data;
+    const keyData = $attrs['key-data'];
+    const rows = keyData ? data[keyData] : data;
+    resetData(rows);
+    emit('onFetch', rows);
+    return rows;
 }
 
 function resetData(data) {

src/components/NavBar.vue

@@ -61,6 +61,7 @@ onMounted(() => stateStore.setMounted());
             />
             <QSpace />
             <div id="searchbar" class="searchbar"></div>
+            <div id="searchbar-after"></div>
             <QSpace />
             <div class="q-pl-sm q-gutter-sm row items-center no-wrap">
                 <div id="actions-prepend"></div>

src/components/VnTable/VnTable.vue

@@ -181,7 +181,7 @@ onMounted(() => {
 watch(
     () => $props.columns,
     (value) => splitColumns(value),
-    { immediate: true }
+    { immediate: true },
 );
 
 const isTableMode = computed(() => mode.value == TABLE_MODE);
@@ -212,7 +212,7 @@ function splitColumns(columns) {
     // Status column
     if (splittedColumns.value.chips.length) {
         splittedColumns.value.columnChips = splittedColumns.value.chips.filter(
-            (c) => !c.isId
+            (c) => !c.isId,
         );
         if (splittedColumns.value.columnChips.length)
             splittedColumns.value.columns.unshift({
@@ -314,7 +314,19 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
         show-if-above
     >
         <QScrollArea class="fit">
-            <VnTableFilter :data-key="$attrs['data-key']" :columns="columns" :redirect="redirect" />
+            <VnTableFilter
+                :data-key="$attrs['data-key']"
+                :columns="columns"
+                :redirect="redirect"
+            >
+                <template
+                    v-for="(_, slotName) in $slots"
+                    #[slotName]="slotData"
+                    :key="slotName"
+                >
+                    <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+                </template>
+            </VnTableFilter>
         </QScrollArea>
     </QDrawer>
     <CrudModel
@@ -472,7 +484,9 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
                                 btn.isPrimary ? 'text-primary-light' : 'color-vn-text '
                             "
                             :style="`visibility: ${
-                                (btn.show && btn.show(row)) ?? true ? 'visible' : 'hidden'
+                                ((btn.show && btn.show(row)) ?? true)
+                                    ? 'visible'
+                                    : 'hidden'
                             }`"
                             @click="btn.action(row)"
                         />

src/components/VnTable/VnTableFilter.vue

@@ -62,5 +62,8 @@ function columnName(col) {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
+        <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
+            <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+        </template>
     </VnFilterPanel>
 </template>

src/components/common/RightAdvancedMenu.vue

@@ -0,0 +1,53 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'stores/useStateStore';
+import { useHasContent } from 'src/composables/useHasContent';
+import { watch } from 'vue';
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+const hasContent = useHasContent('#advanced-menu');
+
+const $props = defineProps({
+    isMainSection: {
+        type: Boolean,
+        default: false,
+    },
+});
+
+watch(
+    () => $props.isMainSection,
+    (val) => {
+        if (stateStore) stateStore.rightAdvancedDrawer = val;
+    },
+    { immediate: true }
+);
+</script>
+<template>
+    <Teleport to="#searchbar-after" v-if="stateStore.isHeaderMounted()">
+        <QBtn
+            v-if="hasContent || $slots['advanced-menu']"
+            flat
+            @click="stateStore.toggleRightAdvancedDrawer()"
+            round
+            dense
+            icon="tune"
+        >
+            <QTooltip bottom anchor="bottom right">
+                {{ t('globals.advancedMenu') }}
+            </QTooltip>
+        </QBtn>
+    </Teleport>
+    <QDrawer
+        v-model="stateStore.rightAdvancedDrawer"
+        side="right"
+        :width="256"
+        :overlay="!isMainSection"
+        v-bind="$attrs"
+    >
+        <QScrollArea class="fit">
+            <div id="advanced-menu"></div>
+            <slot v-if="!hasContent" name="advanced-menu" />
+        </QScrollArea>
+    </QDrawer>
+</template>

src/components/common/RightMenu.vue

@@ -17,7 +17,7 @@ onMounted(() => {
 });
 </script>
 <template>
-    <Teleport to="#actions-append" v-if="stateStore.isHeaderMounted()">
+    <Teleport to="#actions-prepend" v-if="stateStore.isHeaderMounted()">
         <div class="row q-gutter-x-sm">
             <QBtn
                 v-if="hasContent || $slots['right-panel']"

src/components/common/VnCardBeta.vue

@@ -12,6 +12,7 @@ const props = defineProps({
     baseUrl: { type: String, default: undefined },
     customUrl: { type: String, default: undefined },
     filter: { type: Object, default: () => {} },
+    userFilter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
     filterPanel: { type: Object, default: undefined },
     searchDataKey: { type: String, default: undefined },
@@ -32,6 +33,7 @@ const url = computed(() => {
 const arrayData = useArrayData(props.dataKey, {
     url: url.value,
     filter: props.filter,
+    userFilter: props.userFilter,
 });
 
 onBeforeMount(async () => {

src/components/common/VnDmsList.vue

@@ -102,7 +102,7 @@ const columns = computed(() => [
                 storage: 'dms',
                 collection: null,
                 resolution: null,
-                id: prop.row.file.split('.')[0],
+                id: Number(prop.row.file.split('.')[0]),
                 token: token,
                 class: 'rounded',
                 ratio: 1,
@@ -202,7 +202,7 @@ const columns = computed(() => [
                         prop.row.id,
                         $props.downloadModel,
                         undefined,
-                        prop.row.download
+                        prop.row.download,
                     ),
             },
             {
@@ -374,7 +374,7 @@ defineExpose({
                                                 v-if="
                                                     shouldRenderButton(
                                                         button.name,
-                                                        props.row.isDocuware
+                                                        props.row.isDocuware,
                                                     )
                                                 "
                                                 :is="button.component"

src/components/common/VnInput.vue

@@ -75,6 +75,7 @@ const focus = () => {
 
 defineExpose({
     focus,
+    vnInputRef,
 });
 
 const mixinRules = [

src/components/common/VnLocation.vue

@@ -70,6 +70,9 @@ const handleModelValue = (data) => {
     <VnSelectDialog
         v-model="modelValue"
         option-filter-value="search"
+        :option-label="
+            (opt) => (typeof modelValue === 'string' ? modelValue : showLabel(opt))
+        "
         url="Postcodes/filter"
         @update:model-value="handleModelValue"
         :use-like="false"

src/components/common/VnLog.vue

@@ -15,6 +15,7 @@ import FetchData from '../FetchData.vue';
 import VnSelect from './VnSelect.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
 import VnPaginate from '../ui/VnPaginate.vue';
+import RightMenu from './RightMenu.vue';
 
 const stateStore = useStateStore();
 const validationsStore = useValidator();
@@ -130,7 +131,7 @@ const actionsIcon = {
 };
 const validDate = new RegExp(
     /^(-?(?:[1-9][0-9]*)?[0-9]{4})-(1[0-2]|0[1-9])-(3[01]|0[1-9]|[12][0-9])/.source +
-        /T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/.source
+        /T(2[0-3]|[01][0-9]):([0-5][0-9]):([0-5][0-9])(.[0-9]+)?(Z)?$/.source,
 );
 
 function castJsonValue(value) {
@@ -192,7 +193,7 @@ function getLogTree(data) {
                     user: log.user,
                     userFk: log.userFk,
                     logs: [],
-                })
+                }),
             );
         }
         // Model
@@ -210,7 +211,7 @@ function getLogTree(data) {
                     id: log.changedModelId,
                     showValue: log.changedModelValue,
                     logs: [],
-                })
+                }),
             );
             nLogs = 0;
         }
@@ -282,7 +283,7 @@ function setDate(type) {
     to = date.adjustDate(
         to,
         { hour: 21, minute: 59, second: 59, millisecond: 999 },
-        true
+        true,
     );
 
     switch (type) {
@@ -365,7 +366,7 @@ async function clearFilter() {
     dateTo.value = undefined;
     userRadio.value = undefined;
     Object.keys(checkboxOptions.value).forEach(
-        (opt) => (checkboxOptions.value[opt].selected = false)
+        (opt) => (checkboxOptions.value[opt].selected = false),
     );
     await applyFilter();
 }
@@ -378,7 +379,7 @@ watch(
     () => router.currentRoute.value.params.id,
     () => {
         applyFilter();
-    }
+    },
 );
 </script>
 <template>
@@ -391,7 +392,7 @@ watch(
                     const changedModel = item.changedModel;
                     return {
                         locale: useCapitalize(
-                            validations[changedModel]?.locale?.name ?? changedModel
+                            validations[changedModel]?.locale?.name ?? changedModel,
                         ),
                         value: changedModel,
                     };
@@ -507,7 +508,7 @@ watch(
                                                 :title="
                                                     date.formatDate(
                                                         log.creationDate,
-                                                        'DD/MM/YYYY hh:mm:ss'
+                                                        'DD/MM/YYYY hh:mm:ss',
                                                     ) ?? `date:'dd/MM/yyyy HH:mm:ss'`
                                                 "
                                             >
@@ -577,7 +578,7 @@ watch(
                                                         t(
                                                             `actions.${
                                                                 actionsText[log.action]
-                                                            }`
+                                                            }`,
                                                         )
                                                     "
                                                 />
@@ -677,139 +678,144 @@ watch(
             </div>
         </template>
     </VnPaginate>
-    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
-        <QList dense>
-            <QSeparator />
-            <QItem class="q-mt-sm">
-                <QInput
-                    :label="t('globals.search')"
-                    v-model="searchInput"
-                    class="full-width"
-                    clearable
-                    clear-icon="close"
-                    @keyup.enter="() => selectFilter('search')"
-                    @focusout="() => selectFilter('search')"
-                    @clear="() => selectFilter('search')"
-                >
-                    <template #append>
-                        <QIcon name="info" class="cursor-pointer">
-                            <QTooltip>{{ t('tooltips.search') }}</QTooltip>
-                        </QIcon>
-                    </template>
-                </QInput>
-            </QItem>
-            <QItem>
-                <VnSelect
-                    class="full-width"
-                    :label="t('globals.entity')"
-                    v-model="selectedFilters.changedModel"
-                    option-label="locale"
-                    option-value="value"
-                    :options="actions"
-                    @update:model-value="selectFilter('action')"
-                    hide-selected
-                />
-            </QItem>
-            <QItem class="q-mt-sm">
-                <QOptionGroup
-                    size="sm"
-                    v-model="userRadio"
-                    :options="userTypes"
-                    color="primary"
-                    @update:model-value="selectFilter('userRadio')"
-                    right-label
-                >
-                    <template #label="{ label }">
-                        {{ t(`Users.${label}`) }}
-                    </template>
-                </QOptionGroup>
-            </QItem>
-            <QItem class="q-mt-sm">
-                <QItemSection v-if="userRadio !== null">
+    <RightMenu>
+        <template #right-panel>
+            <QList dense>
+                <QSeparator />
+                <QItem class="q-mt-sm">
+                    <QInput
+                        :label="t('globals.search')"
+                        v-model="searchInput"
+                        class="full-width"
+                        clearable
+                        clear-icon="close"
+                        @keyup.enter="() => selectFilter('search')"
+                        @focusout="() => selectFilter('search')"
+                        @clear="() => selectFilter('search')"
+                    >
+                        <template #append>
+                            <QIcon name="info" class="cursor-pointer">
+                                <QTooltip>{{ t('tooltips.search') }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </QInput>
+                </QItem>
+                <QItem>
                     <VnSelect
                         class="full-width"
-                        :label="t('globals.user')"
-                        v-model="userSelect"
-                        option-label="name"
-                        option-value="id"
-                        :url="`${model}Logs/${$route.params.id}/editors`"
-                        :fields="['id', 'nickname', 'name', 'image']"
-                        sort-by="nickname"
-                        @update:model-value="selectFilter('userSelect')"
+                        :label="t('globals.entity')"
+                        v-model="selectedFilters.changedModel"
+                        option-label="locale"
+                        option-value="value"
+                        :options="actions"
+                        @update:model-value="selectFilter('action')"
                         hide-selected
+                    />
+                </QItem>
+                <QItem class="q-mt-sm">
+                    <QOptionGroup
+                        size="sm"
+                        v-model="userRadio"
+                        :options="userTypes"
+                        color="primary"
+                        @update:model-value="selectFilter('userRadio')"
+                        right-label
                     >
-                        <template #option="{ opt, itemProps }">
-                            <QItem v-bind="itemProps" class="q-pa-xs row items-center">
-                                <QItemSection class="col-3 items-center">
-                                    <VnAvatar :worker-id="opt.id" />
-                                </QItemSection>
-                                <QItemSection class="col-9 justify-center">
-                                    <span>{{ opt.name }}</span>
-                                    <span class="text-grey">{{ opt.nickname }}</span>
-                                </QItemSection>
-                            </QItem>
+                        <template #label="{ label }">
+                            {{ t(`Users.${label}`) }}
                         </template>
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mt-sm">
-                <QInput
-                    :label="t('globals.changes')"
-                    v-model="changeInput"
-                    class="full-width"
-                    clearable
-                    clear-icon="close"
-                    @keyup.enter="selectFilter('change')"
-                    @focusout="selectFilter('change')"
-                    @clear="selectFilter('change')"
+                    </QOptionGroup>
+                </QItem>
+                <QItem class="q-mt-sm">
+                    <QItemSection v-if="userRadio !== null">
+                        <VnSelect
+                            class="full-width"
+                            :label="t('globals.user')"
+                            v-model="userSelect"
+                            option-label="name"
+                            option-value="id"
+                            :url="`${model}Logs/${route.params.id}/editors`"
+                            :fields="['id', 'nickname', 'name', 'image']"
+                            sort-by="nickname"
+                            @update:model-value="selectFilter('userSelect')"
+                            hide-selected
+                        >
+                            <template #option="{ opt, itemProps }">
+                                <QItem
+                                    v-bind="itemProps"
+                                    class="q-pa-xs row items-center"
+                                >
+                                    <QItemSection class="col-3 items-center">
+                                        <VnAvatar :worker-id="opt.id" />
+                                    </QItemSection>
+                                    <QItemSection class="col-9 justify-center">
+                                        <span>{{ opt.name }}</span>
+                                        <span class="text-grey">{{ opt.nickname }}</span>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelect>
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-mt-sm">
+                    <QInput
+                        :label="t('globals.changes')"
+                        v-model="changeInput"
+                        class="full-width"
+                        clearable
+                        clear-icon="close"
+                        @keyup.enter="selectFilter('change')"
+                        @focusout="selectFilter('change')"
+                        @clear="selectFilter('change')"
+                    >
+                        <template #append>
+                            <QIcon name="info" class="cursor-pointer">
+                                <QTooltip max-width="250px">{{
+                                    t('tooltips.changes')
+                                }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </QInput>
+                </QItem>
+                <QItem
+                    :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
+                    v-for="(checkboxOption, index) in checkboxOptions"
+                    :key="index"
                 >
-                    <template #append>
-                        <QIcon name="info" class="cursor-pointer">
-                            <QTooltip max-width="250px">{{
-                                t('tooltips.changes')
-                            }}</QTooltip>
-                        </QIcon>
-                    </template>
-                </QInput>
-            </QItem>
-            <QItem
-                :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
-                v-for="(checkboxOption, index) in checkboxOptions"
-                :key="index"
-            >
-                <QCheckbox
-                    size="sm"
-                    v-model="checkboxOption.selected"
-                    :label="t(`actions.${checkboxOption.label}`)"
-                    @update:model-value="selectFilter"
-                />
-            </QItem>
-            <QItem class="q-mt-sm">
-                <QInput
-                    class="full-width"
-                    :label="t('globals.date')"
-                    @click="dateFromDialog = true"
-                    @focus="(evt) => evt.target.blur()"
-                    @clear="selectFilter('date', 'to')"
-                    v-model="dateFrom"
-                    clearable
-                    clear-icon="close"
-                />
-            </QItem>
-            <QItem class="q-mt-sm">
-                <QInput
-                    class="full-width"
-                    :label="t('to')"
-                    @click="dateToDialog = true"
-                    @focus="(evt) => evt.target.blur()"
-                    @clear="selectFilter('date', 'from')"
-                    v-model="dateTo"
-                    clearable
-                    clear-icon="close"
-                />
-            </QItem>
-        </QList>
-    </Teleport>
+                    <QCheckbox
+                        size="sm"
+                        v-model="checkboxOption.selected"
+                        :label="t(`actions.${checkboxOption.label}`)"
+                        @update:model-value="selectFilter"
+                    />
+                </QItem>
+                <QItem class="q-mt-sm">
+                    <QInput
+                        class="full-width"
+                        :label="t('globals.date')"
+                        @click="dateFromDialog = true"
+                        @focus="(evt) => evt.target.blur()"
+                        @clear="selectFilter('date', 'to')"
+                        v-model="dateFrom"
+                        clearable
+                        clear-icon="close"
+                    />
+                </QItem>
+                <QItem class="q-mt-sm">
+                    <QInput
+                        class="full-width"
+                        :label="t('globals.to')"
+                        @click="dateToDialog = true"
+                        @focus="(evt) => evt.target.blur()"
+                        @clear="selectFilter('date', 'from')"
+                        v-model="dateTo"
+                        clearable
+                        clear-icon="close"
+                    />
+                </QItem>
+            </QList>
+        </template>
+    </RightMenu>
     <QDialog v-model="dateFromDialog">
         <QDate
             :years-in-month-view="false"
@@ -1053,9 +1059,9 @@ en:
         Deletes: Deletes
         Accesses: Accesses
     Users:
-        User: Usuario
-        All: Todo
-        System: Sistema
+        User: User
+        All: All
+        System: System
     properties:
         id: ID
         claimFk: Claim ID

src/components/common/VnSection.vue

@@ -1,10 +1,10 @@
 <script setup>
-import RightMenu from './RightMenu.vue';
+import RightAdvancedMenu from './RightAdvancedMenu.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnTableFilter from '../VnTable/VnTableFilter.vue';
-import { onBeforeMount, computed, ref } from 'vue';
+import { onBeforeMount, onMounted, onUnmounted, computed, ref } from 'vue';
 import { useArrayData } from 'src/composables/useArrayData';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useHasContent } from 'src/composables/useHasContent';
 
 const $props = defineProps({
@@ -47,17 +47,14 @@ const $props = defineProps({
 });
 
 const route = useRoute();
+const router = useRouter();
+
 let arrayData;
 const sectionValue = computed(() => $props.section ?? $props.dataKey);
-const isMainSection = computed(() => {
-    const isSame = sectionValue.value == route.name;
-    if (!isSame && arrayData) {
-        arrayData.reset(['userParams', 'filter']);
-        arrayData.setCurrentFilter();
-    }
-    return isSame;
-});
+const isMainSection = ref(false);
+
 const searchbarId = 'section-searchbar';
+const advancedMenuSlot = 'advanced-menu';
 const hasContent = useHasContent(`#${searchbarId}`);
 
 onBeforeMount(() => {
@@ -68,7 +65,27 @@ onBeforeMount(() => {
             ...$props.arrayDataProps,
             navigate: $props.redirect,
         });
+    checkIsMain();
 });
+
+onMounted(() => {
+    const unsubscribe = router.afterEach(() => {
+        checkIsMain();
+    });
+    onUnmounted(unsubscribe);
+});
+
+onUnmounted(() => {
+    if (arrayData) arrayData.destroy();
+});
+
+function checkIsMain() {
+    isMainSection.value = sectionValue.value == route.name;
+    if (!isMainSection.value && arrayData) {
+        arrayData.reset(['userParams', 'filter']);
+        arrayData.setCurrentFilter();
+    }
+}
 </script>
 <template>
     <slot name="searchbar">
@@ -81,9 +98,9 @@ onBeforeMount(() => {
         />
         <div :id="searchbarId"></div>
     </slot>
-    <RightMenu>
-        <template #right-panel v-if="$slots['rightMenu'] || rightFilter">
-            <slot name="rightMenu">
+    <RightAdvancedMenu :is-main-section="isMainSection && rightFilter">
+        <template #advanced-menu v-if="$slots[advancedMenuSlot]">
+            <slot :name="advancedMenuSlot">
                 <VnTableFilter
                     v-if="rightFilter && columns"
                     :data-key="dataKey"
@@ -92,7 +109,7 @@ onBeforeMount(() => {
                 />
             </slot>
         </template>
-    </RightMenu>
+    </RightAdvancedMenu>
     <slot name="body" v-if="isMainSection" />
     <RouterView v-else />
 </template>

src/components/common/VnSelect.vue

@@ -27,7 +27,7 @@ const $props = defineProps({
         default: () => [],
     },
     optionLabel: {
-        type: [String],
+        type: [String, Function],
         default: 'name',
     },
     optionValue: {

src/components/common/VnSelectWorker.vue

@@ -9,9 +9,9 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-    hasInfo: {
-        type: Boolean,
-        default: false,
+    info: {
+        type: String,
+        default: undefined,
     },
     modelValue: {
         type: [String, Number, Object],
@@ -57,9 +57,9 @@ const url = computed(() => {
         <template #prepend v-if="$props.hasAvatar">
             <VnAvatar :worker-id="value" color="primary" v-bind="$attrs" />
         </template>
-        <template #append v-if="$props.hasInfo">
+        <template #append v-if="$props.info">
             <QIcon name="info" class="cursor-pointer">
-                <QTooltip>{{ $t($props.hasInfo) }}</QTooltip>
+                <QTooltip>{{ $t($props.info) }}</QTooltip>
             </QIcon>
         </template>
         <template #option="scope">

src/components/common/VnSummaryDialog.vue

@@ -10,6 +10,10 @@ defineProps({
         type: Object,
         required: true,
     },
+    width: {
+        type: String,
+        default: 'md-width',
+    },
 });
 
 defineEmits([...useDialogPluginComponent.emits]);
@@ -17,7 +21,19 @@ defineEmits([...useDialogPluginComponent.emits]);
 const { dialogRef, onDialogHide } = useDialogPluginComponent();
 </script>
 <template>
-    <QDialog ref="dialogRef" @hide="onDialogHide" full-width>
-        <component :is="summary" :id="id" />
+    <QDialog ref="dialogRef" @hide="onDialogHide">
+        <component :is="summary" :id="id" :class="width" />
     </QDialog>
 </template>
+
+<style lang="scss" scoped>
+.md-width {
+    max-width: $width-md;
+}
+.lg-width {
+    max-width: $width-lg;
+}
+.xlg-width {
+    max-width: $width-xl;
+}
+</style>

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

@@ -0,0 +1,146 @@
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import { vi, afterEach, beforeEach, beforeAll, describe, expect, it } from 'vitest';
+import VnDms from 'src/components/common/VnDms.vue';
+
+class MockFormData {
+    constructor() {
+        this.entries = {};
+    }
+
+    append(key, value) {
+        if (!key) {
+            throw new Error('Key is required for FormData.append');
+        }
+        this.entries[key] = value;
+    }
+
+    get(key) {
+        return this.entries[key] || null;
+    }
+
+    getAll() {
+        return this.entries;
+    }
+}
+
+global.FormData = MockFormData;
+
+describe('VnDms', () => {
+    let wrapper;
+    let vm;
+    let postMock;
+
+    const postResponseMock = { data: { success: true } };
+
+    const data = {
+        hasFile: true,
+        hasFileAttached: true,
+        reference: 'DMS-test',
+        warehouseFk: 1,
+        companyFk: 2,
+        dmsTypeFk: 3,
+        description: 'This is a test description',
+        files: { name: 'example.txt', content: new Blob(['file content'], { type: 'text/plain' })},
+    };
+
+    const expectedBody = {
+        hasFile: true,
+        hasFileAttached: true,
+        reference: 'DMS-test',
+        warehouseId: 1,
+        companyId: 2,
+        dmsTypeId: 3,
+        description: 'This is a test description',
+    };
+
+    beforeAll(() => {
+        wrapper = createWrapper(VnDms, {
+            propsData: {
+                url: '/test',
+                formInitialData: { id: 1, reference: 'test' },
+                model: 'Worker',
+            }
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
+        vi.spyOn(vm, '$emit');
+    });
+
+    beforeEach(() => {
+        postMock = vi.spyOn(axios, 'post').mockResolvedValue(postResponseMock);
+        vm.dms = data;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('mapperDms', () => {
+        it('should map DMS data correctly and add file to FormData', () => {
+            const [formData, params] = vm.mapperDms(data);
+
+            expect(formData.get('example.txt')).toBe(data.files);
+            expect(expectedBody).toEqual(params.params);
+        });
+
+        it('should map DMS data correctly without file', () => {
+            delete data.files;
+
+            const [formData, params] = vm.mapperDms(data);
+
+            expect(formData.getAll()).toEqual({});
+            expect(expectedBody).toEqual(params.params);
+        });
+    });
+
+    describe('getUrl', () => {
+        it('should returns prop url when is set', async () => {
+            expect(vm.getUrl()).toBe('/test');
+        });
+
+        it('should returns url dms/"props.formInitialData.id"/updateFile when prop url is null', async () => {            
+            await wrapper.setProps({ url: null });
+            expect(vm.getUrl()).toBe('dms/1/updateFile');
+        });
+
+        it('should returns url "props.model"/"route.params.id"/uploadFile when formInitialData is null', async () => {
+            await wrapper.setProps({ formInitialData: null });
+            vm.route.params.id = '123';
+            expect(vm.getUrl()).toBe('Worker/123/uploadFile');
+        });
+    });
+
+    describe('save', () => {
+        it('should save data correctly', async () => {
+            await vm.save();
+            expect(postMock).toHaveBeenCalledWith(vm.getUrl(), expect.any(FormData), { params: expectedBody });
+            expect(wrapper.emitted('onDataSaved')).toBeTruthy();
+        });
+    });
+
+    describe('defaultData', () => {
+        it('should set dms with formInitialData', async () => {
+            const testData = {
+                hasFile: false,
+                hasFileAttached: false,
+                reference: 'defaultData-test',
+                warehouseFk: 2,
+                companyFk: 3,
+                dmsTypeFk: 2,
+                description: 'This is a test description'
+            }
+            await wrapper.setProps({ formInitialData: testData });
+            vm.defaultData();
+
+            expect(vm.dms).toEqual(testData);
+        });
+
+        it('should add reference with "route.params.id" to dms if formInitialData is null', async () => {
+            await wrapper.setProps({ formInitialData: null });
+            vm.route.params.id= '111';
+            vm.defaultData();
+
+            expect(vm.dms.reference).toBe('111');
+        });
+    });
+});

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

@@ -0,0 +1,91 @@
+import { createWrapper } from 'app/test/vitest/helper';
+import { vi, describe, expect, it } from 'vitest';
+import VnInput from 'src/components/common/VnInput.vue';
+
+
+describe('VnInput', () => {
+    let vm;
+    let wrapper;
+    let input;
+
+    function generateWrapper(value, isOutlined, emptyToNull, insertable) {
+        wrapper = createWrapper(VnInput, {
+            props: {
+                modelValue: value,                
+                isOutlined,  emptyToNull,  insertable,
+                maxlength: 101
+            },
+            attrs: {
+                label: 'test',
+                required: true,
+                maxlength: 101,
+                maxLength: 10,
+                'max-length':20
+            },
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
+        input = wrapper.find('[data-cy="test_input"]');
+    };
+
+    describe('value', () => {
+        it('should emit update:modelValue when value changes', async () => {
+            generateWrapper('12345', false, false, true)
+            await input.setValue('123');
+            expect(wrapper.emitted('update:modelValue')).toBeTruthy();
+            expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
+        });
+
+        it('should emit update:modelValue with null when input is empty', async () => {
+            generateWrapper('12345', false, true, true);
+            await input.setValue('');
+            expect(wrapper.emitted('update:modelValue')[0]).toEqual([null]);
+        });
+    });
+
+    describe('styleAttrs', () => {
+        it('should return empty styleAttrs when isOutlined is false', async () => {
+            generateWrapper('123', false, false, false);
+            expect(vm.styleAttrs).toEqual({}); 
+        });
+
+        it('should set styleAttrs when isOutlined is true', async () => {        
+            generateWrapper('123', true, false, false);
+            expect(vm.styleAttrs.outlined).toBe(true);
+        });
+    });
+
+    describe('handleKeydown', () => { 
+        it('should do nothing when "Backspace" key is pressed', async () => {
+            generateWrapper('12345', false, false, true);
+            await input.trigger('keydown', { key: 'Backspace' });
+            expect(wrapper.emitted('update:modelValue')).toBeUndefined();
+            const spyhandler = vi.spyOn(vm, 'handleInsertMode');
+            expect(spyhandler).not.toHaveBeenCalled();
+            
+        });
+        
+        /*
+        TODO: #8399 REDMINE
+        */
+        it.skip('handleKeydown respects insertable behavior', async () => {
+            const expectedValue = '12345';
+            generateWrapper('1234', false, false, true);
+            vm.focus()
+            await input.trigger('keydown', { key: '5' });
+            await vm.$nextTick();
+            expect(wrapper.emitted('update:modelValue')).toBeTruthy();
+            expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue ]);
+            expect(vm.value).toBe( expectedValue);
+        });
+    });
+
+    describe('focus', () => {
+        it('should call focus method when input is focused', async () => {
+            generateWrapper('123', false, false, true);
+            const focusSpy = vi.spyOn(input.element, 'focus');
+            vm.focus();
+            expect(focusSpy).toHaveBeenCalled();
+        }); 
+    });
+});

src/components/ui/CardDescriptor.vue

@@ -37,6 +37,10 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
+    width: {
+        type: String,
+        default: 'md-width',
+    },
 });
 
 const state = useState();
@@ -128,9 +132,8 @@ const toModule = computed(() =>
                         </QTooltip>
                     </QBtn></slot
                 >
-
                 <QBtn
-                    @click.stop="viewSummary(entity.id, $props.summary)"
+                    @click.stop="viewSummary(entity.id, $props.summary, $props.width)"
                     round
                     flat
                     dense

src/components/ui/CatalogItem.vue

@@ -41,7 +41,7 @@ const card = toRef(props, 'item');
                 </div>
             </div>
             <div class="content">
-                <span class="link">
+                <span class="link" @click.stop>
                     {{ card.name }}
                     <ItemDescriptorProxy :id="card.id" />
                 </span>

src/components/ui/QCalendarMonthWrapper.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { computed } from 'vue';
 import { useQuasar } from 'quasar';
-import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.sass';
+import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
 
 const $props = defineProps({
     bordered: {

src/components/ui/VnFilterPanel.vue

@@ -190,7 +190,10 @@ const getLocale = (label) => {
     const globalLocale = `globals.params.${param}`;
     if (te(globalLocale)) return t(globalLocale);
     else if (te(t(`params.${param}`)));
-    else return t(`${route.meta.moduleName.toLowerCase()}.params.${param}`);
+    else {
+        const camelCaseModuleName = route.meta.moduleName.charAt(0).toLowerCase() + route.meta.moduleName.slice(1);    
+        return t(`${camelCaseModuleName}.params.${param}`);
+    }
 };
 </script>
 

src/components/ui/VnPaginate.vue

@@ -78,6 +78,10 @@ const props = defineProps({
         type: String,
         default: '',
     },
+    keyData: {
+        type: String,
+        default: undefined,
+    },
 });
 
 const emit = defineEmits(['onFetch', 'onPaginate', 'onChange']);
@@ -255,7 +259,7 @@ defineExpose({
         :disable="disableInfiniteScroll || !store.hasMoreData"
         v-bind="$attrs"
     >
-        <slot name="body" :rows="store.data"></slot>
+        <slot name="body" :rows="keyData ? store.data[keyData] : store.data"></slot>
         <div v-if="isLoading" class="spinner info-row q-pa-md text-center">
             <QSpinner color="primary" size="md" />
         </div>

src/components/ui/VnUsesMana.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { defineProps, ref } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();

src/components/ui/__tests__/VnSearchbar.spec.js

@@ -0,0 +1,71 @@
+import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+
+describe('VnSearchbar', () => {
+    let vm;
+    let wrapper;
+    let applyFilterSpy;
+    const searchText = 'Bolas de madera';
+    const userParams = {staticKey: 'staticValue'};
+
+    beforeEach(async () => {
+        wrapper = createWrapper(VnSearchbar, {
+            propsData: {
+                dataKey: 'testKey',
+                filter: null,
+                whereFilter: null,
+                searchRemoveParams: true,
+            },
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
+
+        vm.searchText = searchText;
+        vm.arrayData.store.userParams = userParams;
+        applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {});
+        
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('search resets pagination and applies filter', async () => {
+        const resetPaginationSpy = vi.spyOn(vm.arrayData, 'resetPagination').mockImplementation(() => {});
+        await vm.search();
+
+        expect(resetPaginationSpy).toHaveBeenCalled();
+        expect(applyFilterSpy).toHaveBeenCalledWith({
+            params: { search: searchText },
+        });
+    });
+
+    it('search includes static params if searchRemoveParams is false', async () => {
+        wrapper.setProps({ searchRemoveParams: false });
+        await vm.$nextTick();
+        await vm.search();
+
+        expect(applyFilterSpy).toHaveBeenCalledWith({
+            params: { staticKey: 'staticValue', search: searchText },
+            filter: {skip: 0},
+        });
+    });
+
+    it('updates store when dataKey changes', async () => {
+        expect(vm.store.userParams).toEqual(userParams);
+        wrapper.setProps({ dataKey: 'newTestKey' });
+        await vm.$nextTick();
+        expect(vm.store.userParams).toEqual({});
+    });
+
+    it('computes the "to" property correctly for redirection', () => {
+        vm.arrayData.store.searchUrl = 'searchParam';
+        vm.arrayData.store.currentFilter = { category: 'plants' };
+        const expectedQuery = JSON.stringify({
+            ...vm.arrayData.store.currentFilter,
+            search: searchText,
+        });
+        expect(vm.to.query.searchParam).toBe(expectedQuery);
+    });
+});

src/composables/useArrayData.js

@@ -9,7 +9,7 @@ const arrayDataStore = useArrayDataStore();
 
 export function useArrayData(key, userOptions) {
     key ??= useRoute().meta.moduleName;
-    
+
     if (!key) throw new Error('ArrayData: A key is required to use this composable');
 
     if (!arrayDataStore.get(key)) arrayDataStore.set(key);
@@ -170,10 +170,9 @@ export function useArrayData(key, userOptions) {
 
     async function addOrder(field, direction = 'ASC') {
         const newOrder = field + ' ' + direction;
-        let order = store.order || [];
-        if (typeof order == 'string') order = [order];
+        const order = toArray(store.order);
 
-        let index = order.findIndex((o) => o.split(' ')[0] === field);
+        let index = getOrderIndex(order, field);
         if (index > -1) {
             order[index] = newOrder;
         } else {
@@ -190,16 +189,24 @@ export function useArrayData(key, userOptions) {
     }
 
     async function deleteOrder(field) {
-        let order = store.order ?? [];
-        if (typeof order == 'string') order = [order];
-
-        const index = order.findIndex((o) => o.split(' ')[0] === field);
+        const order = toArray(store.order);
+        const index = getOrderIndex(order, field);
         if (index > -1) order.splice(index, 1);
 
         store.order = order;
         fetch({});
     }
 
+    function getOrderIndex(order, field) {
+        return order.findIndex((o) => o.split(' ')[0] === field);
+    }
+
+    function toArray(str = []) {
+        if (!str) return [];
+        if (Array.isArray(str)) return str;
+        if (typeof str === 'string') return str.split(',').map((item) => item.trim());
+    }
+
     function sanitizerParams(params, exprBuilder) {
         for (const param in params) {
             if (params[param] === '' || params[param] === null) {
@@ -290,8 +297,7 @@ export function useArrayData(key, userOptions) {
 
         Object.assign(params, store.userParams);
         if (params.filter) params.filter.skip = store.skip;
-        if (store?.order && typeof store?.order == 'string') store.order = [store.order];
-        if (store.order?.length) params.filter.order = [...store.order];
+        if (store.order) params.filter.order = toArray(store.order);
         else delete params.filter.order;
 
         return { filter, params, limit: filter.limit };

src/composables/useHasContent.js

@@ -5,7 +5,7 @@ export function useHasContent(selector) {
     const hasContent = ref();
 
     onMounted(() => {
-        container.value = document.querySelector(selector);
+        container.value = document?.querySelector(selector);
         if (!container.value) return;
 
         const observer = new MutationObserver(() => {

src/composables/useSession.js

@@ -6,6 +6,7 @@ import axios from 'axios';
 import { useRouter } from 'vue-router';
 import useNotify from './useNotify';
 import { useTokenConfig } from './useTokenConfig';
+import { getToken, getTokenMultimedia } from 'src/utils/session';
 const TOKEN_MULTIMEDIA = 'tokenMultimedia';
 const TOKEN = 'token';
 
@@ -15,19 +16,6 @@ export function useSession() {
     let isCheckingToken = false;
     let intervalId = null;
 
-    function getToken() {
-        const localToken = localStorage.getItem(TOKEN);
-        const sessionToken = sessionStorage.getItem(TOKEN);
-
-        return localToken || sessionToken || '';
-    }
-    function getTokenMultimedia() {
-        const localTokenMultimedia = localStorage.getItem(TOKEN_MULTIMEDIA);
-        const sessionTokenMultimedia = sessionStorage.getItem(TOKEN_MULTIMEDIA);
-
-        return localTokenMultimedia || sessionTokenMultimedia || '';
-    }
-
     function setSession(data) {
         let keepLogin = data.keepLogin;
         const storage = keepLogin ? localStorage : sessionStorage;

src/composables/useSummaryDialog.js

@@ -4,10 +4,10 @@ import { useQuasar } from 'quasar';
 export function useSummaryDialog() {
     const quasar = useQuasar();
 
-    function viewSummary(id, summary) {
+    function viewSummary(id, summary, width) {
         quasar.dialog({
             component: VnSummaryDialog,
-            componentProps: { id, summary },
+            componentProps: { id, summary, width },
         });
     }
 

src/css/app.scss

@@ -1,6 +1,6 @@
 // app global css in SCSS form
 @import './icons.scss';
-@import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.sass';
+@import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.scss';
 
 body.body--light {
     --vn-header-color: #cecece;
@@ -312,11 +312,11 @@ input::-webkit-inner-spin-button {
 }
 
 .q-item > .q-item__section:has(.q-checkbox) {
-    max-width: min-content;
+    max-width: fit-content;
 }
 
 .row > .column:has(.q-checkbox) {
-    max-width: min-content;
+    max-width: fit-content;
 }
 .q-field__inner {
     .q-field__control {

src/css/quasar.variables.scss

@@ -33,6 +33,11 @@ $dark-shadow-color: black;
 $layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d;
 $spacing-md: 16px;
 $color-font-secondary: #777;
+$width-xs: 400px;
+$width-sm: 544px;
+$width-md: 800px;
+$width-lg: 1280px;
+$width-xl: 1600px;
 .bg-success {
     background-color: $positive;
 }

src/i18n/locale/en.yml

@@ -1,13 +1,15 @@
 globals:
     lang:
         es: Spanish
-        en: English
-    quantity: Quantity
+        en: English        
     language: Language
+    quantity: Quantity
     entity: Entity
+    preview: Preview
     user: User
     details: Details
-    collapseMenu: Collapse left menu
+    collapseMenu: Collapse lateral menu
+    advancedMenu: Advanced menu
     backToDashboard: Return to dashboard
     notifications: Notifications
     userPanel: User panel
@@ -35,7 +37,6 @@ globals:
     confirm: Confirm
     assign: Assign
     back: Back
-    downloadPdf: Download PDF
     yes: 'Yes'
     no: 'No'
     noChanges: No changes to save
@@ -59,6 +60,7 @@ globals:
     downloadCSVSuccess: CSV downloaded successfully
     reference: Reference
     agency: Agency
+    entry: Entry
     warehouseOut: Warehouse Out
     warehouseIn: Warehouse In
     landed: Landed
@@ -67,11 +69,11 @@ globals:
     amount: Amount
     packages: Packages
     download: Download
+    downloadPdf: Download PDF
     selectRows: 'Select all { numberRows } row(s)'
     allRows: 'All { numberRows } row(s)'
     markAll: Mark all
     requiredField: Required field
-    valueCantBeEmpty: Value cannot be empty
     class: clase
     type: Type
     reason: reason
@@ -81,6 +83,9 @@ globals:
     warehouse: Warehouse
     company: Company
     fieldRequired: Field required
+    valueCantBeEmpty: Value cannot be empty
+    Value can't be blank: Value cannot be blank
+    Value can't be null: Value cannot be null
     allowedFilesText: 'Allowed file types: { allowedContentTypes }'
     smsSent: SMS sent
     confirmDeletion: Confirm deletion
@@ -130,6 +135,26 @@ globals:
     medium: Medium
     big: Big
     email: Email
+    supplier: Supplier
+    ticketList: Ticket List
+    created: Created
+    worker: Worker
+    now: Now
+    name: Name
+    new: New
+    comment: Comment
+    observations: Observations
+    goToModuleIndex: Go to module index
+    createInvoiceIn: Create invoice in
+    myAccount: My account
+    noOne: No one
+    maxTemperature: Max
+    minTemperature: Min
+    changePass: Change password
+    deleteConfirmTitle: Delete selected elements
+    changeState: Change state
+    raid: 'Raid {daysInForward} days'
+    isVies: Vies
     pageTitles:
         logIn: Login
         addressEdit: Update address
@@ -151,13 +176,14 @@ globals:
         subRoles: Subroles
         inheritedRoles: Inherited Roles
         customers: Customers
+        customerCreate: New customer
+        createCustomer: Create customer
+        createOrder: New order
         list: List
         webPayments: Web Payments
         extendedList: Extended list
         notifications: Notifications
         defaulter: Defaulter
-        customerCreate: New customer
-        createOrder: New order
         fiscalData: Fiscal data
         billingData: Billing data
         consignees: Consignees
@@ -193,27 +219,28 @@ globals:
         claims: Claims
         claimCreate: New claim
         lines: Lines
-        photos: Photos
         development: Development
+        photos: Photos
         action: Action
         invoiceOuts: Invoice out
         negativeBases: Negative Bases
         globalInvoicing: Global invoicing
         invoiceOutCreate: Create invoice out
+        order: Orders
+        orderList: List
+        orderCreate: New order
+        catalog: Catalog
+        volume: Volume
         shelving: Shelving
         shelvingList: Shelving List
         shelvingCreate: New shelving
         invoiceIns: Invoices In
         invoiceInCreate: Create invoice in
         vat: VAT
+        labeler: Labeler
         dueDay: Due day
         intrastat: Intrastat
         corrective: Corrective
-        order: Orders
-        orderList: List
-        orderCreate: New order
-        catalog: Catalog
-        volume: Volume
         workers: Workers
         workerCreate: New worker
         department: Department
@@ -226,10 +253,10 @@ globals:
         wagonsList: Wagons List
         wagonCreate: Create wagon
         wagonEdit: Edit wagon
+        wagonCounter: Trolley counter
         typesList: Types List
         typeCreate: Create type
         typeEdit: Edit type
-        wagonCounter: Trolley counter
         roadmap: Roadmap
         stops: Stops
         routes: Routes
@@ -238,21 +265,16 @@ globals:
         routeCreate: New route
         RouteRoadmap: Roadmaps
         RouteRoadmapCreate: Create roadmap
+        RouteExtendedList: Router
         autonomous: Autonomous
         suppliers: Suppliers
         supplier: Supplier
-        expedition: Expedition
-        services: Service
-        components: Components
-        pictures: Pictures
-        packages: Packages
-        tracking: Tracking
-        labeler: Labeler
         supplierCreate: New supplier
         accounts: Accounts
         addresses: Addresses
         agencyTerm: Agency agreement
         travel: Travels
+        create: Create
         extraCommunity: Extra community
         travelCreate: New travel
         history: Log
@@ -260,14 +282,13 @@ globals:
         items: Items
         diary: Diary
         tags: Tags
-        create: Create
-        buyRequest: Buy requests
         fixedPrice: Fixed prices
+        buyRequest: Buy requests
         wasteBreakdown: Waste breakdown
         itemCreate: New item
-        barcode: Barcodes
         tax: Tax
         botanical: Botanical
+        barcode: Barcodes
         itemTypeCreate: New item type
         family: Item Type
         lastEntries: Last entries
@@ -283,13 +304,20 @@ globals:
         formation: Formation
         locations: Locations
         warehouses: Warehouses
-        saleTracking: Sale tracking
         roles: Roles
         connections: Connections
         acls: ACLs
         mailForwarding: Mail forwarding
         mailAlias: Mail alias
         privileges: Privileges
+        observation: Notes
+        expedition: Expedition
+        saleTracking: Sale tracking
+        services: Service
+        tracking: Tracking
+        components: Components
+        pictures: Pictures
+        packages: Packages
         ldap: LDAP
         samba: Samba
         twoFactor: Two factor
@@ -300,27 +328,12 @@ globals:
         serial: Serial
         medical: Mutual
         pit: IRPF
-        RouteExtendedList: Router
         wasteRecalc: Waste recaclulate
         operator: Operator
         parking: Parking
-    supplier: Supplier
-    created: Created
-    worker: Worker
-    now: Now
-    name: Name
-    new: New
-    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
-    maxTemperature: Max
-    minTemperature: Min
     params:
         clientFk: Client id
         salesPersonFk: Sales person
@@ -338,19 +351,13 @@ globals:
         supplierFk: Supplier
         supplierRef: Supplier ref
         serial: Serial
-        amount: Importe
+        amount: Amount
         awbCode: AWB
         correctedFk: Rectified
         correctingFk: Rectificative
         daysOnward: Days onward
         countryFk: Country
         companyFk: Company
-    changePass: Change password
-    setPass: Set password
-    deleteConfirmTitle: Delete selected elements
-    changeState: Change state
-    raid: 'Raid {daysInForward} days'
-    isVies: Vies
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -490,21 +497,6 @@ invoiceOut:
         comercial: Comercial
         errors:
             downloadCsvFailed: CSV download failed
-shelving:
-    list:
-        parking: Parking
-        priority: Priority
-        newShelving: New Shelving
-    summary:
-        recyclable: Recyclable
-parking:
-    pickingOrder: Picking order
-    sector: Sector
-    row: Row
-    column: Column
-    searchBar:
-        info: You can search by parking code
-        label: Search parking...
 department:
     chat: Chat
     bossDepartment: Boss Department
@@ -696,6 +688,9 @@ supplier:
     consumption:
         entry: Entry
 travel:
+    search: Search travel
+    searchInfo: You can search by travel id or name
+    id: Id
     travelList:
         tableVisibleColumns:
             ref: Reference
@@ -726,62 +721,6 @@ travel:
         destination: Destination
         thermograph: Thermograph
         travelFileDescription: 'Travel id { travelId }'
-item:
-    descriptor:
-        buyer: Buyer
-        color: Color
-        category: Category
-        available: Available
-        warehouseText: 'Calculated on the warehouse of { warehouseName }'
-        itemDiary: Item diary
-    list:
-        id: Identifier
-        stems: Stems
-        category: Category
-        typeName: Type
-        isActive: Active
-        userName: Buyer
-        weightByPiece: Weight/Piece
-        stemMultiplier: Multiplier
-    fixedPrice:
-        itemFk: Item ID
-        groupingPrice: Grouping price
-        packingPrice: Packing price
-        hasMinPrice: Has min price
-        minPrice: Min price
-        started: Started
-        ended: Ended
-    create:
-        priority: Priority
-    buyRequest:
-        requester: Requester
-        requested: Requested
-        attender: Atender
-        achieved: Achieved
-        concept: Concept
-    summary:
-        otherData: Other data
-        tax: Tax
-        botanical: Botanical
-        barcode: Barcode
-        completeName: Complete name
-        family: Familiy
-        stems: Stems
-        multiplier: Multiplier
-        buyer: Buyer
-        doPhoto: Do photo
-        intrastatCode: Intrastat code
-        ref: Reference
-        relevance: Relevance
-        weight: Weight (gram)/stem
-        units: Units/box
-        expense: Expense
-        generic: Generic
-        recycledPlastic: Recycled plastic
-        nonRecycledPlastic: Non recycled plastic
-        minSalesQuantity: Min sales quantity
-        genus: Genus
-        specie: Specie
 components:
     topbar: {}
     itemsFilterPanel:

src/i18n/locale/es.yml

@@ -5,9 +5,11 @@ globals:
     language: Idioma
     quantity: Cantidad
     entity: Entidad
+    preview: Vista previa
     user: Usuario
     details: Detalles
     collapseMenu: Contraer menú lateral
+    advancedMenu: Menú avanzado
     backToDashboard: Volver al tablón
     notifications: Notificaciones
     userPanel: Panel de usuario
@@ -53,11 +55,12 @@ globals:
     today: Hoy
     yesterday: Ayer
     dateFormat: es-ES
-    noSelectedRows: No tienes ninguna línea seleccionada
     microsip: Abrir en MicroSIP
+    noSelectedRows: No tienes ninguna línea seleccionada
     downloadCSVSuccess: Descarga de CSV exitosa
     reference: Referencia
     agency: Agencia
+    entry: Entrada
     warehouseOut: Alm. salida
     warehouseIn: Alm. entrada
     landed: F. entrega
@@ -132,6 +135,26 @@ globals:
     medium: Mediano/a
     big: Grande
     email: Correo
+    supplier: Proveedor
+    ticketList: Listado de tickets
+    created: Fecha creación
+    worker: Trabajador
+    now: Ahora
+    name: Nombre
+    new: Nuevo
+    comment: Comentario
+    observations: Observaciones
+    goToModuleIndex: Ir al índice del módulo
+    createInvoiceIn: Crear factura recibida
+    myAccount: Mi cuenta
+    noOne: Nadie
+    maxTemperature: Máx
+    minTemperature: Mín
+    changePass: Cambiar contraseña
+    deleteConfirmTitle: Eliminar los elementos seleccionados
+    changeState: Cambiar estado
+    raid: 'Redada {daysInForward} días'
+    isVies: Vies
     pageTitles:
         logIn: Inicio de sesión
         addressEdit: Modificar consignatario
@@ -154,17 +177,17 @@ globals:
         inheritedRoles: Roles heredados
         customers: Clientes
         customerCreate: Nuevo cliente
+        createCustomer: Crear cliente
         createOrder: Nuevo pedido
         list: Listado
         webPayments: Pagos Web
         extendedList: Listado extendido
         notifications: Notificaciones
         defaulter: Morosos
-        createCustomer: Crear cliente
         fiscalData: Datos fiscales
         billingData: Forma de pago
         consignees: Consignatarios
-        'address-create': Nuevo consignatario
+        address-create: Nuevo consignatario
         notes: Notas
         credits: Créditos
         greuges: Greuges
@@ -230,10 +253,10 @@ globals:
         wagonsList: Listado vagones
         wagonCreate: Crear tipo
         wagonEdit: Editar tipo
+        wagonCounter: Contador de carros
         typesList: Listado tipos
         typeCreate: Crear tipo
         typeEdit: Editar tipo
-        wagonCounter: Contador de carros
         roadmap: Troncales
         stops: Paradas
         routes: Rutas
@@ -242,8 +265,8 @@ globals:
         routeCreate: Nueva ruta
         RouteRoadmap: Troncales
         RouteRoadmapCreate: Crear troncal
-        autonomous: Autónomos
         RouteExtendedList: Enrutador
+        autonomous: Autónomos
         suppliers: Proveedores
         supplier: Proveedor
         supplierCreate: Nuevo proveedor
@@ -308,23 +331,9 @@ globals:
         wasteRecalc: Recalcular mermas
         operator: Operario
         parking: Parking
-    supplier: Proveedor
-    created: Fecha creación
-    worker: Trabajador
-    now: Ahora
-    name: Nombre
-    new: Nuevo
-    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
-    maxTemperature: Máx
-    minTemperature: Mín
     params:
         clientFk: Id cliente
         salesPersonFk: Comercial
@@ -347,12 +356,6 @@ globals:
         packing: ITP
         countryFk: País
         companyFk: Empresa
-    changePass: Cambiar contraseña
-    setPass: Establecer contraseña
-    deleteConfirmTitle: Eliminar los elementos seleccionados
-    changeState: Cambiar estado
-    raid: 'Redada {daysInForward} días'
-    isVies: Vies
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -447,11 +450,15 @@ ticket:
         attender: Consignatario
     create:
         address: Dirección
-invoiceOut:
-    card:
-        issued: Fecha emisión
-        customerCard: Ficha del cliente
-        ticketList: Listado de tickets
+order:
+    field:
+        salesPersonFk: Comercial
+    form:
+        clientFk: Cliente
+        addressFk: Dirección
+        agencyModeFk: Agencia
+    list:
+        newOrder: Nuevo Pedido
     summary:
         issued: Fecha
         dued: Fecha límite
@@ -462,47 +469,6 @@ invoiceOut:
         fee: Cuota
         tickets: Tickets
         totalWithVat: Importe
-    globalInvoices:
-        errors:
-            chooseValidClient: Selecciona un cliente válido
-            chooseValidCompany: Selecciona una empresa válida
-            chooseValidPrinter: Selecciona una impresora válida
-            chooseValidSerialType: Selecciona una tipo de serie válida
-            fillDates: La fecha de la factura y la fecha máxima deben estar completas
-            invoiceDateLessThanMaxDate: La fecha de la factura no puede ser menor que la fecha máxima
-            invoiceWithFutureDate: Existe una factura con una fecha futura
-            noTicketsToInvoice: No existen tickets para facturar
-            criticalInvoiceError: Error crítico en la facturación proceso detenido
-            invalidSerialTypeForAll: El tipo de serie debe ser global cuando se facturan todos los clientes
-        table:
-            addressId: Id dirección
-            streetAddress: Dirección fiscal
-        statusCard:
-            percentageText: '{getPercentage}% {getAddressNumber} de {getNAddresses}'
-            pdfsNumberText: '{nPdfs} de {totalPdfs} PDFs'
-    negativeBases:
-        clientId: Id cliente
-        base: Base
-        active: Activo
-        hasToInvoice: Facturar
-        verifiedData: Datos comprobados
-        comercial: Comercial
-        errors:
-            downloadCsvFailed: Error al descargar CSV
-shelving:
-    list:
-        parking: Parking
-        priority: Prioridad
-        newShelving: Nuevo Carro
-    summary:
-        recyclable: Reciclable
-parking:
-    pickingOrder: Orden de recogida
-    row: Fila
-    column: Columna
-    searchBar:
-        info: Puedes buscar por código de parking
-        label: Buscar parking...
 department:
     chat: Chat
     bossDepartment: Jefe de departamento
@@ -692,6 +658,9 @@ supplier:
     consumption:
         entry: Entrada
 travel:
+    search: Buscar envío
+    searchInfo: Buscar envío por id o nombre
+    id: Id
     travelList:
         tableVisibleColumns:
             ref: Referencia
@@ -722,62 +691,6 @@ travel:
         destination: Destino
         thermograph: Termógrafo
         travelFileDescription: 'Id envío { travelId }'
-item:
-    descriptor:
-        buyer: Comprador
-        color: Color
-        category: Categoría
-        available: Disponible
-        warehouseText: 'Calculado sobre el almacén de { warehouseName }'
-        itemDiary: Registro de compra-venta
-    list:
-        id: Identificador
-        stems: Tallos
-        category: Reino
-        typeName: Tipo
-        isActive: Activo
-        weightByPiece: Peso (gramos)/tallo
-        userName: Comprador
-        stemMultiplier: Multiplicador
-    fixedPrice:
-        itemFk: ID Artículo
-        groupingPrice: Precio grouping
-        packingPrice: Precio packing
-        hasMinPrice: Tiene precio mínimo
-        minPrice: Precio min
-        started: Inicio
-        ended: Fin
-    create:
-        priority: Prioridad
-    summary:
-        otherData: Otros datos
-        tax: IVA
-        botanical: Botánico
-        barcode: Código de barras
-        completeName: Nombre completo
-        family: Familia
-        stems: Tallos
-        multiplier: Multiplicador
-        buyer: Comprador
-        doPhoto: Hacer foto
-        intrastatCode: Código intrastat
-        ref: Referencia
-        relevance: Relevancia
-        weight: Peso (gramos)/tallo
-        units: Unidades/caja
-        expense: Gasto
-        generic: Genérico
-        recycledPlastic: Plástico reciclado
-        nonRecycledPlastic: Plástico no reciclado
-        minSalesQuantity: Cantidad mínima de venta
-        genus: Genus
-        specie: Specie
-    buyRequest:
-        requester: Solicitante
-        requested: Solicitado
-        attender: Comprador
-        achieved: Conseguido
-        concept: Concepto
 components:
     topbar: {}
     itemsFilterPanel:

src/pages/Claim/Card/ClaimAction.vue

@@ -4,7 +4,6 @@ import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
-import { useStateStore } from 'src/stores/useStateStore';
 import { toDate, toPercentage, toCurrency } from 'filters/index';
 import { tMobile } from 'src/composables/tMobile';
 import CrudModel from 'src/components/CrudModel.vue';
@@ -13,11 +12,11 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import { useArrayData } from 'composables/useArrayData';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
 const route = useRoute();
-const stateStore = computed(() => useStateStore());
 const claim = ref(null);
 const claimRef = ref();
 const claimId = route.params.id;
@@ -201,58 +200,62 @@ async function post(query, params) {
         auto-load
         @on-fetch="(data) => (destinationTypes = data)"
     />
-    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted() && claim">
-        <QCard class="totalClaim q-my-md q-pa-sm no-box-shadow">
-            {{ `${t('Total claimed')}: ${toCurrency(totalClaimed)}` }}
-        </QCard>
-        <QCard class="q-mb-md q-pa-sm no-box-shadow">
-            <QItem class="justify-between">
-                <QItemLabel class="slider-container">
-                    <p class="text-primary">
-                        {{ t('claim.actions') }}
-                    </p>
-                    <QSlider
-                        class="responsibility { 'background-color:primary': quasar.platform.is.mobile }"
-                        v-model="claim.responsibility"
-                        :label-value="t('claim.responsibility')"
-                        @change="(value) => save({ responsibility: value })"
-                        label-always
-                        color="primary"
-                        markers
-                        :marker-labels="marker_labels"
-                        :min="DEFAULT_MIN_RESPONSABILITY"
-                        :max="DEFAULT_MAX_RESPONSABILITY"
+    <RightMenu v-if="claim">
+        <template #right-panel>
+            <QCard class="totalClaim q-my-md q-pa-sm no-box-shadow">
+                {{ `${t('Total claimed')}: ${toCurrency(totalClaimed)}` }}
+            </QCard>
+            <QCard class="q-mb-md q-pa-sm no-box-shadow">
+                <QItem class="justify-between">
+                    <QItemLabel class="slider-container">
+                        <p class="text-primary">
+                            {{ t('claim.actions') }}
+                        </p>
+                        <QSlider
+                            class="responsibility { 'background-color:primary': quasar.platform.is.mobile }"
+                            v-model="claim.responsibility"
+                            :label-value="t('claim.responsibility')"
+                            @change="(value) => save({ responsibility: value })"
+                            label-always
+                            color="primary"
+                            markers
+                            :marker-labels="marker_labels"
+                            :min="DEFAULT_MIN_RESPONSABILITY"
+                            :max="DEFAULT_MAX_RESPONSABILITY"
+                        />
+                    </QItemLabel>
+                </QItem>
+            </QCard>
+            <QCard class="q-mb-md q-pa-sm no-box-shadow" style="margin-bottom: 1em">
+                <QItemLabel class="mana q-mb-md">
+                    <QCheckbox
+                        v-model="claim.isChargedToMana"
+                        @update:model-value="(value) => save({ isChargedToMana: value })"
                     />
+                    <span>{{ t('mana') }}</span>
                 </QItemLabel>
-            </QItem>
-        </QCard>
-        <QCard class="q-mb-md q-pa-sm no-box-shadow" style="margin-bottom: 1em">
-            <QItemLabel class="mana q-mb-md">
-                <QCheckbox
-                    v-model="claim.isChargedToMana"
-                    @update:model-value="(value) => save({ isChargedToMana: value })"
+            </QCard>
+            <QCard class="q-mb-md q-pa-sm no-box-shadow" style="position: static">
+                <QInput
+                    :disable="
+                        !(
+                            claim.responsibility >=
+                            Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2
+                        )
+                    "
+                    :label="t('confirmGreuges')"
+                    class="q-field__native text-grey-2"
+                    type="number"
+                    placeholder="0"
+                    id="multiplicatorValue"
+                    name="multiplicatorValue"
+                    min="0"
+                    max="50"
+                    v-model="multiplicatorValue"
                 />
-                <span>{{ t('mana') }}</span>
-            </QItemLabel>
-        </QCard>
-        <QCard class="q-mb-md q-pa-sm no-box-shadow" style="position: static">
-            <QInput
-                :disable="
-                    !(claim.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2)
-                "
-                :label="t('confirmGreuges')"
-                class="q-field__native text-grey-2"
-                type="number"
-                placeholder="0"
-                id="multiplicatorValue"
-                name="multiplicatorValue"
-                min="0"
-                max="50"
-                v-model="multiplicatorValue"
-            />
-        </QCard>
-    </Teleport>
-    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()"> </Teleport>
+            </QCard>
+        </template>
+    </RightMenu>
     <CrudModel
         v-if="claim"
         data-key="ClaimEnds"

src/pages/Claim/ClaimList.vue

@@ -134,7 +134,7 @@ const STATE_COLOR = {
             order: ['cs.priority ASC', 'created ASC'],
         }"
     >
-        <template #rightMenu>
+        <template #advanced-menu>
             <ClaimFilter data-key="ClaimList" ref="claimFilterRef" />
         </template>
         <template #body>

src/pages/Customer/Card/CustomerCard.vue

@@ -1,25 +1,12 @@
 <script setup>
-import { computed } from 'vue';
-import { useRoute } from 'vue-router';
-
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import CustomerDescriptor from './CustomerDescriptor.vue';
-import CustomerFilter from '../CustomerFilter.vue';
-const route = useRoute();
-
-const routeName = computed(() => route.name);
 </script>
+
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="Client"
         base-url="Clients"
         :descriptor="CustomerDescriptor"
-        :filter-panel="routeName != 'CustomerConsumption' && CustomerFilter"
-        search-data-key="CustomerList"
-        :searchbar-props="{
-            url: 'Clients/filter',
-            label: 'Search customer',
-            info: 'You can search by customer id or name',
-        }"
     />
 </template>

src/pages/Customer/Card/CustomerConsumption.vue

@@ -152,7 +152,8 @@ const updateDateParams = (value, params) => {
         v-if="campaignList"
         data-key="CustomerConsumption"
         url="Clients/consumption"
-        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"
+        :order="['itemTypeFk', 'itemName', 'itemSize', 'description']"        
+        :filter="{ where: { clientFk: route.params.id } }"
         :columns="columns"
         search-url="consumption"
         :user-params="userParams"

src/pages/Customer/Card/CustomerConsumptionFilter.vue

@@ -1,177 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import { QItem } from 'quasar';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import { QItemSection } from 'quasar';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-import { toDate } from 'src/filters';
-
-const { t } = useI18n();
-defineProps({ dataKey: { type: String, required: true } });
-</script>
-<template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true">
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params }">
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('params.item')"
-                        v-model="params.itemId"
-                        is-outlined
-                        lazy-rules
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.buyerId"
-                        url="TicketRequests/getItemTypeWorker"
-                        :fields="['id', 'nickname']"
-                        sort-by="nickname ASC"
-                        :label="t('params.buyer')"
-                        option-value="id"
-                        option-label="nickname"
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.typeId"
-                        url="ItemTypes"
-                        :include="['category']"
-                        :fields="['id', 'name', 'categoryFk']"
-                        sort-by="name ASC"
-                        :label="t('params.typeId')"
-                        option-label="name"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                    <QItemLabel caption>{{
-                                        scope.opt?.category?.name
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.categoryId"
-                        url="ItemCategories"
-                        :fields="['id', 'name']"
-                        sort-by="name ASC"
-                        :label="t('params.categoryId')"
-                        option-label="name"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        v-model="params.campaignId"
-                        url="Campaigns/latest"
-                        sort-by="dated DESC"
-                        :label="t('params.campaignId')"
-                        option-label="code"
-                        option-value="id"
-                        dense
-                        outlined
-                        rounded
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>{{
-                                        t(`params.${scope.opt?.code}`)
-                                    }}</QItemLabel>
-                                    <QItemLabel caption>{{
-                                        toDate(scope.opt.dated)
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        :label="t('params.from')"
-                        v-model="params.from"
-                        @update:model-value="searchFn()"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        :label="t('params.to')"
-                        v-model="params.to"
-                        @update:model-value="searchFn()"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-<i18n>
-en:
-    params:
-        item: Item id
-        buyer: Buyer
-        type: Type
-        category: Category
-        itemId: Item id
-        buyerId: Buyer
-        typeId: Type
-        categoryId: Category
-        from: From
-        to: To
-        campaignId: Campaña
-        valentinesDay: Valentine's Day
-        mothersDay: Mother's Day
-        allSaints: All Saints' Day
-es:
-    params:
-        item: Id artículo
-        buyer: Comprador
-        type: Tipo
-        category: Categoría
-        itemId: Id Artículo
-        buyerId: Comprador
-        typeId: Tipo
-        categoryId: Reino
-        from: Desde
-        to: Hasta
-        campaignId: Campaña
-        valentinesDay: Día de San Valentín
-        mothersDay: Día de la Madre
-        allSaints: Día de Todos los Santos
-</i18n>

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -53,6 +53,7 @@ const debtWarning = computed(() => {
         @on-fetch="setData"
         :summary="$props.summary"
         data-key="customer"
+        width="lg-width"
     >
         <template #menu="{ entity }">
             <CustomerDescriptorMenu :customer="entity" />
@@ -187,14 +188,18 @@ const debtWarning = computed(() => {
                 </QBtn>
                 <QBtn
                     :to="{
-                        name: 'AccountSummary',
-                        params: { id: entity.id },
+                        name: 'OrderList',
+                        query: {
+                            createForm: JSON.stringify({
+                                clientFk: entity.id,
+                            }),
+                        },
                     }"
                     size="md"
-                    icon="face"
+                    icon="vn:basketadd"
                     color="primary"
                 >
-                    <QTooltip>{{ t('Go to user') }}</QTooltip>
+                    <QTooltip>{{ t('globals.pageTitles.createOrder') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     v-if="entity.supplier"
@@ -218,14 +223,9 @@ en:
     unpaidDated: 'Date {dated}'
     unpaidAmount: 'Amount {amount}'
 es:
-    Go to module index: Ir al índice del módulo
     Customer ticket list: Listado de tickets del cliente
     Customer invoice out list: Listado de facturas del cliente
-    New order: Nuevo pedido
-    New ticket: Nuevo ticket
-    Go to user: Ir al usuario
     Go to supplier: Ir al proveedor
-    Customer unpaid: Cliente impago
     Unpaid: Impagado
     unpaidDated: 'Fecha {dated}'
     unpaidAmount: 'Importe {amount}'

src/pages/Customer/Card/CustomerDescriptorMenu.vue

@@ -51,7 +51,6 @@ const openCreateForm = (type) => {
     };
     const clientFk = {
         ticket: 'clientId',
-        order: 'clientFk',
     };
     const key = clientFk[type];
     if (!key) return;
@@ -70,11 +69,6 @@ const openCreateForm = (type) => {
             {{ t('globals.pageTitles.createTicket') }}
         </QItemSection>
     </QItem>
-    <QItem v-ripple clickable @click="openCreateForm('order')">
-        <QItemSection>
-            {{ t('globals.pageTitles.createOrder') }}
-        </QItemSection>
-    </QItem>
     <QItem v-ripple clickable>
         <QItemSection @click="showSmsDialog()">{{ t('Send SMS') }}</QItemSection>
     </QItem>

src/pages/Customer/Card/CustomerUnpaid.vue

@@ -50,7 +50,8 @@ const filterClientFindOne = {
         >
             <template #form="{ data }">
                 <VnRow>
-                    <QCheckbox :label="t('Unpaid client')" v-model="data.unpaid" />
+                    <QCheckbox :label="t('Unpaid client')" v-model="data.unpaid"
+                    data-cy="UnpaidCheckBox" />
                 </VnRow>
 
                 <VnRow class="row q-gutter-md q-mb-md" v-show="data.unpaid">

src/pages/Customer/CustomerList.vue

@@ -5,18 +5,19 @@ import { useRouter } from 'vue-router';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toDate } from 'src/filters';
 
-import RightMenu from 'src/components/common/RightMenu.vue';
 import CustomerSummary from './Card/CustomerSummary.vue';
 import CustomerFilter from './CustomerFilter.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const router = useRouter();
 const tableRef = ref();
+const dataKey = 'CustomerList';
+
 const columns = computed(() => [
     {
         align: 'left',
@@ -398,82 +399,91 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <VnSearchbar
-        :info="t('You can search by customer id or name')"
-        :label="t('Search customer')"
-        data-key="CustomerList"
-    />
-    <RightMenu>
-        <template #right-panel>
+    <VnSection
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="customer"
+        :array-data-props="{
+            url: 'Clients/filter',
+            order: ['id DESC'],
+        }"
+    >
+        <template #advanced-menu>
             <CustomerFilter data-key="CustomerList" />
         </template>
-    </RightMenu>
-    <VnTable
-        ref="tableRef"
-        data-key="CustomerList"
-        url="Clients/filter"
-        order="id DESC"
-        :create="{
-            urlCreate: 'Clients/createWithUser',
-            title: t('globals.pageTitles.customerCreate'),
-            onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {
-                active: true,
-                isEqualizated: false,
-            },
-        }"
-        :columns="columns"
-        :right-search="false"
-        redirect="customer"
-    >
-        <template #more-create-dialog="{ data }">
-            <VnSelectWorker
-                :label="t('customer.summary.salesPerson')"
-                v-model="data.salesPersonFk"
-                :params="{
-                    departmentCodes: ['VT'],
+        <template #body>
+            <VnTable
+                ref="tableRef"
+                :data-key="dataKey"
+                url="Clients/filter"
+                :create="{
+                    urlCreate: 'Clients/createWithUser',
+                    title: t('globals.pageTitles.customerCreate'),
+                    onDataSaved: ({ id }) => tableRef.redirect(id),
+                    formInitialData: {
+                        active: true,
+                        isEqualizated: false,
+                    },
                 }"
-                :has-avatar="true"
-                :id-value="data.salesPersonFk"
-                emit-value
-                auto-load
+                :columns="columns"
+                :right-search="false"
+                redirect="customer"
             >
-                <template #prepend>
-                    <VnAvatar
-                        :worker-id="data.salesPersonFk"
-                        color="primary"
-                        :title="title"
+                <template #more-create-dialog="{ data }">
+                    <VnSelectWorker
+                        :label="t('customer.summary.salesPerson')"
+                        v-model="data.salesPersonFk"
+                        :params="{
+                            departmentCodes: ['VT', 'shopping'],
+                        }"
+                        :has-avatar="true"
+                        :id-value="data.salesPersonFk"
+                        emit-value
+                        auto-load
+                    >
+                        <template #prepend>
+                            <VnAvatar
+                                :worker-id="data.salesPersonFk"
+                                color="primary"
+                                :title="title"
+                            />
+                        </template>
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption
+                                        >{{ scope.opt?.nickname }},
+                                        {{ scope.opt?.code }}</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectWorker>
+                    <VnLocation
+                        :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
+                        v-model="data.location"
+                        @update:model-value="(location) => handleLocation(data, location)"
                     />
+                    <QInput v-model="data.userName" :label="t('Web user')" />
+                    <QInput
+                        :label="t('Email')"
+                        clearable
+                        type="email"
+                        v-model="data.email"
+                    >
+                        <template #append>
+                            <QIcon name="info" class="cursor-info">
+                                <QTooltip max-width="400px">{{
+                                    t('customer.basicData.youCanSaveMultipleEmails')
+                                }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </QInput>
                 </template>
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                            <QItemLabel caption
-                                >{{ scope.opt?.nickname }},
-                                {{ scope.opt?.code }}</QItemLabel
-                            >
-                        </QItemSection>
-                    </QItem>
-                </template>
-            </VnSelectWorker>
-            <VnLocation
-                :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
-                v-model="data.location"
-                @update:model-value="(location) => handleLocation(data, location)"
-            />
-            <QInput v-model="data.userName" :label="t('Web user')" />
-            <QInput :label="t('Email')" clearable type="email" v-model="data.email">
-                <template #append>
-                    <QIcon name="info" class="cursor-info">
-                        <QTooltip max-width="400px">{{
-                            t('customer.basicData.youCanSaveMultipleEmails')
-                        }}</QTooltip>
-                    </QIcon>
-                </template>
-            </QInput>
+            </VnTable>
         </template>
-    </VnTable>
+    </VnSection>
 </template>
 <i18n>
 es:

src/pages/Customer/Defaulter/CustomerDefaulter.vue

@@ -11,14 +11,14 @@ import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const { t } = useI18n();
 const quasar = useQuasar();
 const dataRef = ref(null);
 
-const balanceDueTotal = ref(0);
 const selected = ref([]);
-
+const arrayData = useArrayData('CustomerDefaulter');
 const columns = computed(() => [
     {
         align: 'left',
@@ -165,26 +165,37 @@ const viewAddObservation = (rowsSelected) => {
     });
 };
 
-const onFetch = async (data) => {
-    balanceDueTotal.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
-};
-
 function exprBuilder(param, value) {
     switch (param) {
-        case 'clientFk':
-            return { [`d.${param}`]: value };
-        case 'creditInsurance':
-        case 'amount':
-        case 'workerFk':
-        case 'departmentFk':
-        case 'countryFk':
-        case 'payMethod':
         case 'salesPersonFk':
+        case 'creditInsurance':
+        case 'countryFk':
+            return { [`c.${param}`]: value };
+        case 'payMethod':
+            return { [`c.payMethodFk`]: value };
+        case 'workerFk':
+            return { [`co.${param}`]: value };
+        case 'departmentFk':
+            return { [`wd.${param}`]: value };
+        case 'amount':
+        case 'clientFk':
             return { [`d.${param}`]: value };
         case 'created':
             return { 'd.created': { between: dateRange(value) } };
         case 'defaulterSinced':
             return { 'd.defaulterSinced': { between: dateRange(value) } };
+        case 'isWorker': {
+            if (value == undefined) return;
+            const search = value ? 'worker' : { neq: 'worker' };
+            return { 'c.businessTypeFk': search };
+        }
+        case 'hasRecovery': {
+            if (value == undefined) return;
+            const search = value ? null : { neq: null };
+            return { 'r.finished': search };
+        }
+        case 'observation':
+            return { 'co.text': { like: `%${value}%` } };
     }
 }
 </script>
@@ -192,7 +203,7 @@ function exprBuilder(param, value) {
 <template>
     <VnSubToolbar>
         <template #st-data>
-            <CustomerBalanceDueTotal :amount="balanceDueTotal" />
+            <CustomerBalanceDueTotal :amount="arrayData.store.data?.amount" />
         </template>
         <template #st-actions>
             <QBtn
@@ -211,8 +222,6 @@ function exprBuilder(param, value) {
         url="Defaulters/filter"
         :expr-builder="exprBuilder"
         :columns="columns"
-        @on-fetch="onFetch"
-        :use-model="true"
         :table="{
             'row-key': 'clientFk',
             selection: 'multiple',
@@ -221,6 +230,7 @@ function exprBuilder(param, value) {
         :disable-option="{ card: true }"
         auto-load
         :order="['amount DESC']"
+        key-data="defaulters"
     >
         <template #column-clientFk="{ row }">
             <span class="link" @click.stop>

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -2,7 +2,7 @@
 import { onBeforeMount, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-
+import { useQuasar } from 'quasar';
 import axios from 'axios';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import FetchData from 'components/FetchData.vue';
@@ -13,11 +13,12 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import VnConfirm from 'components/ui/VnConfirm.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
-
+const quasar = useQuasar();
 const urlUpdate = ref('');
 const agencyModes = ref([]);
 const incoterms = ref([]);
@@ -83,8 +84,26 @@ const deleteNote = (id, index) => {
     notes.value.splice(index, 1);
 };
 
-const onDataSaved = async () => {
-    let payload = {
+const updateAddress = async (data) => {
+    await axios.patch(urlUpdate.value, data);
+};
+
+const updateAddressTicket = async () => {
+    urlUpdate.value += '?updateObservations=true';
+};
+
+const updateObservations = async (payload) => {
+    await axios.post('AddressObservations/crud', payload);
+    notes.value = [];
+    deletes.value = [];
+    toCustomerAddress();
+};
+async function updateAll({ data, payload }) {
+    await updateObservations(payload);
+    await updateAddress(data);
+}
+function getPayload() {
+    return {
         creates: notes.value.filter((note) => note.$isNew),
         deletes: deletes.value,
         updates: notes.value
@@ -101,14 +120,40 @@ const onDataSaved = async () => {
                 where: { id: note.id },
             })),
     };
+}
 
-    await axios.post('AddressObservations/crud', payload);
-    notes.value = [];
-    deletes.value = [];
-    toCustomerAddress();
-};
+async function handleDialog(data) {
+    const payload = getPayload();
+    const body = { data, payload };
+    if (payload.updates.length) {
+        quasar
+            .dialog({
+                component: VnConfirm,
+                componentProps: {
+                    title: t(
+                        'confirmTicket'
+                    ),
+                    message: t('confirmDeletionMessage'),
+                },
+            })
+            .onOk(async () => {
+                await updateAddressTicket();
+                await updateAll(body);
+                toCustomerAddress();
+            })
+            .onCancel(async () => {
+                await updateAll(body);
+                toCustomerAddress();
+            });
+    } else {
+        updateAll(body);
+        toCustomerAddress();
+    }
+}
 
 const toCustomerAddress = () => {
+    notes.value = [];
+    deletes.value = [];
     router.push({
         name: 'CustomerAddress',
         params: {
@@ -143,7 +188,7 @@ function handleLocation(data, location) {
         :observe-form-changes="false"
         :url-update="urlUpdate"
         :url="`Addresses/${route.params.addressId}`"
-        @on-data-saved="onDataSaved()"
+        :save-fn="handleDialog"
         auto-load
     >
         <template #moreActions>
@@ -336,4 +381,9 @@ es:
     Remove note: Eliminar nota
     Longitude: Longitud
     Latitude: Latitud
+    confirmTicket: ¿Desea modificar también los estados de todos los tickets que están a punto de ser servidos?
+    confirmDeletionMessage: Si le das a aceptar, se modificaran todas las notas de los ticket a futuro
+en:
+    confirmTicket: Do you also want to modify the states of all the tickets that are about to be served?
+    confirmDeletionMessage: If you click accept, all the notes of the future tickets will be modified
 </i18n>

src/pages/Customer/components/CustomerSamplesCreate.vue

@@ -214,7 +214,7 @@ const toCustomerSamples = () => {
             <template #custom-buttons>
                 <QBtn
                     :disabled="isLoading || !sampleType?.hasPreview"
-                    :label="t('Preview')"
+                    :label="t('globals.preview')"
                     :loading="isLoading"
                     @click.stop="getPreview()"
                     color="primary"
@@ -353,7 +353,6 @@ es:
     Its only used when sample is sent: Se utiliza únicamente cuando se envía la plantilla
     To who should the recipient replay?: ¿A quien debería responder el destinatario?
     Edit address: Editar dirección
-    Preview: Vista previa
     Email cannot be blank: Debes introducir un email
     Choose a sample: Selecciona una plantilla
     Choose a company: Selecciona una empresa

src/pages/Customer/composables/__tests__/getAddresses.spec.js

@@ -0,0 +1,33 @@
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import axios from 'axios';
+import { getAddresses } from 'src/pages/Customer/composables/getAddresses';
+
+vi.mock('axios');
+
+describe('getAddresses', () => {
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should fetch addresses with correct parameters for a valid clientId', async () => {
+        const clientId = '12345';
+
+        await getAddresses(clientId);
+
+        expect(axios.get).toHaveBeenCalledWith(`Clients/${clientId}/addresses`, {
+            params: {
+                filter: JSON.stringify({
+                    fields: ['nickname', 'street', 'city', 'id'],
+                    where: { isActive: true },
+                    order: 'nickname ASC',
+                }),
+            },
+        });
+    });
+
+    it('should return undefined when clientId is not provided', async () => {
+        await getAddresses(undefined);
+
+        expect(axios.get).not.toHaveBeenCalled();
+    });
+});

src/pages/Customer/composables/__tests__/getClient.spec.js

@@ -0,0 +1,41 @@
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import axios from 'axios';
+import { getClient } from 'src/pages/Customer/composables/getClient';
+
+vi.mock('axios');
+
+describe('getClient', () => {
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    const generateParams = (clientId) => ({
+        params: {
+            filter: JSON.stringify({
+                include: {
+                    relation: 'defaultAddress',
+                    scope: {
+                        fields: ['id', 'agencyModeFk'],
+                    },
+                },
+                where: { id: clientId },
+            }),
+        },
+    });
+
+    it('should fetch client data with correct parameters for a valid clientId', async () => {
+        const clientId = '12345';
+
+        await getClient(clientId);
+
+        expect(axios.get).toHaveBeenCalledWith('Clients', generateParams(clientId));
+    });
+
+    it('should return undefined when clientId is not provided', async () => {
+        const clientId = undefined;
+
+        await getClient(clientId);
+
+        expect(axios.get).toHaveBeenCalledWith('Clients', generateParams(clientId));
+    });
+});

src/pages/Customer/composables/getAddresses.js

@@ -0,0 +1,14 @@
+import axios from 'axios';
+
+export async function getAddresses(clientId) {   
+    if (!clientId) return;
+    const filter = {
+        fields: ['nickname', 'street', 'city', 'id'],
+        where: { isActive: true },
+        order: 'nickname ASC',
+    };
+    const params = { filter: JSON.stringify(filter) };
+    return await axios.get(`Clients/${clientId}/addresses`, {
+        params,
+    });
+};

src/pages/Customer/composables/getClient.js

@@ -0,0 +1,15 @@
+import axios from 'axios';
+
+export async function getClient(clientId) {
+    const filter = {
+        include: {
+            relation: 'defaultAddress',
+            scope: {
+                fields: ['id', 'agencyModeFk'],
+            },
+        },
+        where: { id: clientId },
+    };
+    const params = { filter: JSON.stringify(filter) };
+    return await axios.get('Clients', { params });
+};

src/pages/Customer/locale/en.yml

@@ -94,6 +94,8 @@ customer:
             hasToInvoiceByAddress: Invoice by address
             isToBeMailed: Mailing
             hasSepaVnl: VNL B2B received
+    search: Search customer
+    searchInfo: You can search by customer ID
     params:
         id: Id
         isWorker: Is Worker

src/pages/Customer/locale/es.yml

@@ -1,5 +1,3 @@
-Search customer: Buscar cliente
-You can search by customer id or name: Puedes buscar por id o nombre del cliente
 customer:
     card:
         debt: Riesgo
@@ -96,6 +94,8 @@ customer:
             hasToInvoiceByAddress: Factura por consigna
             isToBeMailed: Env. emails
             hasSepaVnl: Recibido B2B VNL
+    search: Buscar cliente
+    searchInfo: Puedes buscar por id o nombre del cliente
     params:
         id: ID
         isWorker: Es trabajador

src/pages/Entry/Card/EntryDescriptor.vue

@@ -61,6 +61,7 @@ const getEntryRedirectionFilter = (entry) => {
         :filter="filter"
         title="supplier.nickname"
         data-key="Entry"
+        width="lg-width"
     >
         <template #menu="{ entity }">
             <EntryDescriptorMenu :id="entity.id" />
@@ -147,7 +148,7 @@ es:
     Supplier card: Ficha del proveedor
     All travels with current agency: Todos los envíos con la agencia actual
     All entries with current supplier: Todas las entradas con el proveedor actual
-    Go to module index: Ir al índice del modulo
+    Show entry report: Ver informe del pedido
     Inventory entry: Es inventario
     Virtual entry: Es una redada
 </i18n>

src/pages/Entry/EntryList.vue

@@ -205,7 +205,7 @@ const columns = computed(() => [
             userFilter: entryFilter,
         }"
     >
-        <template #rightMenu>
+        <template #advanced-menu>
             <EntryFilter data-key="EntryList" />
         </template>
         <template #body>
@@ -231,7 +231,7 @@ const columns = computed(() => [
                         >
                             <QTooltip>{{
                                 t(
-                                    'entry.list.tableVisibleColumns.isExcludedFromAvailable'
+                                    'entry.list.tableVisibleColumns.isExcludedFromAvailable',
                                 )
                             }}</QTooltip>
                         </QIcon>

src/pages/InvoiceIn/Card/InvoiceInBasicData.vue

@@ -268,7 +268,7 @@ function deleteFile(dmsFk) {
             </VnRow>
             <VnRow>
                 <VnSelect
-                    :label="t('invoicein.summary.sage')"
+                    :label="t('invoiceIn.summary.sage')"
                     v-model="data.withholdingSageFk"
                     :options="sageWithholdings"
                     option-value="id"

src/pages/InvoiceIn/Card/InvoiceInCard.vue

@@ -1,10 +1,6 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
-import InvoiceInFilter from '../InvoiceInFilter.vue';
-import InvoiceInSearchbar from '../InvoiceInSearchbar.vue';
-import { onBeforeRouteUpdate } from 'vue-router';
-import { setRectificative } from '../composables/setRectificative';
 
 const filter = {
     include: [
@@ -39,20 +35,13 @@ const filter = {
         },
     ],
 };
-
-onBeforeRouteUpdate(async (to) => await setRectificative(to));
 </script>
+
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="InvoiceIn"
         base-url="InvoiceIns"
-        :filter="filter"
         :descriptor="InvoiceInDescriptor"
-        :filter-panel="InvoiceInFilter"
-        search-data-key="InvoiceInList"
-    >
-        <template #searchbar>
-            <InvoiceInSearchbar />
-        </template>
-    </VnCard>
+        :user-filter="filter"
+    />
 </template>

src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue

@@ -105,7 +105,7 @@ async function setInvoiceCorrection(id) {
     if (correctingData[0]) invoiceInCorrection.corrected = correctingData[0].correctedFk;
 
     invoiceInCorrection.correcting = correctedData.map(
-        (corrected) => corrected.correctingFk
+        (corrected) => corrected.correctingFk,
     );
 }
 </script>
@@ -117,18 +117,19 @@ async function setInvoiceCorrection(id) {
         :url="`InvoiceIns/${entityId}`"
         :filter="filter"
         title="supplierRef"
+        width="xlg-width"
     >
         <template #menu="{ entity }">
             <InvoiceInDescriptorMenu :invoice="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('invoicein.list.issued')" :value="toDate(entity.issued)" />
+            <VnLv :label="t('invoiceIn.list.issued')" :value="toDate(entity.issued)" />
             <VnLv
-                :label="t('invoicein.summary.bookedDate')"
+                :label="t('invoiceIn.summary.bookedDate')"
                 :value="toDate(entity.booked)"
             />
-            <VnLv :label="t('invoicein.list.amount')" :value="toCurrency(totalAmount)" />
-            <VnLv :label="t('invoicein.list.supplier')">
+            <VnLv :label="t('invoiceIn.list.amount')" :value="toCurrency(totalAmount)" />
+            <VnLv :label="t('invoiceIn.list.supplier')">
                 <template #value>
                     <span class="link">
                         {{ entity?.supplier?.nickname }}
@@ -145,7 +146,7 @@ async function setInvoiceCorrection(id) {
                     color="primary"
                     :to="routes.getSupplier(entity.supplierFk)"
                 >
-                    <QTooltip>{{ t('invoicein.list.supplier') }}</QTooltip>
+                    <QTooltip>{{ t('globals.supplier') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -153,7 +154,7 @@ async function setInvoiceCorrection(id) {
                     color="primary"
                     :to="routes.getEntry(entity.entryFk)"
                 >
-                    <QTooltip>{{ t('Entry') }}</QTooltip>
+                    <QTooltip>{{ t('globals.entry') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -161,7 +162,7 @@ async function setInvoiceCorrection(id) {
                     color="primary"
                     :to="routes.getTickets(entity.supplierFk)"
                 >
-                    <QTooltip>{{ t('InvoiceOut.card.ticketList') }}</QTooltip>
+                    <QTooltip>{{ t('globals.ticketList') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     v-if="

src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue

@@ -40,15 +40,15 @@ const cplusRectificationTypes = ref([]);
 const siiTypeInvoiceIns = ref([]);
 const actions = {
     unbook: {
-        title: t('assertAction', { action: t('invoicein.descriptorMenu.unbook') }),
+        title: t('assertAction', { action: t('invoiceIn.descriptorMenu.unbook') }),
         action: toUnbook,
     },
     delete: {
-        title: t('assertAction', { action: t('invoicein.descriptorMenu.delete') }),
+        title: t('assertAction', { action: t('invoiceIn.descriptorMenu.delete') }),
         action: deleteInvoice,
     },
     clone: {
-        title: t('assertAction', { action: t('invoicein.descriptorMenu.clone') }),
+        title: t('assertAction', { action: t('invoiceIn.descriptorMenu.clone') }),
         action: cloneInvoice,
     },
     showPdf: { cb: showPdfInvoice },
@@ -96,7 +96,7 @@ async function deleteInvoice() {
     await axios.delete(`InvoiceIns/${entityId.value}`);
     quasar.notify({
         type: 'positive',
-        message: t('invoicein.descriptorMenu.invoiceDeleted'),
+        message: t('invoiceIn.descriptorMenu.invoiceDeleted'),
     });
     push({ path: '/invoice-in' });
 }
@@ -105,7 +105,7 @@ async function cloneInvoice() {
     const { data } = await axios.post(`InvoiceIns/${entityId.value}/clone`);
     quasar.notify({
         type: 'positive',
-        message: t('invoicein.descriptorMenu.invoiceCloned'),
+        message: t('invoiceIn.descriptorMenu.invoiceCloned'),
     });
     push({ path: `/invoice-in/${data.id}/summary` });
 }
@@ -149,7 +149,7 @@ function sendPdfInvoice({ address }) {
 const createInvoiceInCorrection = async () => {
     const { data: correctingId } = await axios.post(
         'InvoiceIns/corrective',
-        Object.assign(correctionFormData, { id: entityId.value })
+        Object.assign(correctionFormData, { id: entityId.value }),
     );
     push({ path: `/invoice-in/${correctingId}/summary` });
 };
@@ -186,7 +186,7 @@ const createInvoiceInCorrection = async () => {
                 clickable
                 @click="book(entityId)"
             >
-                <QItemSection>{{ t('invoicein.descriptorMenu.toBook') }}</QItemSection>
+                <QItemSection>{{ t('invoiceIn.descriptorMenu.toBook') }}</QItemSection>
             </QItem>
         </template>
     </InvoiceInToBook>
@@ -197,7 +197,7 @@ const createInvoiceInCorrection = async () => {
         @click="triggerMenu('unbook')"
     >
         <QItemSection>
-            {{ t('invoicein.descriptorMenu.toUnbook') }}
+            {{ t('invoiceIn.descriptorMenu.toUnbook') }}
         </QItemSection>
     </QItem>
     <QItem
@@ -206,19 +206,19 @@ const createInvoiceInCorrection = async () => {
         clickable
         @click="triggerMenu('delete')"
     >
-        <QItemSection>{{ t('invoicein.descriptorMenu.deleteInvoice') }}</QItemSection>
+        <QItemSection>{{ t('invoiceIn.descriptorMenu.deleteInvoice') }}</QItemSection>
     </QItem>
     <QItem v-if="canEditProp('clone')" v-ripple clickable @click="triggerMenu('clone')">
-        <QItemSection>{{ t('invoicein.descriptorMenu.cloneInvoice') }}</QItemSection>
+        <QItemSection>{{ t('invoiceIn.descriptorMenu.cloneInvoice') }}</QItemSection>
     </QItem>
     <QItem v-if="isAgricultural()" v-ripple clickable @click="triggerMenu('showPdf')">
         <QItemSection>{{
-            t('invoicein.descriptorMenu.showAgriculturalPdf')
+            t('invoiceIn.descriptorMenu.showAgriculturalPdf')
         }}</QItemSection>
     </QItem>
     <QItem v-if="isAgricultural()" v-ripple clickable @click="triggerMenu('sendPdf')">
         <QItemSection
-            >{{ t('invoicein.descriptorMenu.sendAgriculturalPdf') }}...</QItemSection
+            >{{ t('invoiceIn.descriptorMenu.sendAgriculturalPdf') }}...</QItemSection
         >
     </QItem>
     <QItem
@@ -228,7 +228,7 @@ const createInvoiceInCorrection = async () => {
         @click="triggerMenu('correct')"
     >
         <QItemSection
-            >{{ t('invoicein.descriptorMenu.createCorrective') }}...</QItemSection
+            >{{ t('invoiceIn.descriptorMenu.createCorrective') }}...</QItemSection
         >
     </QItem>
     <QItem v-if="invoice.dmsFk" v-ripple clickable @click="downloadFile(invoice.dmsFk)">
@@ -272,7 +272,6 @@ const createInvoiceInCorrection = async () => {
                         >
                             <template #option="{ itemProps, opt }">
                                 <QItem v-bind="itemProps">
-                                    {{ console.log('opt: ', opt) }}
                                     <QItemSection>
                                         <QItemLabel
                                             >{{ opt.id }} -
@@ -311,11 +310,11 @@ const createInvoiceInCorrection = async () => {
 
 <i18n>
 en:
-    isNotLinked: The entry {bookEntry} has been deleted with {accountingEntries} entries		
-    isLinked: The entry has been linked to Sage. Please contact administration for further information		
+    isNotLinked: The entry {bookEntry} has been deleted with {accountingEntries} entries
+    isLinked: The entry has been linked to Sage. Please contact administration for further information
     assertAction: Are you sure you want to {action} this invoice?
 es:
-    isNotLinked: Se ha eliminado el asiento nº {bookEntry} con {accountingEntries} apuntes		
-    isLinked: El asiento fue enlazado a Sage, por favor contacta con administración		
+    isNotLinked: Se ha eliminado el asiento nº {bookEntry} con {accountingEntries} apuntes
+    isLinked: El asiento fue enlazado a Sage, por favor contacta con administración
     assertAction: Estas seguro de querer {action} esta factura?
 </i18n>

src/pages/InvoiceIn/Card/InvoiceInSummary.vue

@@ -27,14 +27,14 @@ const intrastatTotals = ref({ amount: 0, net: 0, stems: 0 });
 const vatColumns = ref([
     {
         name: 'expense',
-        label: 'invoicein.summary.expense',
+        label: 'invoiceIn.summary.expense',
         field: (row) => row.expenseFk,
         sortable: true,
         align: 'left',
     },
     {
         name: 'landed',
-        label: 'invoicein.summary.taxableBase',
+        label: 'invoiceIn.summary.taxableBase',
         field: (row) => row.taxableBase,
         format: (value) => toCurrency(value),
         sortable: true,
@@ -42,7 +42,7 @@ const vatColumns = ref([
     },
     {
         name: 'vat',
-        label: 'invoicein.summary.sageVat',
+        label: 'invoiceIn.summary.sageVat',
         field: (row) => {
             if (row.taxTypeSage) return `#${row.taxTypeSage.id} : ${row.taxTypeSage.vat}`;
         },
@@ -52,7 +52,7 @@ const vatColumns = ref([
     },
     {
         name: 'transaction',
-        label: 'invoicein.summary.sageTransaction',
+        label: 'invoiceIn.summary.sageTransaction',
         field: (row) => {
             if (row.transactionTypeSage)
                 return `#${row.transactionTypeSage.id} : ${row.transactionTypeSage?.transaction}`;
@@ -63,7 +63,7 @@ const vatColumns = ref([
     },
     {
         name: 'rate',
-        label: 'invoicein.summary.rate',
+        label: 'invoiceIn.summary.rate',
         field: (row) => taxRate(row.taxableBase, row.taxTypeSage?.rate),
         format: (value) => toCurrency(value),
         sortable: true,
@@ -71,7 +71,7 @@ const vatColumns = ref([
     },
     {
         name: 'currency',
-        label: 'invoicein.summary.currency',
+        label: 'invoiceIn.summary.currency',
         field: (row) => row.foreignValue,
         format: (val) => val && toCurrency(val, currency.value),
         sortable: true,
@@ -82,21 +82,21 @@ const vatColumns = ref([
 const dueDayColumns = ref([
     {
         name: 'date',
-        label: 'invoicein.summary.dueDay',
+        label: 'invoiceIn.summary.dueDay',
         field: (row) => toDate(row.dueDated),
         sortable: true,
         align: 'left',
     },
     {
         name: 'bank',
-        label: 'invoicein.summary.bank',
+        label: 'invoiceIn.summary.bank',
         field: (row) => row.bank.bank,
         sortable: true,
         align: 'left',
     },
     {
         name: 'amount',
-        label: 'invoicein.list.amount',
+        label: 'invoiceIn.list.amount',
         field: (row) => row.amount,
         format: (value) => toCurrency(value),
         sortable: true,
@@ -104,7 +104,7 @@ const dueDayColumns = ref([
     },
     {
         name: 'landed',
-        label: 'invoicein.summary.foreignValue',
+        label: 'invoiceIn.summary.foreignValue',
         field: (row) => row.foreignValue,
         format: (val) => val && toCurrency(val, currency.value),
         sortable: true,
@@ -115,7 +115,7 @@ const dueDayColumns = ref([
 const intrastatColumns = ref([
     {
         name: 'code',
-        label: 'invoicein.summary.code',
+        label: 'invoiceIn.summary.code',
         field: (row) => {
             return `${row.intrastat.id}: ${row.intrastat?.description}`;
         },
@@ -124,21 +124,21 @@ const intrastatColumns = ref([
     },
     {
         name: 'amount',
-        label: 'invoicein.list.amount',
+        label: 'invoiceIn.list.amount',
         field: (row) => toCurrency(row.amount),
         sortable: true,
         align: 'left',
     },
     {
         name: 'net',
-        label: 'invoicein.summary.net',
+        label: 'invoiceIn.summary.net',
         field: (row) => row.net,
         sortable: true,
         align: 'left',
     },
     {
         name: 'stems',
-        label: 'invoicein.summary.stems',
+        label: 'invoiceIn.summary.stems',
         field: (row) => row.stems,
         format: (value) => value,
         sortable: true,
@@ -146,7 +146,7 @@ const intrastatColumns = ref([
     },
     {
         name: 'landed',
-        label: 'invoicein.summary.country',
+        label: 'invoiceIn.summary.country',
         field: (row) => row.country?.code,
         format: (value) => value,
         sortable: true,
@@ -214,7 +214,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     />
                 </QCardSection>
                 <VnLv
-                    :label="t('invoicein.list.supplier')"
+                    :label="t('invoiceIn.list.supplier')"
                     :value="entity.supplier?.name"
                 >
                     <template #value>
@@ -225,14 +225,14 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     </template>
                 </VnLv>
                 <VnLv
-                    :label="t('invoicein.list.supplierRef')"
+                    :label="t('invoiceIn.list.supplierRef')"
                     :value="entity.supplierRef"
                 />
                 <VnLv
-                    :label="t('invoicein.summary.currency')"
+                    :label="t('invoiceIn.summary.currency')"
                     :value="entity.currency?.code"
                 />
-                <VnLv :label="t('invoicein.serial')" :value="`${entity.serial}`" />
+                <VnLv :label="t('invoiceIn.serial')" :value="`${entity.serial}`" />
                 <VnLv
                     :label="t('globals.country')"
                     :value="entity.supplier?.country?.code"
@@ -247,19 +247,19 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 </QCardSection>
                 <VnLv
                     :ellipsis-value="false"
-                    :label="t('invoicein.summary.issued')"
+                    :label="t('invoiceIn.summary.issued')"
                     :value="toDate(entity.issued)"
                 />
                 <VnLv
-                    :label="t('invoicein.summary.operated')"
+                    :label="t('invoiceIn.summary.operated')"
                     :value="toDate(entity.operated)"
                 />
                 <VnLv
-                    :label="t('invoicein.summary.bookEntried')"
+                    :label="t('invoiceIn.summary.bookEntried')"
                     :value="toDate(entity.bookEntried)"
                 />
                 <VnLv
-                    :label="t('invoicein.summary.bookedDate')"
+                    :label="t('invoiceIn.summary.bookedDate')"
                     :value="toDate(entity.booked)"
                 />
                 <VnLv :label="t('globals.isVies')" :value="entity.supplier?.isVies" />
@@ -272,18 +272,18 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     />
                 </QCardSection>
                 <VnLv
-                    :label="t('invoicein.summary.sage')"
+                    :label="t('invoiceIn.summary.sage')"
                     :value="entity.sageWithholding?.withholding"
                 />
                 <VnLv
-                    :label="t('invoicein.summary.vat')"
+                    :label="t('invoiceIn.summary.vat')"
                     :value="entity.expenseDeductible?.name"
                 />
                 <VnLv
-                    :label="t('invoicein.card.company')"
+                    :label="t('invoiceIn.card.company')"
                     :value="entity.company?.code"
                 />
-                <VnLv :label="t('invoicein.isBooked')" :value="invoiceIn?.isBooked" />
+                <VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
             </QCard>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
@@ -294,11 +294,11 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 </QCardSection>
                 <QCardSection class="q-pa-none">
                     <VnLv
-                        :label="t('invoicein.summary.taxableBase')"
+                        :label="t('invoiceIn.summary.taxableBase')"
                         :value="toCurrency(entity.totals.totalTaxableBase)"
                     />
                     <VnLv label="Total" :value="toCurrency(entity.totals.totalVat)" />
-                    <VnLv :label="t('invoicein.summary.dueTotal')">
+                    <VnLv :label="t('invoiceIn.summary.dueTotal')">
                         <template #value>
                             <QChip
                                 dense
@@ -306,8 +306,8 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                                 :color="amountsNotMatch ? 'negative' : 'transparent'"
                                 :title="
                                     amountsNotMatch
-                                        ? t('invoicein.summary.noMatch')
-                                        : t('invoicein.summary.dueTotal')
+                                        ? t('invoiceIn.summary.noMatch')
+                                        : t('invoiceIn.summary.dueTotal')
                                 "
                             >
                                 {{ toCurrency(entity.totals.totalDueDay) }}
@@ -318,7 +318,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
             </QCard>
             <!--Vat-->
             <QCard v-if="entity.invoiceInTax.length" class="vat">
-                <VnTitle :url="getLink('vat')" :text="t('invoicein.card.vat')" />
+                <VnTitle :url="getLink('vat')" :text="t('invoiceIn.card.vat')" />
                 <QTable
                     :columns="vatColumns"
                     :rows="entity.invoiceInTax"
@@ -366,7 +366,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
             </QCard>
             <!--Due Day-->
             <QCard v-if="entity.invoiceInDueDay.length" class="due-day">
-                <VnTitle :url="getLink('due-day')" :text="t('invoicein.card.dueDay')" />
+                <VnTitle :url="getLink('due-day')" :text="t('invoiceIn.card.dueDay')" />
                 <QTable :columns="dueDayColumns" :rows="entity.invoiceInDueDay" flat>
                     <template #header="dueDayProps">
                         <QTr :props="dueDayProps" class="bg">
@@ -404,7 +404,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
             <QCard v-if="entity.invoiceInIntrastat.length">
                 <VnTitle
                     :url="getLink('intrastat')"
-                    :text="t('invoicein.card.intrastat')"
+                    :text="t('invoiceIn.card.intrastat')"
                 />
                 <QTable
                     :columns="intrastatColumns"

src/pages/InvoiceIn/InvoiceInCreate.vue

@@ -83,7 +83,7 @@ const redirectToInvoiceInBasicData = (__, { id }) => {
                         </template>
                     </VnSelect>
                     <VnInput
-                        :label="t('invoicein.list.supplierRef')"
+                        :label="t('invoiceIn.list.supplierRef')"
                         v-model="data.supplierRef"
                     />
                 </VnRow>
@@ -97,10 +97,10 @@ const redirectToInvoiceInBasicData = (__, { id }) => {
                         map-options
                         hide-selected
                         :required="true"
-                        :rules="validate('invoicein.companyFk')"
+                        :rules="validate('invoiceIn.companyFk')"
                     />
                     <VnInputDate
-                        :label="t('invoicein.summary.issued')"
+                        :label="t('invoiceIn.summary.issued')"
                         v-model="data.issued"
                     />
                 </VnRow>

src/pages/InvoiceIn/InvoiceInFilter.vue

@@ -164,7 +164,7 @@ function handleDaysAgo(params, daysAgo) {
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="$t('invoicein.isBooked')"
+                        :label="$t('invoiceIn.isBooked')"
                         v-model="params.isBooked"
                         @update:model-value="searchFn()"
                         toggle-indeterminate

src/pages/InvoiceIn/InvoiceInList.vue

@@ -8,17 +8,17 @@ import InvoiceInFilter from './InvoiceInFilter.vue';
 import InvoiceInSummary from './Card/InvoiceInSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import InvoiceInSearchbar from 'src/pages/InvoiceIn/InvoiceInSearchbar.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import FetchData from 'src/components/FetchData.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const user = useState().getUser();
 const { viewSummary } = useSummaryDialog();
 const { t } = useI18n();
+const dataKey = 'InvoiceInList';
 
 const tableRef = ref();
 const companies = ref([]);
@@ -26,7 +26,7 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'isBooked',
-        label: t('invoicein.isBooked'),
+        label: t('invoiceIn.isBooked'),
         columnFilter: false,
     },
     {
@@ -41,7 +41,7 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'supplierFk',
-        label: t('invoicein.list.supplier'),
+        label: t('invoiceIn.list.supplier'),
         columnFilter: {
             component: 'select',
             attrs: {
@@ -55,16 +55,16 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'supplierRef',
-        label: t('invoicein.list.supplierRef'),
+        label: t('invoiceIn.list.supplierRef'),
     },
     {
         align: 'left',
         name: 'serial',
-        label: t('invoicein.serial'),
+        label: t('invoiceIn.serial'),
     },
     {
         align: 'left',
-        label: t('invoicein.list.issued'),
+        label: t('invoiceIn.list.issued'),
         name: 'issued',
         component: null,
         columnFilter: {
@@ -74,7 +74,7 @@ const cols = computed(() => [
     },
     {
         align: 'left',
-        label: t('invoicein.list.dueDated'),
+        label: t('invoiceIn.list.dueDated'),
         name: 'dueDated',
         component: null,
         columnFilter: {
@@ -86,12 +86,12 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'awbCode',
-        label: t('invoicein.list.awb'),
+        label: t('invoiceIn.list.awb'),
     },
     {
         align: 'left',
         name: 'amount',
-        label: t('invoicein.list.amount'),
+        label: t('invoiceIn.list.amount'),
         format: ({ amount }) => toCurrency(amount),
         cardVisible: true,
     },
@@ -130,71 +130,84 @@ const cols = computed(() => [
     },
 ]);
 </script>
+
 <template>
     <FetchData url="Companies" @on-fetch="(data) => (companies = data)" auto-load />
-    <InvoiceInSearchbar />
-    <RightMenu>
-        <template #right-panel>
-            <InvoiceInFilter data-key="InvoiceInList" />
-        </template>
-    </RightMenu>
-    <VnTable
-        ref="tableRef"
-        data-key="InvoiceInList"
-        url="InvoiceIns/filter"
-        :order="['issued DESC', 'id DESC']"
-        :create="{
-            urlCreate: 'InvoiceIns',
-            title: t('globals.createInvoiceIn'),
-            onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: { companyFk: user.companyFk, issued: Date.vnNew() },
-        }"
-        redirect="invoice-in"
+    <VnSection
+        :data-key
         :columns="cols"
-        :right-search="false"
-        :disable-option="{ card: true }"
-        :auto-load="!!$route.query.table"
+        prefix="invoiceIn"
+        :array-data-props="{
+            url: 'InvoiceIns/filter',
+            order: ['issued DESC', 'id DESC'],
+        }"
     >
-        <template #column-supplierFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.supplierName }}
-                <SupplierDescriptorProxy :id="row.supplierFk" />
-            </span>
+        <template #advanced-menu>
+            <InvoiceInFilter :data-key />
         </template>
-        <template #more-create-dialog="{ data }">
-            <VnSelect
-                v-model="data.supplierFk"
-                url="Suppliers"
-                :fields="['id', 'nickname', 'name']"
-                :label="t('globals.supplier')"
-                option-value="id"
-                option-label="nickname"
-                :filter-options="['id', 'name', 'nickname']"
-                :required="true"
+        <template #body>
+            <VnTable
+                ref="tableRef"
+                :data-key
+                :create="{
+                    urlCreate: 'InvoiceIns',
+                    title: t('globals.createInvoiceIn'),
+                    onDataSaved: ({ id }) => tableRef.redirect(id),
+                    formInitialData: { companyFk: user.companyFk, issued: Date.vnNew() },
+                }"
+                redirect="invoice-in"
+                :columns="cols"
+                :right-search="false"
+                :disable-option="{ card: true }"
+                :auto-load="!!$route.query.table"
             >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
-                            <QItemLabel caption> #{{ scope.opt?.id }}, {{  scope.opt?.name }} </QItemLabel>
-                        </QItemSection>
-                    </QItem>
+                <template #column-supplierFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.supplierName }}
+                        <SupplierDescriptorProxy :id="row.supplierFk" />
+                    </span>
                 </template>
-            </VnSelect>
-            <VnInput
-                :label="t('invoicein.list.supplierRef')"
-                v-model="data.supplierRef"
-            />
-            <VnSelect
-                url="Companies"
-                :label="t('globals.company')"
-                :fields="['id', 'code']"
-                v-model="data.companyFk"
-                option-value="id"
-                option-label="code"
-                :required="true"
-            />
-            <VnInputDate :label="t('invoicein.summary.issued')" v-model="data.issued" />
+                <template #more-create-dialog="{ data }">
+                    <VnSelect
+                        v-model="data.supplierFk"
+                        url="Suppliers"
+                        :fields="['id', 'name', 'nickname']"
+                        :label="t('globals.supplier')"
+                        option-value="id"
+                        option-label="nickname"
+                        :filter-options="['id', 'name', 'nickname']"
+                        :required="true"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        #{{ scope.opt?.id }}, {{ scope.opt?.name }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnInput
+                        :label="t('invoiceIn.list.supplierRef')"
+                        v-model="data.supplierRef"
+                    />
+                    <VnSelect
+                        url="Companies"
+                        :label="t('globals.company')"
+                        :fields="['id', 'code']"
+                        v-model="data.companyFk"
+                        option-value="id"
+                        option-label="code"
+                        :required="true"
+                    />
+                    <VnInputDate
+                        :label="t('invoiceIn.summary.issued')"
+                        v-model="data.issued"
+                    />
+                </template>
+            </VnTable>
         </template>
-    </VnTable>
+    </VnSection>
 </template>

src/pages/InvoiceIn/InvoiceInSearchbar.vue

@@ -1,18 +0,0 @@
-<script setup>
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import { useI18n } from 'vue-i18n';
-const { t } = useI18n();
-</script>
-<template>
-    <VnSearchbar
-        data-key="InvoiceInList"
-        :label="t('Search invoice')"
-        :info="t('Search invoices in by id or supplier fiscal name')"
-        url="InvoiceIns/filter"
-    />
-</template>
-<i18n>
-es:
-    Search invoice: Buscar factura recibida
-    Search invoices in by id or supplier fiscal name: Buscar facturas recibidas por id o por nombre fiscal del proveedor
-</i18n>

src/pages/InvoiceIn/locale/en.yml

@@ -1,4 +1,6 @@
-invoicein:
+invoiceIn:
+    search: Search invoice
+    searchInfo: Search incoming invoices by ID or supplier fiscal name
     serial: Serial
     isBooked: Is booked
     list:

src/pages/InvoiceIn/locale/es.yml

@@ -1,4 +1,6 @@
-invoicein:
+invoiceIn:
+    search: Buscar factura recibida
+    searchInfo: Buscar facturas recibidas por ID o nombre fiscal del proveedor
     serial: Serie
     isBooked: Contabilizada
     list:
@@ -63,6 +65,7 @@ invoicein:
     params:
         search: Id o nombre proveedor
         correctedFk: Rectificada
+        isBooked: Contabilizada
         account: Cuenta contable
         correctingFk: Rectificativa
 

src/pages/InvoiceOut/Card/InvoiceOutCard.vue

@@ -1,19 +1,11 @@
 <script setup>
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
-import VnCard from 'components/common/VnCard.vue';
-import InvoiceOutFilter from '../InvoiceOutFilter.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 </script>
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="InvoiceOut"
         base-url="InvoiceOuts"
         :descriptor="InvoiceOutDescriptor"
-        :filter-panel="InvoiceOutFilter"
-        search-data-key="InvoiceOutList"
-        :searchbar-props="{
-            url: 'InvoiceOuts/filter',
-            label: 'Search invoice',
-            info: 'You can search by invoice reference',
-        }"
     />
 </template>

src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue

@@ -62,6 +62,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         :subtitle="data.subtitle"
         @on-fetch="setData"
         data-key="invoiceOutData"
+        width="lg-width"
     >
         <template #menu="{ entity, menuRef }">
             <InvoiceOutDescriptorMenu :invoice-out-data="entity" :menu-ref="menuRef" />

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -3,7 +3,6 @@ import { ref, computed, watchEffect } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { usePrintService } from 'src/composables/usePrintService';
@@ -12,12 +11,12 @@ import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
 import { toCurrency, toDate } from 'src/filters/index';
 import { QBtn } from 'quasar';
 import axios from 'axios';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import InvoiceOutFilter from './InvoiceOutFilter.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 import VnRadio from 'src/components/common/VnRadio.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -30,9 +29,11 @@ const MODEL = 'InvoiceOuts';
 const { openReport } = usePrintService();
 const addressOptions = ref([]);
 const selectedOption = ref('ticket');
+const dataKey = 'InvoiceOutList';
+
 async function fetchClientAddress(id) {
     const { data } = await axios.get(
-        `Clients/${id}/addresses?filter[order]=isActive DESC`
+        `Clients/${id}/addresses?filter[order]=isActive DESC`,
     );
     addressOptions.value = data;
 }
@@ -180,223 +181,239 @@ watchEffect(selectedRows);
 </script>
 
 <template>
-    <VnSearchbar
-        :info="t('youCanSearchByInvoiceReference')"
-        :label="t('Search invoice')"
-        data-key="invoiceOutList"
-    />
-    <RightMenu>
-        <template #right-panel>
-            <InvoiceOutFilter data-key="invoiceOutList" />
-        </template>
-    </RightMenu>
-    <VnSubToolbar>
-        <template #st-actions>
-            <QBtn
-                color="primary"
-                icon-right="cloud_download"
-                @click="downloadPdf()"
-                :disable="!hasSelectedCards"
-                data-cy="InvoiceOutDownloadPdfBtn"
-            >
-                <QTooltip>{{ t('downloadPdf') }}</QTooltip>
-            </QBtn>
-        </template>
-    </VnSubToolbar>
-    <VnTable
-        ref="tableRef"
-        data-key="invoiceOutList"
-        :url="`${MODEL}/filter`"
-        :create="{
-            urlCreate: 'InvoiceOuts/createManualInvoice',
-            title: t('createManualInvoice'),
-            onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: { active: true },
-        }"
-        :right-search="false"
-        v-model:selected="selectedRows"
-        order="id DESC"
+    <VnSection
+        :data-key="dataKey"
         :columns="columns"
-        redirect="invoice-out"
-        :table="{
-            'row-key': 'id',
-            selection: 'multiple',
+        prefix="invoiceOut"
+        :array-data-props="{
+            url: 'InvoiceOuts/filter',
+            order: ['id DESC'],
         }"
     >
-        <template #column-clientFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.clientSocialName }}
-                <CustomerDescriptorProxy :id="row.clientFk" />
-            </span>
+        <template #advanced-menu>
+            <InvoiceOutFilter data-key="InvoiceOutList" />
         </template>
-        <template #more-create-dialog="{ data }">
-            <div class="row q-col-gutter-xs">
-                <div class="col-12">
-                    <div class="q-col-gutter-xs">
-                        <VnRow fixed>
-                            <VnRadio
-                                v-model="selectedOption"
-                                val="ticket"
-                                :label="t('globals.ticket')"
-                                class="q-my-none q-mr-md"
-                            />
+        <template #body>
+            <VnSubToolbar>
+                <template #st-actions>
+                    <QBtn
+                        color="primary"
+                        icon-right="cloud_download"
+                        @click="downloadPdf()"
+                        :disable="!hasSelectedCards"
+                        data-cy="InvoiceOutDownloadPdfBtn"
+                    >
+                        <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
+                    </QBtn>
+                </template>
+            </VnSubToolbar>
+            <VnTable
+                ref="tableRef"
+                :data-key="dataKey"
+                :create="{
+                    urlCreate: 'InvoiceOuts/createManualInvoice',
+                    title: t('createManualInvoice'),
+                    onDataSaved: ({ id }) => tableRef.redirect(id),
+                    formInitialData: { active: true },
+                }"
+                :right-search="false"
+                v-model:selected="selectedRows"
+                :columns="columns"
+                redirect="invoice-out"
+                :table="{
+                    'row-key': 'id',
+                    selection: 'multiple',
+                }"
+            >
+                <template #column-clientFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.clientSocialName }}
+                        <CustomerDescriptorProxy :id="row.clientFk" />
+                    </span>
+                </template>
+                <template #more-create-dialog="{ data }">
+                    <div class="row q-col-gutter-xs">
+                        <div class="col-12">
+                            <div class="q-col-gutter-xs">
+                                <VnRow fixed>
+                                    <VnRadio
+                                        v-model="selectedOption"
+                                        val="ticket"
+                                        :label="t('globals.ticket')"
+                                        class="q-my-none q-mr-md"
+                                    />
 
-                            <VnInput
-                                v-show="selectedOption === 'ticket'"
-                                v-model="data.ticketFk"
-                                :label="t('globals.ticket')"
-                                style="flex: 1"
-                                data-cy="InvoiceOutCreateTicketinput"
-                            />
+                                    <VnInput
+                                        v-show="selectedOption === 'ticket'"
+                                        v-model="data.ticketFk"
+                                        :label="t('globals.ticket')"
+                                        style="flex: 1"
+                                        data-cy="InvoiceOutCreateTicketinput"
+                                    />
 
-                            <div
-                                class="row q-col-gutter-xs q-ml-none"
-                                v-show="selectedOption !== 'ticket'"
-                            >
-                                <div class="col">
-                                    <VnSelect
-                                        v-model="data.clientFk"
+                                    <div
+                                        class="row q-col-gutter-xs q-ml-none"
+                                        v-show="selectedOption !== 'ticket'"
+                                    >
+                                        <div class="col">
+                                            <VnSelect
+                                                v-model="data.clientFk"
+                                                :label="t('globals.client')"
+                                                url="Clients"
+                                                :options="customerOptions"
+                                                option-label="name"
+                                                option-value="id"
+                                                @update:model-value="fetchClientAddress"
+                                            >
+                                                <template #option="scope">
+                                                    <QItem v-bind="scope.itemProps">
+                                                        <QItemSection>
+                                                            <QItemLabel>
+                                                                #{{ scope.opt?.id }} -
+                                                                {{ scope.opt?.name }}
+                                                            </QItemLabel>
+                                                        </QItemSection>
+                                                    </QItem>
+                                                </template>
+                                            </VnSelect>
+                                        </div>
+                                        <div class="col">
+                                            <VnSelect
+                                                v-model="data.addressFk"
+                                                :label="t('ticket.summary.consignee')"
+                                                :options="addressOptions"
+                                                option-label="nickname"
+                                                option-value="id"
+                                                v-if="
+                                                    data.clientFk &&
+                                                    selectedOption === 'consignatario'
+                                                "
+                                            >
+                                                <template #option="scope">
+                                                    <QItem v-bind="scope.itemProps">
+                                                        <QItemSection>
+                                                            <QItemLabel
+                                                                :class="{
+                                                                    'color-vn-label':
+                                                                        !scope.opt
+                                                                            ?.isActive,
+                                                                }"
+                                                            >
+                                                                {{
+                                                                    `${
+                                                                        !scope.opt
+                                                                            ?.isActive
+                                                                            ? t(
+                                                                                  'inactive',
+                                                                              )
+                                                                            : ''
+                                                                    } `
+                                                                }}
+                                                                <span>{{
+                                                                    scope.opt?.nickname
+                                                                }}</span>
+                                                                <span
+                                                                    v-if="
+                                                                        scope.opt
+                                                                            ?.province ||
+                                                                        scope.opt?.city ||
+                                                                        scope.opt?.street
+                                                                    "
+                                                                >
+                                                                    ,
+                                                                    {{
+                                                                        scope.opt?.street
+                                                                    }},
+                                                                    {{ scope.opt?.city }},
+                                                                    {{
+                                                                        scope.opt
+                                                                            ?.province
+                                                                            ?.name
+                                                                    }}
+                                                                    -
+                                                                    {{
+                                                                        scope.opt
+                                                                            ?.agencyMode
+                                                                            ?.name
+                                                                    }}
+                                                                </span>
+                                                            </QItemLabel>
+                                                        </QItemSection>
+                                                    </QItem>
+                                                </template>
+                                            </VnSelect>
+                                        </div>
+                                    </div>
+                                </VnRow>
+                                <VnRow fixed>
+                                    <VnRadio
+                                        v-model="selectedOption"
+                                        val="cliente"
                                         :label="t('globals.client')"
-                                        url="Clients"
-                                        :options="customerOptions"
-                                        option-label="name"
-                                        option-value="id"
-                                        @update:model-value="fetchClientAddress"
-                                    >
-                                        <template #option="scope">
-                                            <QItem v-bind="scope.itemProps">
-                                                <QItemSection>
-                                                    <QItemLabel>
-                                                        #{{ scope.opt?.id }} -
-                                                        {{ scope.opt?.name }}
-                                                    </QItemLabel>
-                                                </QItemSection>
-                                            </QItem>
-                                        </template>
-                                    </VnSelect>
-                                </div>
-                                <div class="col">
-                                    <VnSelect
-                                        v-model="data.addressFk"
+                                        class="q-my-none q-mr-md"
+                                    />
+                                </VnRow>
+                                <VnRow fixed>
+                                    <VnRadio
+                                        v-model="selectedOption"
+                                        val="consignatario"
                                         :label="t('ticket.summary.consignee')"
-                                        :options="addressOptions"
-                                        option-label="nickname"
-                                        option-value="id"
-                                        v-if="
-                                            data.clientFk &&
-                                            selectedOption === 'consignatario'
-                                        "
-                                    >
-                                        <template #option="scope">
-                                            <QItem v-bind="scope.itemProps">
-                                                <QItemSection>
-                                                    <QItemLabel
-                                                        :class="{
-                                                            'color-vn-label':
-                                                                !scope.opt?.isActive,
-                                                        }"
-                                                    >
-                                                        {{
-                                                            `${
-                                                                !scope.opt?.isActive
-                                                                    ? t('inactive')
-                                                                    : ''
-                                                            } `
-                                                        }}
-                                                        <span>{{
-                                                            scope.opt?.nickname
-                                                        }}</span>
-                                                        <span
-                                                            v-if="
-                                                                scope.opt?.province ||
-                                                                scope.opt?.city ||
-                                                                scope.opt?.street
-                                                            "
-                                                        >
-                                                            , {{ scope.opt?.street }},
-                                                            {{ scope.opt?.city }},
-                                                            {{
-                                                                scope.opt?.province?.name
-                                                            }}
-                                                            -
-                                                            {{
-                                                                scope.opt?.agencyMode
-                                                                    ?.name
-                                                            }}
-                                                        </span>
-                                                    </QItemLabel>
-                                                </QItemSection>
-                                            </QItem>
-                                        </template>
-                                    </VnSelect>
-                                </div>
+                                        class="q-my-none q-mr-md"
+                                    />
+                                </VnRow>
                             </div>
-                        </VnRow>
-                        <VnRow fixed>
-                            <VnRadio
-                                v-model="selectedOption"
-                                val="cliente"
-                                :label="t('globals.client')"
-                                class="q-my-none q-mr-md"
-                            />
-                        </VnRow>
-                        <VnRow fixed>
-                            <VnRadio
-                                v-model="selectedOption"
-                                val="consignatario"
-                                :label="t('ticket.summary.consignee')"
-                                class="q-my-none q-mr-md"
-                            />
-                        </VnRow>
+                        </div>
+                        <div class="full-width">
+                            <VnRow class="row q-col-gutter-xs">
+                                <VnSelect
+                                    url="InvoiceOutSerials"
+                                    v-model="data.serial"
+                                    :label="t('invoicein.serial')"
+                                    :options="invoiceOutSerialsOptions"
+                                    option-label="description"
+                                    option-value="code"
+                                    option-filter
+                                    :expr-builder="exprBuilder"
+                                    data-cy="InvoiceOutCreateSerialSelect"
+                                >
+                                    <template #option="scope">
+                                        <QItem v-bind="scope.itemProps">
+                                            <QItemSection>
+                                                <QItemLabel>
+                                                    {{ scope.opt?.code }} -
+                                                    {{ scope.opt?.description }}
+                                                </QItemLabel>
+                                            </QItemSection>
+                                        </QItem>
+                                    </template>
+                                </VnSelect>
+                                <VnInputDate
+                                    :label="t('invoiceOut.summary.dued')"
+                                    v-model="data.maxShipped"
+                                />
+                            </VnRow>
+                            <VnRow class="row q-col-gutter-xs">
+                                <VnSelect
+                                    url="TaxAreas"
+                                    v-model="data.taxArea"
+                                    :label="
+                                        t('invoiceOutList.tableVisibleColumns.taxArea')
+                                    "
+                                    :options="taxAreasOptions"
+                                    option-label="code"
+                                    option-value="code"
+                                />
+                                <VnInput
+                                    v-model="data.reference"
+                                    :label="t('globals.reference')"
+                                />
+                            </VnRow>
+                        </div>
                     </div>
-                </div>
-                <div class="full-width">
-                    <VnRow class="row q-col-gutter-xs">
-                        <VnSelect
-                            url="InvoiceOutSerials"
-                            v-model="data.serial"
-                            :label="t('invoicein.serial')"
-                            :options="invoiceOutSerialsOptions"
-                            option-label="description"
-                            option-value="code"
-                            option-filter
-                            :expr-builder="exprBuilder"
-                            data-cy="InvoiceOutCreateSerialSelect"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>
-                                            {{ scope.opt?.code }} -
-                                            {{ scope.opt?.description }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                        <VnInputDate
-                            :label="t('invoiceOut.summary.dued')"
-                            v-model="data.maxShipped"
-                        />
-                    </VnRow>
-                    <VnRow class="row q-col-gutter-xs">
-                        <VnSelect
-                            url="TaxAreas"
-                            v-model="data.taxArea"
-                            :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
-                            :options="taxAreasOptions"
-                            option-label="code"
-                            option-value="code"
-                        />
-                        <VnInput
-                            v-model="data.reference"
-                            :label="t('globals.reference')"
-                        />
-                    </VnRow>
-                </div>
-            </div>
+                </template>
+            </VnTable>
         </template>
-    </VnTable>
+    </VnSection>
 </template>
 
 <style lang="scss" scoped>

src/pages/InvoiceOut/InvoiceOutNegativeBases.vue

@@ -39,7 +39,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'country',
-        label: t('negativeBases.country'),
+        label: t('invoiceOut.negativeBases.country'),
         component: 'select',
         attrs: {
             url: 'Countries',
@@ -53,7 +53,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'clientId',
-        label: t('negativeBases.clientId'),
+        label: t('invoiceOut.negativeBases.clientId'),
         cardVisible: true,
     },
     {
@@ -85,28 +85,28 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'taxableBase',
-        label: t('negativeBases.base'),
+        label: t('invoiceOut.negativeBases.base'),
     },
     {
         align: 'left',
         name: 'ticketFk',
-        label: t('negativeBases.ticketId'),
+        label: t('invoiceOut.negativeBases.ticketId'),
         cardVisible: true,
     },
     {
         align: 'left',
         name: 'isActive',
-        label: t('negativeBases.active'),
+        label: t('invoiceOut.negativeBases.active'),
     },
     {
         align: 'left',
         name: 'hasToInvoice',
-        label: t('negativeBases.hasToInvoice'),
+        label: t('invoiceOut.negativeBases.hasToInvoice'),
     },
     {
         align: 'left',
         name: 'hasVerifiedData',
-        label: t('negativeBases.verifiedData'),
+        label: t('invoiceOut.negativeBases.verifiedData'),
     },
     {
         align: 'left',

src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue

@@ -105,28 +105,3 @@ const props = defineProps({
         </template>
     </VnFilterPanel>
 </template>
-
-<i18n>
-en:
-    params:
-        from: From
-        to: To
-        company: Company
-        country: Country
-        clientId: Client Id
-        clientSocialName: Client
-        amount: Amount
-        comercialName: Comercial
-es:
-    params:
-        from: Desde
-        to: Hasta
-        company: Empresa
-        country: País
-        clientId: Id cliente
-        clientSocialName: Cliente
-        amount: Importe
-        comercialName: Comercial
-    Date is required: La fecha es requerida
-
-</i18n>

src/pages/InvoiceOut/locale/en.yml

@@ -1,3 +1,60 @@
+invoiceOut:
+    search: Search invoice
+    searchInfo: You can search by invoice reference
+    params:
+        company: Company
+        country: Country
+        clientId: Client ID
+        clientSocialName: Client
+        taxableBase: Base
+        ticketFk: Ticket
+        isActive: Active
+        hasToInvoice: Has to invoice
+        hasVerifiedData: Verified data
+        workerName: Worker
+    card:
+        issued: Issued
+        customerCard: Customer card
+        ticketList: Ticket List
+    summary:
+        issued: Issued
+        dued: Due
+        booked: Booked
+        taxBreakdown: Tax breakdown
+        taxableBase: Taxable base
+        rate: Rate
+        fee: Fee
+        tickets: Tickets
+        totalWithVat: Amount
+    globalInvoices:
+        errors:
+            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
+            noTicketsToInvoice: There are not tickets to invoice
+            criticalInvoiceError: 'Critical invoicing error, process stopped'
+            invalidSerialTypeForAll: The serial type must be global when invoicing all clients
+        table:
+            addressId: Address id
+            streetAddress: Street
+        statusCard:
+            percentageText: '{getPercentage}% {getAddressNumber} of {getNAddresses}'
+            pdfsNumberText: '{nPdfs} of {totalPdfs} PDFs'
+    negativeBases:
+        country: Country
+        clientId: Client Id
+        base: Base
+        ticketId: Ticket
+        active: Active
+        hasToInvoice: Has to Invoice
+        verifiedData: Verified Data
+        comercial: Commercial
+        errors:
+            downloadCsvFailed: CSV download failed
 invoiceOutModule:
     customer: Client
     amount: Amount
@@ -13,27 +70,4 @@ invoiceOutList:
         invoiceOutSerial: Serial
         ticket: Ticket
         taxArea: Tax area
-        customsAgent: Custom Agent
-DownloadPdf: Download PDF
-InvoiceOutSummary: Summary
-negativeBases:
-    country: Country
-    clientId: Client ID
-    base: Base
-    ticketId: Ticket
-    active: Active
-    hasToInvoice: Has to invoice
-    verifiedData: Verified data
-    commercial: Commercial
-invoiceout:
-    params:
-        company: Company
-        country: Country
-        clientId: Client ID
-        clientSocialName: Client
-        taxableBase: Base
-        ticketFk: Ticket
-        isActive: Active
-        hasToInvoice: Has to invoice
-        hasVerifiedData: Verified data
-        workerName: Worker
+        customsAgent: Custom Agent    

src/pages/InvoiceOut/locale/es.yml

@@ -1,5 +1,60 @@
-Search invoice: Buscar factura emitida
-You can search by invoice reference: Puedes buscar por referencia de la factura
+invoiceOut:
+    search: Buscar factura emitida
+    searchInfo: Puedes buscar por referencia de la factura
+    params:
+        company: Empresa
+        country: País
+        clientId: ID del cliente
+        clientSocialName: Cliente
+        taxableBase: Base
+        ticketFk: Ticket
+        isActive: Activo
+        hasToInvoice: Debe facturar
+        hasVerifiedData: Datos verificados
+        workerName: Comercial   
+    card:
+        issued: Fecha emisión
+        customerCard: Ficha del cliente
+        ticketList: Listado de tickets
+    summary:
+        issued: Fecha
+        dued: Fecha límite
+        booked: Contabilizada
+        taxBreakdown: Desglose impositivo
+        taxableBase: Base imp.
+        rate: Tarifa
+        fee: Cuota
+        tickets: Tickets
+        totalWithVat: Importe
+    globalInvoices:
+        errors:
+            chooseValidClient: Selecciona un cliente válido
+            chooseValidCompany: Selecciona una empresa válida
+            chooseValidPrinter: Selecciona una impresora válida
+            chooseValidSerialType: Selecciona una tipo de serie válida
+            fillDates: La fecha de la factura y la fecha máxima deben estar completas
+            invoiceDateLessThanMaxDate: La fecha de la factura no puede ser menor que la fecha máxima
+            invoiceWithFutureDate: Existe una factura con una fecha futura
+            noTicketsToInvoice: No existen tickets para facturar
+            criticalInvoiceError: Error crítico en la facturación proceso detenido
+            invalidSerialTypeForAll: El tipo de serie debe ser global cuando se facturan todos los clientes
+        table:
+            addressId: Id dirección
+            streetAddress: Dirección fiscal
+        statusCard:
+            percentageText: '{getPercentage}% {getAddressNumber} de {getNAddresses}'
+            pdfsNumberText: '{nPdfs} de {totalPdfs} PDFs'
+    negativeBases:
+        country: País
+        clientId: Id cliente
+        base: Base
+        ticketId: Ticket
+        active: Activo
+        hasToInvoice: Facturar
+        verifiedData: Datos comprobados
+        comercial: Comercial
+        errors:
+            downloadCsvFailed: Error al descargar CSV 
 invoiceOutModule:
     customer: Cliente
     amount: Importe
@@ -15,28 +70,4 @@ invoiceOutList:
         invoiceOutSerial: Serial
         ticket: Ticket
         taxArea: Area
-        customsAgent: Agente de aduanas
-DownloadPdf: Descargar PDF
-InvoiceOutSummary: Resumen
-negativeBases:
-    country: País
-    clientId: ID del cliente
-    client: Cliente
-    base: Base
-    ticketId: Ticket
-    active: Activo
-    hasToInvoice: Debe facturar
-    verifiedData: Datos verificados
-    commercial: Comercial
-invoiceout:
-    params:
-        company: Empresa
-        country: País
-        clientId: ID del cliente
-        clientSocialName: Cliente
-        taxableBase: Base
-        ticketFk: Ticket
-        isActive: Activo
-        hasToInvoice: Debe facturar
-        hasVerifiedData: Datos verificados
-        workerName: Comercial
+        customsAgent: Agente de aduanas

src/pages/Item/Card/ItemCard.vue

@@ -1,19 +1,11 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ItemDescriptor from './ItemDescriptor.vue';
-import ItemListFilter from '../ItemListFilter.vue';
 </script>
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="Item"
         base-url="Items"
         :descriptor="ItemDescriptor"
-        :filter-panel="ItemListFilter"
-        search-data-key="ItemList"
-        :searchbar-props="{
-            url: 'Items/filter',
-            label: 'searchbar.label',
-            info: 'searchbar.info',
-        }"
     />
 </template>

src/pages/Item/ItemList.vue

@@ -6,18 +6,17 @@ import VnImg from 'src/components/ui/VnImg.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import { toDate } from 'src/filters';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import ItemSummary from '../Item/Card/ItemSummary.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
 import ItemTypeDescriptorProxy from './ItemType/Card/ItemTypeDescriptorProxy.vue';
 import { cloneItem } from 'src/pages/Item/composables/cloneItem';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import ItemListFilter from './ItemListFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import axios from 'axios';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const entityId = computed(() => route.params.id);
 const { openCloneDialog } = cloneItem();
@@ -25,9 +24,11 @@ const { viewSummary } = useSummaryDialog();
 const { t } = useI18n();
 const tableRef = ref();
 const route = useRoute();
+const dataKey = 'ItemList';
 const validPriorities = ref([]);
 const defaultTag = ref();
 const defaultPriority = ref();
+
 const itemFilter = {
     include: [
         {
@@ -324,166 +325,174 @@ onBeforeMount(async () => {
     });
 });
 </script>
+
 <template>
-    <VnSearchbar
-        data-key="ItemList"
-        :label="t('item.searchbar.label')"
-        :info="t('item.searchbar.info')"
-    />
-    <RightMenu>
-        <template #right-panel>
+    <VnSection
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="item"
+        :array-data-props="{
+            url: 'Items/filter',
+            order: ['isActive DESC', 'name', 'id'],
+            userFilter: itemFilter,
+        }"
+    >
+        <template #advanced-menu>
             <ItemListFilter data-key="ItemList" />
         </template>
-    </RightMenu>
-    <VnTable
-        v-if="defaultTag"
-        ref="tableRef"
-        data-key="ItemList"
-        url="Items/filter"
-        :create="{
-            urlCreate: 'Items/new',
-            title: t('item.list.newItem'),
-            onDataSaved: ({ id }) => tableRef.redirect(`${id}/basic-data`),
-            formInitialData: {
-                editorFk: entityId,
-                tag: defaultTag,
-                priority: defaultPriority,
-            },
-        }"
-        :order="['isActive DESC', 'name', 'id']"
-        :columns="columns"
-        redirect="Item"
-        :is-editable="false"
-        :right-search="false"
-        :filter="itemFilter"
-    >
-        <template #column-image="{ row }">
-            <VnImg
-                :id="row?.id"
-                zoom-resolution="1600x900"
-                :zoom="true"
-                class="rounded"
-            />
-        </template>
-        <template #column-id="{ row }">
-            <span class="link" @click.stop>
-                {{ row.id }}
-                <ItemDescriptorProxy :id="row.id" />
-            </span>
-        </template>
-        <template #column-typeName="{ row }">
-            <span class="link" @click.stop>
-                {{ row.typeName }}
-                {{ row.typeFk }}
-                <ItemTypeDescriptorProxy :id="row.typeFk" />
-            </span>
-        </template>
-        <template #column-userName="{ row }">
-            <span class="link" @click.stop>
-                {{ row.userName }}
-                <WorkerDescriptorProxy :id="row.buyerFk" />
-            </span>
-        </template>
-        <template #column-description="{ row }">
-            <div class="row column full-width justify-between items-start">
-                {{ row?.name }}
-                <div v-if="row?.subName" class="subName">
-                    {{ row?.subName.toUpperCase() }}
-                </div>
-            </div>
-            <FetchedTags :item="row" />
-        </template>
-        <template #more-create-dialog="{ data }">
-            <VnInput
-                v-model="data.provisionalName"
-                :label="t('globals.description')"
-                :is-required="true"
-            />
-            <VnSelect
-                url="Tags"
-                v-model="data.tag"
-                :label="t('globals.tag')"
-                :fields="['id', 'name']"
-                option-label="name"
-                option-value="id"
-                :is-required="true"
-                :sort-by="['name ASC']"
+        <template #body>
+            <VnTable
+                v-if="defaultTag"
+                ref="tableRef"
+                :data-key="dataKey"
+                :columns="columns"
+                :right-search="false"
+                redirect="Item"
+                :create="{
+                    urlCreate: 'Items/new',
+                    title: t('item.list.newItem'),
+                    onDataSaved: ({ id }) => tableRef.redirect(`${id}/basic-data`),
+                    formInitialData: {
+                        editorFk: entityId,
+                        tag: defaultTag,
+                        priority: defaultPriority,
+                    },
+                }"
+                :is-editable="false"
             >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                            <QItemLabel caption> #{{ scope.opt?.id }} </QItemLabel>
-                        </QItemSection>
-                    </QItem>
+                <template #column-image="{ row }">
+                    <VnImg
+                        :id="row?.id"
+                        zoom-resolution="1600x900"
+                        :zoom="true"
+                        class="rounded"
+                    />
                 </template>
-            </VnSelect>
-            <VnSelect
-                :options="validPriorities"
-                v-model="data.priority"
-                :label="t('item.create.priority')"
-                :is-required="true"
-            />
-            <VnSelect
-                url="ItemTypes"
-                v-model="data.typeFk"
-                :label="t('item.list.typeName')"
-                :fields="['id', 'code', 'name']"
-                option-label="name"
-                option-value="id"
-                :is-required="true"
-            >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                            <QItemLabel caption>
-                                {{ scope.opt?.code }} #{{ scope.opt?.id }}
-                            </QItemLabel>
-                        </QItemSection>
-                    </QItem>
+                <template #column-id="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.id }}
+                        <ItemDescriptorProxy :id="row.id" />
+                    </span>
                 </template>
-            </VnSelect>
-            <VnSelect
-                url="Intrastats"
-                v-model="data.intrastatFk"
-                :label="t('globals.intrastat')"
-                :fields="['id', 'description']"
-                option-label="description"
-                option-value="id"
-                :is-required="true"
-            >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>{{ scope.opt?.description }}</QItemLabel>
-                            <QItemLabel caption> #{{ scope.opt?.id }} </QItemLabel>
-                        </QItemSection>
-                    </QItem>
+                <template #column-typeName="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.typeName }}
+                        {{ row.typeFk }}
+                        <ItemTypeDescriptorProxy :id="row.typeFk" />
+                    </span>
                 </template>
-            </VnSelect>
-            <VnSelect
-                url="Origins"
-                v-model="data.originFk"
-                :label="t('globals.origin')"
-                :fields="['id', 'code', 'name']"
-                option-label="code"
-                option-value="id"
-                :is-required="true"
-            >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                            <QItemLabel caption>
-                                {{ scope.opt?.code }} #{{ scope.opt?.id }}
-                            </QItemLabel>
-                        </QItemSection>
-                    </QItem>
+                <template #column-userName="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.userName }}
+                        <WorkerDescriptorProxy :id="row.buyerFk" />
+                    </span>
                 </template>
-            </VnSelect>
+                <template #column-description="{ row }">
+                    <div class="row column full-width justify-between items-start">
+                        {{ row?.name }}
+                        <div v-if="row?.subName" class="subName">
+                            {{ row?.subName.toUpperCase() }}
+                        </div>
+                    </div>
+                    <FetchedTags :item="row" :columns="3" />
+                </template>
+                <template #more-create-dialog="{ data }">
+                    <VnInput
+                        v-model="data.provisionalName"
+                        :label="t('globals.description')"
+                        :is-required="true"
+                    />
+                    <VnSelect
+                        url="Tags"
+                        v-model="data.tag"
+                        :label="t('globals.tag')"
+                        :fields="['id', 'name']"
+                        option-label="name"
+                        option-value="id"
+                        :is-required="true"
+                        :sort-by="['name ASC']"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        #{{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        :options="validPriorities"
+                        v-model="data.priority"
+                        :label="t('item.create.priority')"
+                        :is-required="true"
+                    />
+                    <VnSelect
+                        url="ItemTypes"
+                        v-model="data.typeFk"
+                        :label="t('item.list.typeName')"
+                        :fields="['id', 'code', 'name']"
+                        option-label="name"
+                        option-value="id"
+                        :is-required="true"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ scope.opt?.code }} #{{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        url="Intrastats"
+                        v-model="data.intrastatFk"
+                        :label="t('globals.intrastat')"
+                        :fields="['id', 'description']"
+                        option-label="description"
+                        option-value="id"
+                        :is-required="true"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.description }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        #{{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        url="Origins"
+                        v-model="data.originFk"
+                        :label="t('globals.origin')"
+                        :fields="['id', 'code', 'name']"
+                        option-label="code"
+                        option-value="id"
+                        :is-required="true"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ scope.opt?.code }} #{{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </template>
+            </VnTable>
         </template>
-    </VnTable>
+    </VnSection>
 </template>
 <style lang="scss" scoped>
 .subName {
@@ -497,5 +506,4 @@ es:
     New item: Nuevo artículo
     Create Item: Crear artículo
     You can search by id: Puedes buscar por id
-    Preview: Vista previa
 </i18n>

src/pages/Item/ItemListFilter.vue

@@ -1,7 +1,6 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { onMounted } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
 
 import FetchData from 'components/FetchData.vue';
@@ -233,7 +232,7 @@ onMounted(async () => {
                 <QItemSection>
                     <VnSelect
                         :label="t('params.buyerFk')"
-                        v-model="params.buyerFk"
+                        v-model="params.workerFk"
                         @update:model-value="searchFn()"
                         :options="buyersOptions"
                         option-value="id"
@@ -266,10 +265,10 @@ onMounted(async () => {
                             <QItem v-bind="scope.itemProps">
                                 <QItemSection>
                                     <QItemLabel>
-                                        {{ scope.opt?.name}}
+                                        {{ scope.opt?.name }}
                                     </QItemLabel>
                                     <QItemLabel caption>
-                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                        {{ `#${scope.opt?.id} , ${scope.opt?.nickname}` }}
                                     </QItemLabel>
                                 </QItemSection>
                             </QItem>
@@ -369,7 +368,7 @@ onMounted(async () => {
                         :model-value="fieldFilter.selectedField"
                         :options="moreFields"
                         option-label="label"
-                        option-value="label"                        
+                        option-value="label"
                         dense
                         outlined
                         rounded

src/pages/Item/ItemRequest.vue

@@ -272,11 +272,12 @@ const onDenyAccept = (_, responseData) => {
         <template #column-achieved="{ row }">
             <span>
                 <VnInput
+                    ref="achievedRef"
                     type="number"
                     v-model.number="row.saleQuantity"
                     :disable="!row.itemFk || row.isOk != null"
                     @blur="changeQuantity(row)"
-                    @keyup.enter="changeQuantity(row)"
+                    @keyup.enter="$refs.achievedRef.vnInputRef.blur()"
                     dense
                 />
             </span>

src/pages/Item/ItemType/Card/ItemTypeCard.vue

@@ -1,20 +1,12 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ItemTypeDescriptor from 'src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue';
-import ItemTypeFilter from 'src/pages/Item/ItemType/ItemTypeFilter.vue';
-import ItemTypeSearchbar from '../ItemTypeSearchbar.vue';
 </script>
+
 <template>
-    <VnCard
+    <VnCardBeta
         data-key="ItemTypeSummary"
         base-url="ItemTypes"
         :descriptor="ItemTypeDescriptor"
-        :filter-panel="ItemTypeFilter"
-        search-data-key="ItemTypeList"
-        search-url="ItemTypes"
-    >
-        <template #searchbar>
-            <ItemTypeSearchbar />
-        </template>
-    </VnCard>
+    />
 </template>

src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue

@@ -63,7 +63,3 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
     </CardDescriptor>
 </template>
 
-<i18n>
-es:
-    Go to module index: Ir al índice del módulo
-</i18n>

src/pages/Item/ItemType/ItemTypeFilter.vue

@@ -1,90 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-const { t } = useI18n();
-
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
-
-const emit = defineEmits(['search']);
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-            return {
-                name: { like: `%${value}%` },
-            };
-        case 'code':
-            return {
-                code: { like: `%${value}%` },
-            };
-        case 'search':
-            if (value) {
-                if (!isNaN(value)) {
-                    return { id: value };
-                } else {
-                    return {
-                        or: [
-                            {
-                                name: {
-                                    like: `%${value}%`,
-                                },
-                            },
-                            {
-                                code: {
-                                    like: `%${value}%`,
-                                },
-                            },
-                        ],
-                    };
-                }
-            }
-    }
-};
-</script>
-
-<template>
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :search-button="true"
-        @search="emit('search')"
-        search-url="table"
-        :expr-builder="exprBuilder"
-    >
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params }">
-            <QItem>
-                <QItemSection>
-                    <VnInput :label="t('Name')" v-model="params.name" is-outlined />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput v-model="params.code" :label="t('Code')" is-outlined />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-
-<i18n>
-en:
-    params:
-        name: Name
-        code: Code
-es:
-    params:
-        name: Nombre
-        code: Código
-    Name: Nombre
-    Code: Código
-</i18n>

src/pages/Item/ItemType/ItemTypeSearchbar.vue

@@ -1,19 +0,0 @@
-<script setup>
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import { useI18n } from 'vue-i18n';
-const { t } = useI18n();
-</script>
-
-<template>
-    <VnSearchbar
-        data-key="ItemTypeList"
-        url="ItemTypes"
-        :label="t('Search item type')"
-        :info="t('Search itemType by id, name or code')"
-    />
-</template>
-<i18n>
-es:
-    Search item type: Buscar familia
-    Search itemType by id, name or code: Buscar familia por id, nombre o código
-</i18n>

src/pages/Item/ItemType/locale/en.yml

@@ -15,3 +15,5 @@ itemType:
         promo: Promo
         itemPackingType: Item packing type
         isUnconventionalSize: Is unconventional size
+    search: Search item type
+    searchInfo: Search item type by id, name or code

src/pages/Item/ItemType/locale/es.yml

@@ -15,3 +15,5 @@ itemType:
         promo: Promoción
         itemPackingType: Tipo de embalaje
         isUnconventionalSize: Es de tamaño poco convencional
+    search: Buscar familia
+    searchInfo: Buscar familia por id, nombre o código

src/pages/Item/ItemTypeList.vue

@@ -1,17 +1,50 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { ref, computed } from 'vue';
-import ItemTypeSearchbar from 'src/pages/Item/ItemType/ItemTypeSearchbar.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import FetchData from 'components/FetchData.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import ItemTypeFilter from './ItemType/ItemTypeFilter.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
 const itemCategoriesOptions = ref([]);
 const temperatureOptions = ref([]);
+const dataKey = 'ItemTypeList';
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+            return {
+                name: { like: `%${value}%` },
+            };
+        case 'code':
+            return {
+                code: { like: `%${value}%` },
+            };
+        case 'search':
+            if (value) {
+                if (!isNaN(value)) {
+                    return { id: value };
+                } else {
+                    return {
+                        or: [
+                            {
+                                name: {
+                                    like: `%${value}%`,
+                                },
+                            },
+                            {
+                                code: {
+                                    like: `%${value}%`,
+                                },
+                            },
+                        ],
+                    };
+                }
+            }
+    }
+};
 
 const columns = computed(() => [
     {
@@ -103,49 +136,53 @@ const columns = computed(() => [
         @on-fetch="(data) => (temperatureOptions = data)"
         auto-load
     />
-    <RightMenu>
-        <template #right-panel>
-            <ItemTypeFilter data-key="ItemTypeList" />
-        </template>
-    </RightMenu>
-    <ItemTypeSearchbar />
-    <VnTable
-        ref="tableRef"
-        data-key="ItemTypeList"
-        url="ItemTypes"
-        :create="{
-            urlCreate: 'ItemTypes',
-            title: t('Create ItemTypes'),
-            onDataSaved: () => tableRef.reload(),
-            formInitialData: {},
-        }"
-        :user-filter="{
-            include: {
-                relation: 'worker',
-                scope: {
-                    fields: ['id'],
-                    include: {
-                        relation: 'user',
-                        scope: {
-                            fields: ['id', 'name'],
+    <VnSection
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="itemType"
+        :array-data-props="{
+            url: 'ItemTypes',
+            order: 'name ASC',
+            exprBuilder,
+            userFilter: {
+                include: {
+                    relation: 'worker',
+                    scope: {
+                        fields: ['id'],
+                        include: {
+                            relation: 'user',
+                            scope: {
+                                fields: ['id', 'name'],
+                            },
                         },
                     },
                 },
             },
         }"
-        order="name ASC"
-        :columns="columns"
-        auto-load
-        :right-search="false"
-        redirect="item/item-type"
     >
-        <template #column-workerFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.worker?.user?.name }}
-                <WorkerDescriptorProxy :id="row.workerFk" />
-            </span>
+        <template #body>
+            <VnTable
+                ref="tableRef"
+                :data-key="dataKey"
+                :create="{
+                    urlCreate: 'ItemTypes',
+                    title: t('Create ItemTypes'),
+                    onDataSaved: () => tableRef.reload(),
+                    formInitialData: {},
+                }"
+                :columns="columns"
+                auto-load
+                redirect="item/item-type"
+            >
+                <template #column-workerFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.worker?.user?.name }}
+                        <WorkerDescriptorProxy :id="row.workerFk" />
+                    </span>
+                </template>
+            </VnTable>
         </template>
-    </VnTable>
+    </VnSection>
 </template>
 
 <i18n>

src/pages/Item/locale/en.yml

@@ -180,44 +180,46 @@ item:
         intrastat: Intrastat
         origin: Origin
     buyRequest:
-        ticketId: 'Ticket ID'
-        shipped: 'Shipped'
-        requester: 'Requester'
-        requested: 'Requested'
-        price: 'Price'
-        attender: 'Attender'
-        item: 'Item'
-        achieved: 'Achieved'
-        concept: 'Concept'
-        state: 'State'
+        ticketId: Ticket ID
+        shipped: Shipped
+        requester: Requester
+        requested: Requested
+        price: Price
+        attender: Attender
+        item: Item
+        achieved: Achieved
+        concept: Concept
+        state: State
     summary:
-        basicData: 'Basic data'
-        otherData: 'Other data'
-        description: 'Description'
-        tax: 'Tax'
-        tags: 'Tags'
-        botanical: 'Botanical'
-        barcode: 'Barcode'
-        name: 'Nombre'
-        completeName: 'Nombre completo'
-        family: 'Familia'
-        size: 'Medida'
-        origin: 'Origen'
-        stems: 'Tallos'
-        multiplier: 'Multiplicador'
-        buyer: 'Comprador'
-        doPhoto: 'Do photo'
-        intrastatCode: 'Código intrastat'
+        basicData: Basic data
+        otherData: Other data
+        description: Description
+        tax: Tax
+        tags: Tags
+        botanical: Botanical
+        barcode: Barcode
+        name: Name
+        completeName: Complete name
+        family: Family
+        size: Size
+        origin: Origin
+        stems: Stems
+        multiplier: Multiplier
+        buyer: Buyer
+        doPhoto: Do photo
+        intrastatCode: Intrastat code
         intrastat: 'Intrastat'
-        ref: 'Referencia'
-        relevance: 'Relevancia'
-        weight: 'Peso (gramos)/tallo'
-        units: 'Unidades/caja'
-        expense: 'Gasto'
-        generic: 'Genérico'
-        recycledPlastic: 'Plástico reciclado'
-        nonRecycledPlastic: 'Plástico no reciclado'
-        minSalesQuantity: 'Cantidad mínima de venta'
-        genus: 'Genus'
-        specie: 'Specie'
-    regularizeStock: Regularize stock
+        ref: Reference
+        relevance: Relevance
+        weight: Weight (gram)/stem
+        units: Units/box
+        expense: Expense
+        generic: Generic
+        recycledPlastic: Recycled plastic
+        nonRecycledPlastic: Non recycled plastic
+        minSalesQuantity: Min sales quantity
+        genus: Genus
+        specie: Specie
+    search: 'Search item'
+    searchInfo: 'You can search by id'
+    regularizeStock: Regularize stock

src/pages/Item/locale/es.yml

@@ -73,9 +73,6 @@ itemTags:
     addTag: Añadir etiqueta
     tag: Etiqueta
     value: Valor
-searchbar:
-    label: Buscar artículo
-    info: Buscar por id de artículo
 itemType:
     shared:
         code: Código
@@ -108,9 +105,6 @@ item:
         concept: Concepto
         denyOptions: Denegado
         scopeDays: Días en adelante
-    searchbar:
-        label: Buscar artículo
-        info: Puedes buscar por id
     descriptor:
         item: Artículo
         buyer: Comprador
@@ -182,35 +176,35 @@ item:
         intrastat: Intrastat
         origin: Origen
     summary:
-        basicData: 'Datos básicos'
-        otherData: 'Otros datos'
-        description: 'Descripción'
-        tax: 'IVA'
-        tags: 'Etiquetas'
-        botanical: 'Botánico'
-        barcode: 'Código de barras'
-        name: 'Nombre'
-        completeName: 'Nombre completo'
-        family: 'Familia'
-        size: 'Medida'
-        origin: 'Origen'
-        stems: 'Tallos'
-        multiplier: 'Multiplicador'
-        buyer: 'Comprador'
-        doPhoto: 'Hacer foto'
-        intrastatCode: 'Código intrastat'
-        intrastat: 'Intrastat'
-        ref: 'Referencia'
-        relevance: 'Relevancia'
-        weight: 'Peso (gramos)/tallo'
-        units: 'Unidades/caja'
-        expense: 'Gasto'
-        generic: 'Genérico'
-        recycledPlastic: 'Plástico reciclado'
-        nonRecycledPlastic: 'Plástico no reciclado'
-        minSalesQuantity: 'Cantidad mínima de venta'
-        genus: 'Genus'
-        specie: 'Specie'
+        basicData: Datos básicos
+        otherData: Otros datos
+        description: Descripción
+        tax: IVA
+        tags: Etiquetas
+        botanical: Botánico
+        barcode: Código de barras
+        name: Nombre
+        completeName: Nombre completo
+        family: Familia
+        size: Medida
+        origin: Origen
+        stems: Tallos
+        multiplier: Multiplicador
+        buyer: Comprador
+        doPhoto: Hacer foto
+        intrastatCode: Código intrastat
+        intrastat: Intrastat
+        ref: Referencia
+        relevance: Relevancia
+        weight: Peso (gramos)/tallo
+        units: Unidades/caja
+        expense: Gasto
+        generic: Genérico
+        recycledPlastic: Plástico reciclado
+        nonRecycledPlastic: Plástico no reciclado
+        minSalesQuantity: Cantidad mínima de venta
+        genus: Genus
+        specie: Specie
     regularizeStock: Regularizar stock
     buyRequest:
         ticketId: 'ID Ticket'
@@ -222,4 +216,6 @@ item:
         item: 'Artículo'
         achieved: 'Conseguido'
         concept: 'Concepto'
-        state: 'Estado'
+        state: 'Estado'       
+    search: 'Buscar artículo'
+    searchInfo: 'Puedes buscar por id'

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -290,7 +290,7 @@ const columns = computed(() => [
                 },
             },
             {
-                title: t('salesTicketsTable.preview'),
+                title: t('globals.preview'),
                 icon: 'preview',
                 color: 'primary',
                 action: (row) => viewSummary(row.id, TicketSummary),

src/pages/Monitor/locale/en.yml

@@ -33,7 +33,6 @@ salesTicketsTable:
     isFragile: Is fragile
     zone: Zone
     goToLines: Go to lines
-    preview: Preview
     total: Total
     preparation: H.Prep
     payMethod: Pay method

src/pages/Order/Card/OrderCatalog.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import { useRoute, useRouter } from 'vue-router';
-import { onMounted, ref, computed, watch } from 'vue';
+import { onMounted, ref, watch } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
@@ -9,6 +9,7 @@ import CatalogItem from 'src/components/ui/CatalogItem.vue';
 import OrderCatalogFilter from 'src/pages/Order/Card/OrderCatalogFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useArrayData } from 'src/composables/useArrayData';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -89,14 +90,16 @@ watch(
             :search-remove-params="false"
         />
     </Teleport>
-    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
-        <OrderCatalogFilter
-            :data-key="dataKey"
-            :tag-value="tagValue"
-            :tags="tags"
-            :initial-catalog-params="catalogParams"
-        />
-    </Teleport>
+    <RightMenu>
+        <template #right-panel>
+            <OrderCatalogFilter
+                :data-key="dataKey"
+                :tag-value="tagValue"
+                :tags="tags"
+                :initial-catalog-params="catalogParams"
+            />
+        </template>
+    </RightMenu>
     <QPage class="column items-center q-pa-md" data-cy="orderCatalogPage">
         <div class="full-width">
             <VnPaginate :data-key="dataKey">
@@ -141,5 +144,5 @@ watch(
 <i18n>
 es:
     You can search items by name or id: Puedes buscar items por nombre o id
-    Search items: Buscar items
+    Search items: Buscar artículos
 </i18n>

src/pages/Order/Card/OrderCatalogFilter.vue

@@ -115,6 +115,7 @@ const removeTagGroupParam = (params, search, valIndex) => {
     } else {
         params.tagGroups.splice(valIndex, 1);
     }
+    search();
 };
 
 const setCategoryList = (data) => {