Merge branch 'dev' into 8616-fixWarningsRouteSection

2025-03-11 08:13:50 +00:00 · 2025-03-11 08:13:50 +00:00 · c2a29e4a9d
parent 3098d24184 d37e01f35d
commit c2a29e4a9d
64 changed files with 770 additions and 491 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,187 @@
+# Version 25.10 - 2025-03-11
+
+### Added 🆕
+
+- chore: refs #6695 empty commit by:alexm
+- chore: refs #6695 get docker compose version by:alexm
+- chore: refs #6695 try use docker compose by:alexm
+- feat: add --browser chromium by:Javier Segarra
+- feat: docker pull back image by:alexm
+- feat(jenkinsE2E): refs #6695 new image by:alexm
+- feat(jenkinsE2E): refs #6695 try fix db by:alexm
+- feat(jenkinsE2E): refs #6695 try new sintax by:alexm
+- feat(Jenkinsfile): refs #8714 add CHANGE_TARGET environment variable logging (origin/8714-devToTest, 8714-devToTest) by:alexm
+- feat: refs #6695 add additional test directories for Cypress integration tests in Jenkinsfile by:alexm
+- feat: refs #6695 add cypress-cache volume to docker-compose.e2e.yml by:alexm
+- feat: refs #6695 add Dockerfile for Cypress setup and update Jenkinsfile for installation steps by:alexm
+- feat: refs #6695 add setup and e2e testing by:alexm
+- feat: refs #6695 better stages for e2e by:alexm
+- feat: refs #6695 better stages for e2e rollback by:alexm
+- feat: refs #6695 install Cypress during Jenkins pipeline setup by:alexm
+- feat: refs #6695 jenkins run e2e by:alexm
+- feat: refs #6695 jenkins run e2e front deteach by:alexm
+- feat: refs #6695 jenkins run e2e rebuild by:alexm
+- feat: refs #6695 jenkins run e2e remove ports by:alexm
+- feat: refs #6695 jenkins run e2e try down and rm by:alexm
+- feat: refs #6695 jenkins run e2e try fix db by:alexm
+- feat: refs #6695 jenkins run e2e whitout rebuild by:alexm
+- feat: refs #6695 pull salix-back image and use by:alexm
+- feat: refs #6695 run e2e in docker by:alexm
+- feat: refs #6695 run front by:alexm
+- feat: refs #6695 run front quasar build by:alexm
+- feat: refs #6695 run parallel e2e in local by:alexm
+- feat: refs #6695 update cypress cache path command in Jenkinsfile by:alexm
+- feat: refs #6695 update cypress-cache volume path in docker-compose.e2e.yml by:alexm
+- feat: refs #6695 update cypress command in Jenkinsfile and docker-compose.e2e.yml by:alexm
+- feat: refs #6695 update Docker configurations and Cypress settings for improved local development (origin/6695-docker_push_2, 6695-docker_push_2) by:alexm
+- feat: refs #6695 when failure, clean by:alexm
+- feat: refs #7937 add import claim button to ClaimAction component by:jgallego
+- feat: refs #7937 add shelving selection to claim actions with data fetching by:jgallego
+- feat: refs #8348 Added grouping by:guillermo
+- feat: refs #8402 added lost filters from Salix by:Jon
+- feat: refs #8484 add addressId to createForm in CustomerDescriptor by:jorgep
+- feat: refs #8484 overwrite Cypress visit command to ensure main element exists by:jorgep
+- feat: refs #8555 added new filter field and translations by:Jon
+- feat: refs #8593 added summary button & modified e2e tests by:provira
+- feat: refs #8593 changed parking to VnTable and modified e2e tests by:provira
+- feat: refs #8599 added new test and translations by:Jon
+- feat: refs #8599 modified tests to be more complete and added new ones by:Jon
+- feat: refs #8697 enable data-cy attribute for VnTable, update test cases to remove skips and adjust selectors by:pablone
+- feat: rename test:unit by test:front by:Javier Segarra
+- feat: try run salix back by:alexm
+- fix: style w-80 by:Javier Segarra
+- Merge pull request 'fix: style' (!1425) from warmfix_vntable_card_style into test by:Javier Segarra
+
+### Changed 📦
+
+- ci: refs #6695 Docker & Jenkinsfile fixes/refactor by:Juan Ferrer Toribio
+- ci: refs #6695 refactor Cypress setup in Jenkinsfile and replace local docker-compose with new configuration by:alexm
+- perf: refs #6695 only necessary by:alexm
+- refactor: adjust translation to standardize it by:Jon
+- refactor: refs #6695 comment out vnComponent tests in Jenkinsfile by:alexm
+- refactor: refs #6695 improve group size calculation for parallel test execution in Jenkinsfile by:alexm
+- refactor: refs #6695 improve parallel test execution logic in Jenkinsfile by:alexm
+- refactor: refs #6695 simplify Docker cleanup commands in Jenkinsfile by:alexm
+- refactor: refs #6695 update Docker setup for Cypress and remove obsolete files by:alexm
+- refactor: refs #6695 update E2E test execution to support parallel groups and improve by:alexm
+- refactor: refs #6695 update Jenkinsfile and Dockerfile to use 'developer' by:alexm
+- refactor: refs #6695 update Jenkinsfile to run E2E tests in parallel and simplify docker-compose command by:alexm
+- refactor: refs #6897 clean up Cypress configuration and improve entry list filtering (origin/6897-fixEntryE2e) by:pablone
+- refactor: refs #7414 update VnLog component to change display order value changes on update action by:jtubau
+- refactor: refs #7937 align columns to the right and add shelvingCode to ClaimSummaryAction by:jgallego
+- refactor: refs #8484 add data-cy attribute for claim photo image and update test to use it by:jorgep
+- refactor: refs #8484 clean up test files by removing commented issue references and updating test cases by:jorgep
+- refactor: refs #8484 enhance login command with session management and clean up unused commands by:jtubau
+- refactor: refs #8484 improve search input behavior and enhance visit command with DOM content load by:jtubau
+- refactor: refs #8484 improve selectOption command with retry logic for visibility checks by:jtubau
+- refactor: refs #8484 remove comment in wagonCreate.spec.js by:jtubau
+- refactor: refs #8484 remove redundant visit command overwrite by:jorgep
+- refactor: refs #8484 remove unnecessary domContentLoad calls from client tests by:jorgep
+- refactor: refs #8484 remove unnecessary intercepts and waits in ticket and zone tests by:jorgep
+- refactor: refs #8484 simplify image dialog test by using aliases for elements by:jorgep
+- refactor: refs #8484 streamline assertions in ClaimNotes test by:jorgep
+- refactor: refs #8484 streamline login command and remove commented code by:jorgep
+- refactor: refs #8484 update specPattern to include all spec files and remove data-cy attribute by:jorgep
+- refactor: refs #8594 update vehicle summary tests to use expected variable for consistency by:jtubau
+- refactor: refs #8599 corrected it name by:Jon
+- refactor: refs #8599 invoice out list e2e by:Jon
+- refactor: refs #8599 requested changes by:Jon
+- refactor: refs #8606 modified table height and deleted void file by:Jon
+- refactor: refs #8606 modified table width and order by:Jon
+- refactor: refs #8606 modified upcoming deliveries view by:Jon
+- refactor: refs #8606 translations by:Jon
+- refactor: refs #8618 simplify selectors and improve test readability in routeExtendedList.spec.js by:jtubau
+- refactor: refs #8620 update RouteAutonomous to notify on data save and change invoice reference display by:jtubau
+- refactor: remove default browser setting from Cypress configuration by:alexm
+- refactor: remove unused variables by:alexm
+- refactor: skip claimNotes by:alexm
+- refactor: update labels and conditions in Claim components by:jgallego
+- refactor: use constant for account input selector in VnAccountNumber tests by:alexm
+
+### Fixed 🛠️
+
+- build: refs #6695 cypress-setup fix volume by:alexm
+- build: refs #6695 cypress-setup fix volume (origin/6695-docker_push, 6695-docker_push) by:alexm
+- ci: refs #6695 cypress reporter fix by:Juan Ferrer Toribio
+- ci: refs #6695 Docker & Jenkinsfile fixes/refactor by:Juan Ferrer Toribio
+- ci: refs #6695 JUnit report fixes by:Juan Ferrer Toribio
+- ci: refs #6695 vitest junit file fix by:Juan Ferrer Toribio
+- feat(jenkinsE2E): refs #6695 try fix db by:alexm
+- feat: refs #6695 jenkins run e2e try fix db by:alexm
+- fix: add data-cy attribute to card button for improved testing by:jtubau
+- fix: added lost code by:Jon
+- fix: add --init flag to Cypress Docker container for improved stability by:alexm
+- fix: add mapper before Save by:Javier Segarra
+- fix: cy.domContentLoad(); not exist by:alexm
+- fix: elements position by:Javier Segarra
+- fix: fixed select not filtering when typing by:Jon
+- fix: fixed wagonTypeCreate test (origin/wagonTypeTestFix) by:PAU ROVIRA ROSALENY
+- fix: fix sctions by:carlossa
+- fix(Jenkinsfile): enhance Docker registry credentials handling with dynamic URL (origin/warmFix_use_withDockerRegistry, warmFix_use_withDockerRegistry) by:alexm
+- fix(Jenkinsfile): update Docker registry credentials handling in E2E stage by:alexm
+- fix: junit report by:alexm
+- fix: merge revert by:alexm
+- fix: merge test to dev by:alexm
+- fix: prevent 'cypress run' error to show junit by:alexm
+- fix: refs #6695 add --volumes flag to docker-compose down command by:alexm
+- fix: refs #6695 checkErrors(folderName) by:alexm
+- fix: refs #6695 clientBasicData by:alexm
+- fix: refs #6695 dockerFile by:alexm
+- fix: refs #6695 e2e.sh by:alexm
+- fix: refs #6695 e2e stockBought by:alexm
+- fix: refs #6695 fix e2e's by:alexm
+- fix: refs #6695 storage by:alexm
+- fix: refs #6695 try by:alexm
+- fix: refs #6695 try parallel by:alexm
+- fix: refs #6695 update Cypress cache handling and increase wait timeout for elements by:alexm
+- fix: refs #6695 update Cypress configuration and Docker setup for improved testing by:alexm
+- fix: refs #6695 update E2E stages to run tests in parallel for specific folders by:alexm
+- fix: refs #6695 update remove Cypress installation by:alexm
+- fix: refs #6695 zoneWarehouse est by:alexm
+- fix: refs #6943 e2e clientList, formModel by:carlossa
+- fix: refs #6943 formModel workerDepartment by:carlossa
+- fix: refs #7323 e2e (origin/7323-fixe2e) by:carlossa
+- fix: refs #7323 notification manager by:carlossa
+- fix: refs #7414 updated default value rendering for non-update scenarios by:jtubau
+- fix: refs #7414 update VnLog.vue to correctly display log actions and values by:jtubau
+- fix: refs #7937 update claimId in ClaimAction test to reflect correct value (origin/7937-claimAgile) by:jgallego
+- fix: refs #8484 ensure document is fully loaded before visiting pages in tests by:jorgep
+- fix: refs #8484 fixed some tests to enable previously skipped cases and enhance functionality by:jtubau
+- fix: refs #8484 remove unused addressId from createForm in CustomerDescriptor.vue by:jtubau
+- fix: refs #8484 rollback by:jorgep
+- fix: refs #8484 update Boss field type to 'selectWorker' and add selectWorkerOption command by:jtubau
+- fix: refs #8484 update Boss type from 'selectWorker' to 'select' by:jorgep
+- fix: refs #8484 update parking list URL to correct shelving path in integration test by:jtubau
+- fix: refs #8484 update selector for buyLabel button in myEntry test by:jtubau
+- fix: refs #8484 update selector for removing wagon type in wagonCreate.spec.js by:jtubau
+- fix: refs #8484 update wagon type deletion selector and clean up unused code in commands.js by:jtubau
+- fix: refs #8593 fixed parking e2e tests by:provira
+- fix: refs #8606 fixed list e2e test by:Jon
+- fix: refs #8620 add module name to InvoiceInSummary by:jtubau
+- fix: refs #8623 fixed different errors by:Jon
+- fix: remove info by:carlossa
+- fix: remove old end-to-end test files before building Docker image by:alexm
+- fix: revert cypress.config by:alexm
+- fix: style w-80 by:Javier Segarra
+- fix: unnecessary function by:alexm
+- fix: update docker-compose command to remove volumes on teardown by:alexm
+- fix: update Jenkinsfile to remove specific end-to-end test files by:alexm
+- fix: update Jenkinsfile to use environment variable for Docker registry credentials by:alexm
+- fix: warmFix vnInput dataCy by:alexm
+- Merge pull request 'fix: style' (!1425) from warmfix_vntable_card_style into test by:Javier Segarra
+- revert: browser chromium package.json by:Javier Segarra
+- Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34" by:alexm
+- test: refs #6695 e2e fix allowedHosts by:alexm
+- test: refs #6695 e2e fix back image by:alexm
+- test: refs #6695 e2e fix base urls by:alexm
+- test: refs #6695 e2e fix command by:alexm
+- test: refs #6695 e2e fix connection db by:alexm
+- test: refs #6695 e2e fix network by:alexm
+- test: refs #6695 e2e fix sequential by:alexm
+- test: refs #6695 fix e2e by:alexm
+- test: refs #6695 fix e2e command by:alexm
+- test: refs #6695 fix selectOption command by:alexm
+
 # Version 25.08 - 2025-03-04

 ### Added 🆕
--- a/2
+++ b/2
@ -123,7 +123,7 @@ pipeline {
                            sh "docker-compose ${env.COMPOSE_PARAMS} up -d"

                            image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
-                                sh 'sh test/cypress/cypressParallel.sh 3'
+                                sh 'sh test/cypress/cypressParallel.sh 2'
                            }
                        }
                    }
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@ -1136,9 +1136,13 @@ es:

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

 .flex-one {
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@ -1,50 +1,56 @@
 <script setup>
-import { onBeforeMount, computed } from 'vue';
-import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
+import { onBeforeMount } from 'vue';
+import { useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
 import VnSubToolbar from '../ui/VnSubToolbar.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import LeftMenu from 'components/LeftMenu.vue';
-import RightMenu from 'components/common/RightMenu.vue';
+
 const props = defineProps({
    dataKey: { type: String, required: true },
    url: { type: String, default: undefined },
+    idInWhere: { type: Boolean, default: false },
    filter: { type: Object, default: () => {} },
    descriptor: { type: Object, required: true },
    filterPanel: { type: Object, default: undefined },
-    idInWhere: { type: Boolean, default: false },
    searchDataKey: { type: String, default: undefined },
    searchbarProps: { type: Object, default: undefined },
    redirectOnError: { type: Boolean, default: false },
 });

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

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

 onBeforeRouteUpdate(async (to, from) => {
+    if (hasRouteParam(to.params)) {
+        const { matched } = router.currentRoute.value;
+        const { name } = matched.at(-3);
+        if (name) {
+            router.push({ name, params: to.params });
+        }
+    }
    const id = to.params.id;
    if (id !== from.params.id) await fetch(id, true);
 });
@ -56,34 +62,13 @@ async function fetch(id, append = false) {
    else arrayData.store.url = props.url.replace(regex, `/${id}`);
    await arrayData.fetch({ append, updateRouter: false });
 }
+function hasRouteParam(params, valueToCheck = ':addressId') {
+    return Object.values(params).includes(valueToCheck);
+}
 </script>
 <template>
-    <QDrawer
-        v-model="stateStore.leftDrawer"
-        show-if-above
-        :width="256"
-        v-if="stateStore.isHeaderMounted()"
-    >
-        <QScrollArea class="fit">
-            <component :is="descriptor" />
-            <QSeparator />
-            <LeftMenu source="card" />
-        </QScrollArea>
-    </QDrawer>
-    <slot name="searchbar" v-if="props.searchDataKey">
-        <VnSearchbar :data-key="props.searchDataKey" v-bind="props.searchbarProps" />
-    </slot>
-    <RightMenu>
-        <template #right-panel v-if="props.filterPanel">
-            <component :is="props.filterPanel" :data-key="searchRightDataKey" />
-        </template>
-    </RightMenu>
-    <QPageContainer>
-        <QPage>
-            <VnSubToolbar />
-            <div :class="[useCardSize(), $attrs.class]">
-                <RouterView :key="$route.path" />
-            </div>
-        </QPage>
-    </QPageContainer>
+    <VnSubToolbar />
+    <div :class="[useCardSize(), $attrs.class]">
+        <RouterView :key="$route.path" />
+    </div>
 </template>
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@ -1,74 +0,0 @@
-<script setup>
-import { onBeforeMount } from 'vue';
-import { useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
-import { useArrayData } from 'src/composables/useArrayData';
-import { useStateStore } from 'stores/useStateStore';
-import useCardSize from 'src/composables/useCardSize';
-import VnSubToolbar from '../ui/VnSubToolbar.vue';
-
-const props = defineProps({
-    dataKey: { type: String, required: true },
-    url: { type: String, default: undefined },
-    idInWhere: { type: Boolean, default: false },
-    filter: { type: Object, default: () => {} },
-    descriptor: { type: Object, required: true },
-    filterPanel: { type: Object, default: undefined },
-    searchDataKey: { type: String, default: undefined },
-    searchbarProps: { type: Object, default: undefined },
-    redirectOnError: { type: Boolean, default: false },
-});
-
-const stateStore = useStateStore();
-const router = useRouter();
-const arrayData = useArrayData(props.dataKey, {
-    url: props.url,
-    userFilter: props.filter,
-    oneRecord: true,
-});
-
-onBeforeRouteLeave(() => {
-    stateStore.cardDescriptorChangeValue(null);
-});
-
-onBeforeMount(async () => {
-    stateStore.cardDescriptorChangeValue(props.descriptor);
-
-    const route = router.currentRoute.value;
-    try {
-        await fetch(route.params.id);
-    } catch {
-        const { matched: matches } = route;
-        const { path } = matches.at(-1);
-        router.push({ path: path.replace(/:id.*/, '') });
-    }
-});
-
-onBeforeRouteUpdate(async (to, from) => {
-    if (hasRouteParam(to.params)) {
-        const { matched } = router.currentRoute.value;
-        const { name } = matched.at(-3);
-        if (name) {
-            router.push({ name, params: to.params });
-        }
-    }
-    const id = to.params.id;
-    if (id !== from.params.id) await fetch(id, true);
-});
-
-async function fetch(id, append = false) {
-    const regex = /\/(\d+)/;
-    if (props.idInWhere) arrayData.store.filter.where = { id };
-    else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
-    else arrayData.store.url = props.url.replace(regex, `/${id}`);
-    await arrayData.fetch({ append, updateRouter: false });
-}
-function hasRouteParam(params, valueToCheck = ':addressId') {
-    return Object.values(params).includes(valueToCheck);
-}
-</script>
-<template>
-    <VnSubToolbar />
-    <div :class="[useCardSize(), $attrs.class]">
-        <RouterView :key="$route.path" />
-    </div>
-</template>
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@ -5,7 +5,7 @@ import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useState } from 'src/composables/useState';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useClipboard } from 'src/composables/useClipboard';
 import VnMoreOptions from './VnMoreOptions.vue';

@ -42,6 +42,7 @@ const $props = defineProps({

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

 onBeforeMount(async () => {
@ -76,15 +80,18 @@ onBeforeMount(async () => {
    );
 });

-const routeName = computed(() => {
-    const DESCRIPTOR_PROXY = 'DescriptorProxy';
-
+function getName() {
    let name = $props.dataKey;
    if ($props.dataKey.includes(DESCRIPTOR_PROXY)) {
        name = name.split(DESCRIPTOR_PROXY)[0];
    }
-    return `${name}Summary`;
+    return name;
+}
+const routeName = computed(() => {
+    let routeName = getName();
+    return `${routeName}Summary`;
 });
+
 async function getData() {
    store.url = $props.url;
    store.filter = $props.filter ?? {};
@ -120,20 +127,35 @@ function copyIdText(id) {

 const emit = defineEmits(['onFetch']);

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

 <template>
    <div class="descriptor">
        <template v-if="entity && !isLoading">
            <div class="header bg-primary q-pa-sm justify-between">
-                <slot name="header-extra-action"
-                    ><QBtn
+                <slot name="header-extra-action">
+                    <QBtn
                        round
                        flat
                        dense
@ -141,13 +163,13 @@ const toModule = computed(() =>
                        :icon="iconModule"
                        color="white"
                        class="link"
-                        :to="$attrs['to-module'] ?? toModule"
+                        :to="toModule"
                    >
                        <QTooltip>
                            {{ t('globals.goToModuleIndex') }}
                        </QTooltip>
-                    </QBtn></slot
-                >
+                    </QBtn>
+                </slot>
                <QBtn
                    @click.stop="viewSummary(entity.id, $props.summary, $props.width)"
                    round
@ -230,7 +252,6 @@ const toModule = computed(() =>
            </div>
            <slot name="after" />
        </template>
-        <!-- Skeleton -->
        <SkeletonDescriptor v-if="!entity || isLoading" />
    </div>
    <QInnerLoading
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@ -149,14 +149,12 @@ const columns = computed(() => [
                :right-search="false"
            >
                <template #more-create-dialog="{ data }">
-                    <QCardSection>
                        <VnInputPassword
                            :label="t('Password')"
                            v-model="data.password"
                            :required="true"
                            autocomplete="new-password"
                        />
-                    </QCardSection>
                </template>
            </VnTable>
        </template>
--- a/src/pages/Account/Alias/Card/AliasCard.vue
+++ b/src/pages/Account/Alias/Card/AliasCard.vue
@ -1,10 +1,10 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import AliasDescriptor from './AliasDescriptor.vue';
 </script>

 <template>
-    <VnCardBeta
+    <VnCard
        data-key="Alias"
        url="MailAliases"
        :descriptor="AliasDescriptor"
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@ -1,10 +1,10 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import AccountDescriptor from './AccountDescriptor.vue';
 import filter from './AccountFilter.js';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
        url="VnUsers/preview"
        :id-in-where="true"
        data-key="Account"
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ b/src/pages/Account/Role/Card/RoleCard.vue
@ -1,9 +1,9 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import RoleDescriptor from './RoleDescriptor.vue';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
        url="VnRoles"
        data-key="Role"
        :id-in-where="true"
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@ -328,7 +328,7 @@ async function post(query, params) {
                    <QTd>
                        <VnSelect
                            v-model="row.shelvingFk"
-                            :options="shelvings"
+                            url="Shelvings"
                            option-label="code"
                            option-value="id"
                            style="width: 100px"
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@ -1,10 +1,10 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import ClaimDescriptor from './ClaimDescriptor.vue';
 import filter from './ClaimFilter.js';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
        data-key="Claim"
        url="Claims"
        :descriptor="ClaimDescriptor"
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@ -1,10 +1,10 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import CustomerDescriptor from './CustomerDescriptor.vue';
 </script>

 <template>
-    <VnCardBeta
+    <VnCard
        data-key="Customer"
        :url="`Clients/${$route.params.id}/getCard`"
        :descriptor="CustomerDescriptor"
--- a/src/pages/Customer/Card/CustomerMandates.vue
+++ b/src/pages/Customer/Card/CustomerMandates.vue
@ -16,9 +16,7 @@ const filter = {
        { relation: 'mandateType', scope: { fields: ['id', 'code'] } },
        { relation: 'company', scope: { fields: ['id', 'code'] } },
    ],
-    where: { clientFk: route.params.id },
    order: ['created DESC'],
-    limit: 20,
 };

 const columns = computed(() => [
@ -32,7 +30,7 @@ const columns = computed(() => [
    {
        align: 'left',
        cardVisible: true,
-        format: ({ company }) => company.code,
+        format: ({ company }) => company?.code,
        label: t('globals.company'),
        name: 'company',
    },
@ -65,7 +63,8 @@ const columns = computed(() => [
        <VnTable
            data-key="Mandates"
            url="Mandates"
-            :filter="filter"
+            :user-filter="filter"
+            :filter="{ where: { clientFk: route.params.id } }"
            auto-load
            :columns="columns"
            class="full-width q-mt-md"
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@ -5,7 +5,7 @@ import { useRoute } from 'vue-router';
 import axios from 'axios';
 import { getClientRisk } from '../composables/getClientRisk';
 import { useDialogPluginComponent } from 'quasar';
-
+import FormModelPopup from 'components/FormModelPopup.vue';
 import { usePrintService } from 'composables/usePrintService';
 import useNotify from 'src/composables/useNotify.js';
 import FetchData from 'components/FetchData.vue';
@ -74,26 +74,24 @@ onBeforeMount(() => {
    urlCreate.value = `Clients/${route.params.id}/createReceipt`;
 });

-function setPaymentType(accounting) {
+function setPaymentType(data, accounting) {
+    data.bankFk = accounting.id;
    if (!accounting) return;
    accountingType.value = accounting.accountingType;
-    initialData.description = [];
-    initialData.payed = Date.vnNew();
+    data.description = [];
+    data.payed = Date.vnNew();
    isCash.value = accountingType.value.code == 'cash';
    viewReceipt.value = isCash.value;
    if (accountingType.value.daysInFuture)
-        initialData.payed.setDate(
-            initialData.payed.getDate() + accountingType.value.daysInFuture,
-        );
+        data.payed.setDate(data.payed.getDate() + accountingType.value.daysInFuture);
    maxAmount.value = accountingType.value && accountingType.value.maxAmount;
-    if (accountingType.value.code == 'compensation')
-        return (initialData.description = '');
+    if (accountingType.value.code == 'compensation') return (data.description = '');

    let descriptions = [];
    if (accountingType.value.receiptDescription)
        descriptions.push(accountingType.value.receiptDescription);
-    if (initialData.description) descriptions.push(initialData.description);
-    initialData.description = descriptions.join(', ');
+    if (data.description) descriptions.push(data.description);
+    data.description = descriptions.join(', ');
 }

 const calculateFromAmount = (event) => {
@ -113,7 +111,6 @@ function onBeforeSave(data) {
    if (isCash.value && shouldSendEmail.value && !data.email)
        return notify(t('There is no assigned email for this client'), 'negative');

-    data.bankFk = data.bankFk?.id;
    return data;
 }

@ -181,42 +178,19 @@ async function getAmountPaid() {
            auto-load
            url="Clients/findOne"
        />
-        <FormModel
+        <FormModelPopup
            ref="formModelRef"
            :form-initial-data="initialData"
-            :observe-form-changes="false"
            :url-create="urlCreate"
            :mapper="onBeforeSave"
            @on-data-saved="onDataSaved"
-            prevent-submit
+            :prevent-submit="true"
        >
-            <template #form="{ data, validate }">
-                <span ref="closeButton" class="row justify-end close-icon" v-close-popup>
-                    <QIcon name="close" size="sm" />
-                </span>
-
+            <template #form-inputs="{ data, validate }">
                <h5 class="q-mt-none">{{ t('New payment') }}</h5>
-
-                <VnRow>
-                    <VnInputDate
-                        :label="t('Date')"
-                        :required="true"
-                        v-model="data.payed"
-                    />
-                    <VnSelect
-                        :label="t('Company')"
-                        :options="companyOptions"
-                        :required="true"
-                        :rules="validate('entry.companyFk')"
-                        hide-selected
-                        option-label="code"
-                        option-value="id"
-                        v-model="data.companyFk"
-                        @update:model-value="getAmountPaid()"
-                    />
-                </VnRow>
                <VnRow>
                    <VnSelect
+                        autofocus
                        :label="t('Bank')"
                        v-model="data.bankFk"
                        url="Accountings"
@ -225,9 +199,10 @@ async function getAmountPaid() {
                        sort-by="id"
                        :limit="0"
                        @update:model-value="
-                            (value, options) => setPaymentType(value, options)
+                            (value, options) => setPaymentType(data, value, options)
                        "
                        :emit-value="false"
+                        data-cy="paymentBank"
                    >
                        <template #option="scope">
                            <QItem v-bind="scope.itemProps">
@ -245,8 +220,28 @@ async function getAmountPaid() {
                        @update:model-value="calculateFromAmount($event)"
                        clearable
                        v-model.number="data.amountPaid"
+                        data-cy="paymentAmount"
                    />
                </VnRow>
+                <VnRow>
+                    <VnInputDate
+                        :label="t('Date')"
+                        v-model="data.payed"
+                        :required="true"
+                    />
+                    <VnSelect
+                        :label="t('Company')"
+                        :options="companyOptions"
+                        :required="true"
+                        :rules="validate('entry.companyFk')"
+                        hide-selected
+                        option-label="code"
+                        option-value="id"
+                        v-model="data.companyFk"
+                        @update:model-value="getAmountPaid()"
+                    />
+                </VnRow>
+
                <div v-if="data.bankFk?.accountingType?.code == 'compensation'">
                    <div class="text-h6">
                        {{ t('Compensation') }}
@ -287,27 +282,8 @@ async function getAmountPaid() {
                        <QCheckbox v-model="shouldSendEmail" :label="t('Send email')" />
                    </VnRow>
                </div>
-                <div class="q-mt-lg row justify-end">
-                    <QBtn
-                        :disabled="formModelRef.isLoading"
-                        :label="t('globals.cancel')"
-                        :loading="formModelRef.isLoading"
-                        class="q-ml-sm"
-                        color="primary"
-                        flat
-                        type="reset"
-                        v-close-popup
-                    />
-                    <QBtn
-                        :disabled="formModelRef.isLoading"
-                        :label="t('globals.save')"
-                        :loading="formModelRef.isLoading"
-                        color="primary"
-                        @click="formModelRef.save()"
-                    />
-                </div>
            </template>
-        </FormModel>
+        </FormModelPopup>
    </QDialog>
 </template>

--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@ -1,10 +1,10 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import EntryDescriptor from './EntryDescriptor.vue';
 import filter from './EntryFilter.js';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
        data-key="Entry"
        url="Entries"
        :descriptor="EntryDescriptor"
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@ -146,9 +146,8 @@ async function deleteEntry() {

 <template>
    <CardDescriptor
-        ref="entryDescriptorRef"
        :url="`Entries/${entityId}`"
-        :userFilter="entryFilter"
+        :filter="entryFilter"
        title="supplier.nickname"
        data-key="Entry"
        width="lg-width"
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@ -283,7 +283,11 @@ onBeforeMount(async () => {
 </script>

 <template>
-    <VnSection :data-key="dataKey" prefix="entry">
+    <VnSection
+        :data-key="dataKey"
+        prefix="entry"
+        :array-data-props="{ url: 'Entries/filter' }"
+    >
        <template #advanced-menu>
            <EntryFilter :data-key="dataKey" />
        </template>
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@ -1,5 +1,5 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
 import { onBeforeRouteUpdate } from 'vue-router';
 import { setRectificative } from '../composables/setRectificative';
@ -9,7 +9,7 @@ onBeforeRouteUpdate(async (to) => await setRectificative(to));
 </script>

 <template>
-    <VnCardBeta
+    <VnCard
        data-key="InvoiceIn"
        url="InvoiceIns"
        :descriptor="InvoiceInDescriptor"
--- a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
@ -1,10 +1,10 @@
 <script setup>
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import filter from './InvoiceOutFilter.js';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
        data-key="InvoiceOut"
        url="InvoiceOuts"
        :filter="filter"
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@ -230,7 +230,7 @@ watchEffect(selectedRows);
                    </span>
                </template>
                <template #more-create-dialog="{ data }">
-                    <div class="row q-col-gutter-xs">
+                    <div class="row q-col-gutter-xs col-span-2">
                        <div class="col-12">
                            <div class="q-col-gutter-xs">
                                <VnRow fixed>
--- a/src/pages/Item/Card/ItemCard.vue
+++ b/src/pages/Item/Card/ItemCard.vue
@ -1,9 +1,9 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import ItemDescriptor from './ItemDescriptor.vue';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
        data-key="Item"
        :url="`Items/${$route.params.id}/getCard`"
        :descriptor="ItemDescriptor"
--- a/src/pages/Item/ItemType/Card/ItemTypeCard.vue
+++ b/src/pages/Item/ItemType/Card/ItemTypeCard.vue
@ -1,11 +1,11 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import ItemTypeDescriptor from 'src/pages/Item/ItemType/Card/ItemTypeDescriptor.vue';
 import filter from './ItemTypeFilter.js';
 </script>

 <template>
-    <VnCardBeta
+    <VnCard
        data-key="ItemType"
        url="ItemTypes"
        :filter="filter"
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@ -1,11 +1,11 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
 import filter from './OrderFilter.js';
 </script>

 <template>
-    <VnCardBeta
+    <VnCard
        data-key="Order"
        url="Orders"
        :filter="filter"
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@ -156,9 +156,7 @@ const columns = computed(() => [
 onMounted(async () => {
    if (!route.query) return;
    if (route.query?.createForm) {
-        const query = JSON.parse(route.query?.createForm);
-        formInitialData.value = query;
-        await onClientSelected({ ...formInitialData.value, clientFk: query?.clientFk });
+        await onClientSelected(JSON.parse(route.query?.createForm));
    } else if (route.query?.table) {
        const query = JSON.parse(route.query?.table);
        const clientFk = query?.clientFk;
@ -177,7 +175,6 @@ watch(
                tableRef.value.create.formInitialData = formInitialData.value;
        }
    },
-    { immediate: true },
 );

 async function onClientSelected({ clientFk }, formData = {}) {
@ -191,13 +188,17 @@ async function onClientSelected({ clientFk }, formData = {}) {
    addressOptions.value = data;
    formData.defaultAddressFk = data[0].client.defaultAddressFk;
    formData.addressId = formData.defaultAddressFk;
-
-    formInitialData.value = { addressId: formData.addressId, clientFk };
+    formInitialData.value = { ...formData, clientFk };
    await fetchAgencies(formData);
 }

-async function fetchAgencies({ landed, addressId }) {
-    if (!landed || !addressId) return (agencyList.value = []);
+async function fetchAgencies(formData) {
+    const { landed, addressId } = formData;
+    if (!landed || !addressId) {
+        formData.defaultAddressFk = formInitialData.value.defaultAddressFk;
+
+        return (agencyList.value = []);
+    }

    const { data } = await axios.get('Agencies/landsThatDay', {
        params: {
@ -220,6 +221,11 @@ const getDateColor = (date) => {
    if (difference == 0) return 'bg-warning';
    if (difference < 0) return 'bg-success';
 };
+
+const isDefaultAddress = (opt, data) => {
+    const addressId = data.defaultAddressFk ?? data.addressId;
+    return addressId === opt.id && opt.isActive;
+};
 </script>

 <template>
@ -310,10 +316,7 @@ const getDateColor = (date) => {
                            >
                                <QItemSection style="min-width: min-content" avatar>
                                    <QIcon
-                                        v-if="
-                                            scope.opt.isActive &&
-                                            data.defaultAddressFk === scope.opt.id
-                                        "
+                                        v-if="isDefaultAddress(scope.opt, data)"
                                        size="sm"
                                        color="grey"
                                        name="star"
--- a/src/pages/Route/Agency/Card/AgencyCard.vue
+++ b/src/pages/Route/Agency/Card/AgencyCard.vue
@ -1,7 +1,7 @@
 <script setup>
 import AgencyDescriptor from 'pages/Route/Agency/Card/AgencyDescriptor.vue';
-import VnCardBeta from 'src/components/common/VnCardBeta.vue';
+import VnCard from 'src/components/common/VnCard.vue';
 </script>
 <template>
-    <VnCardBeta data-key="Agency" url="Agencies" :descriptor="AgencyDescriptor" />
+    <VnCard data-key="Agency" url="Agencies" :descriptor="AgencyDescriptor" />
 </template>
--- a/src/pages/Route/Card/RouteCard.vue
+++ b/src/pages/Route/Card/RouteCard.vue
@ -1,10 +1,10 @@
 <script setup>
 import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
-import VnCardBeta from 'src/components/common/VnCardBeta.vue';
+import VnCard from 'src/components/common/VnCard.vue';
 import filter from './RouteFilter.js';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
        data-key="Route"
        url="Routes"
        :filter="filter"
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@ -2,28 +2,38 @@
 import { onBeforeMount, onMounted, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { Notify } from 'quasar';
+import { useRoute } from 'vue-router';
 import { useSession } from 'src/composables/useSession';
 import { toDateHourMin } from 'filters/index';
 import { useStateStore } from 'src/stores/useStateStore';

-import axios from 'axios';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';

 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';

+const route = useRoute();
 const { t } = useI18n();
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 const state = useStateStore();
-const warehouses = ref([]);
 const selectedRows = ref([]);
+const dataKey = 'CmrList';
+const shipped = Date.vnNew();
+shipped.setHours(0, 0, 0, 0);
+shipped.setDate(shipped.getDate() - 1);
+const userParams = {
+    shipped: null,
+};
+
+
 const columns = computed(() => [
    {
        align: 'left',
        name: 'cmrFk',
-        label: t('route.cmr.list.cmrFk'),
+        label: t('route.cmr.params.cmrFk'),
        chip: {
            condition: () => true,
        },
@ -32,62 +42,67 @@ const columns = computed(() => [
    {
        align: 'center',
        name: 'hasCmrDms',
-        label: t('route.cmr.list.hasCmrDms'),
+        label: t('route.cmr.params.hasCmrDms'),
        component: 'checkbox',
        cardVisible: true,
    },
    {
        align: 'left',
-        label: t('route.cmr.list.ticketFk'),
+        label: t('route.cmr.params.ticketFk'),
        name: 'ticketFk',
    },
    {
        align: 'left',
-        label: t('route.cmr.list.routeFk'),
+        label: t('route.cmr.params.routeFk'),
        name: 'routeFk',
    },
    {
        align: 'left',
-        label: t('route.cmr.list.clientFk'),
+        label: t('route.cmr.params.clientFk'),
        name: 'clientFk',
    },
    {
        align: 'right',
-        label: t('route.cmr.list.country'),
+        label: t('route.cmr.params.countryFk'),
        name: 'countryFk',
-        cardVisible: true,
+        component: 'select',
        attrs: {
            url: 'countries',
            fields: ['id', 'name'],
-            optionLabel: 'name',
-            optionValue: 'id',
        },
        columnFilter: {
-            inWhere: true,
-            component: 'select',
+            name: 'countryFk',
+            attrs: {
+                url: 'countries',
+                fields: ['id', 'name'],
+            },
        },
        format: ({ countryName }) => countryName,
    },
    {
        align: 'right',
-        label: t('route.cmr.list.shipped'),
+        label: t('route.cmr.params.shipped'),
        name: 'shipped',
        cardVisible: true,
-        columnFilter: {
-            component: 'date',
-            inWhere: true,
-        },
+        component: 'date',
        format: ({ shipped }) => toDateHourMin(shipped),
    },
    {
        align: 'right',
+        label: t('route.cmr.params.warehouseFk'),
        name: 'warehouseFk',
-        label: t('globals.warehouse'),
-        columnFilter: {
-            component: 'select',
-        },
+        component: 'select',
        attrs: {
-            options: warehouses.value,
+            url: 'warehouses',
+            fields: ['id', 'name'],
+        },
+        columnFilter: {
+            inWhere: true,
+            name: 'warehouseFk',
+            attrs: {
+                url: 'warehouses',
+                fields: ['id', 'name'],
+            },
        },
        format: ({ warehouseName }) => warehouseName,
    },
@ -96,7 +111,7 @@ const columns = computed(() => [
        name: 'tableActions',
        actions: [
            {
-                title: t('Ver cmr'),
+                title: t('route.cmr.params.viewCmr'),
                icon: 'visibility',
                isPrimary: true,
                action: (row) => window.open(getCmrUrl(row?.cmrFk), '_blank'),
@ -105,13 +120,17 @@ const columns = computed(() => [
    },
 ]);

-onBeforeMount(async () => {
-    const { data } = await axios.get('Warehouses');
-    warehouses.value = data;
+onBeforeMount(() => {
+    initializeFromQuery();
 });

 onMounted(() => (state.rightDrawer = true));

+const initializeFromQuery = () => {
+    const query = route.query.table ? JSON.parse(route.query.table) : {};
+    shipped.value = query.shipped || shipped.toISOString();
+    Object.assign(userParams, { shipped });
+};
 function getApiUrl() {
    return new URL(window.location).origin;
 }
@ -133,6 +152,11 @@ function downloadPdfs() {
 }
 </script>
 <template>
+    <VnSearchbar
+        :data-key
+        :label="t('route.cmr.search')"
+        :info="t('route.cmr.searchInfo')"
+    />
    <VnSubToolbar>
        <template #st-actions>
            <QBtn
@ -142,16 +166,16 @@ function downloadPdfs() {
                :disable="!selectedRows?.length"
                @click="downloadPdfs"
            >
-                <QTooltip>{{ t('route.cmr.list.downloadCmrs') }}</QTooltip>
+                <QTooltip>{{ t('route.cmr.params.downloadCmrs') }}</QTooltip>
            </QBtn>
        </template>
    </VnSubToolbar>
    <VnTable
        ref="tableRef"
-        data-key="CmrList"
+        :data-key
        url="Cmrs/filter"
        :columns="columns"
-        :right-search="true"
+        :user-params="userParams"
        default-mode="table"
        v-model:selected="selectedRows"
        table-height="85vh"
--- a/src/pages/Route/Roadmap/RoadmapCard.vue
+++ b/src/pages/Route/Roadmap/RoadmapCard.vue
@ -1,7 +1,7 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import RoadmapDescriptor from 'pages/Route/Roadmap/RoadmapDescriptor.vue';
 </script>
 <template>
-    <VnCardBeta data-key="Roadmap" url="Roadmaps" :descriptor="RoadmapDescriptor" />
+    <VnCard data-key="Roadmap" url="Roadmaps" :descriptor="RoadmapDescriptor" />
 </template>
--- a/src/pages/Route/Vehicle/Card/VehicleCard.vue
+++ b/src/pages/Route/Vehicle/Card/VehicleCard.vue
@ -1,10 +1,10 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import VehicleDescriptor from './VehicleDescriptor.vue';
 import VehicleFilter from '../VehicleFilter.js';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
        data-key="Vehicle"
        url="Vehicles"
        :filter="VehicleFilter"
--- a/src/pages/Route/locale/en.yml
+++ b/src/pages/Route/locale/en.yml
@ -3,16 +3,19 @@ route:
        search: Search roadmap
        searchInfo: You can search by roadmap reference
    params:
+        id: Id
+        name: Name
        etd: ETD
        tractorPlate: Plate
        price: Price
        observations: Observations
-        id: ID
-        name: Name
        cmrFk: CMR id
        hasCmrDms: Attached in gestdoc
        ticketFk: Ticketd id
        routeFk: Route id
+        clientFk: Client id
+        countryFk: Country
+        warehouseFk: Warehouse
        shipped: Shipped
        agencyAgreement: Agency agreement
        agencyModeName: Agency route
@ -42,7 +45,9 @@ route:
    search: Search route
    searchInfo: You can search by route reference
    cmr:
-        list:
+        search: Search Cmr
+        searchInfo: You can search Cmr by Id
+        params:
            results: results
            cmrFk: CMR id
            hasCmrDms: Attached in gestdoc
@ -50,8 +55,10 @@ route:
            'false': 'No'
            ticketFk: Ticketd id
            routeFk: Route id
-            country: Country
+            countryFk: Country
            clientFk: Client id
+            warehouseFk: Warehouse
            shipped: Preparation date
            viewCmr: View CMR
-            downloadCmrs: Download CMRs
+            downloadCmrs: Download CMRs
+            search: General search
--- a/src/pages/Route/locale/es.yml
+++ b/src/pages/Route/locale/es.yml
@ -3,8 +3,6 @@ route:
        search: Buscar troncales
        searchInfo: Puedes buscar por referencia del troncal
    params:
-        agencyModeName: Agencia Ruta
-        agencyAgreement: Agencia Acuerdo
        id: Id
        name: Troncal
        etd: ETD
@ -13,9 +11,15 @@ route:
        observations: Observaciones
        cmrFk: Id CMR
        hasCmrDms: Gestdoc
+        search: Búsqueda general
        ticketFk: Id ticket
-        routeFK: Id ruta
+        routeFk: Id ruta
+        clientFk: Id cliente
+        countryFk: Pais
+        warehouseFk: Almacén
        shipped: Fecha preparación
+        agencyModeName: Agencia Ruta
+        agencyAgreement: Agencia Acuerdo
    Worker: Trabajador
    Agency: Agencia
    Vehicle: Vehículo
@ -55,4 +59,4 @@ route:
            clientFk: Id cliente
            shipped: Fecha preparación
            viewCmr: Ver CMR
-            downloadCmrs: Descargar CMRs
+            downloadCmrs: Descargar CMRs
--- a/src/pages/Shelving/Card/ShelvingCard.vue
+++ b/src/pages/Shelving/Card/ShelvingCard.vue
@ -1,11 +1,11 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
 import filter from './ShelvingFilter.js';
 </script>

 <template>
-    <VnCardBeta
+    <VnCard
        data-key="Shelving"
        url="Shelvings"
        :filter="filter"
--- a/src/pages/Shelving/Parking/Card/ParkingCard.vue
+++ b/src/pages/Shelving/Parking/Card/ParkingCard.vue
@ -1,11 +1,11 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import ParkingDescriptor from 'pages/Shelving/Parking/Card/ParkingDescriptor.vue';
 import filter from './ParkingFilter.js';
 </script>

 <template>
-    <VnCardBeta
+    <VnCard
        data-key="Parking"
        url="Parkings"
        :filter="filter"
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@ -1,10 +1,10 @@
 <script setup>
 import SupplierDescriptor from './SupplierDescriptor.vue';
-import VnCardBeta from 'src/components/common/VnCardBeta.vue';
+import VnCard from 'src/components/common/VnCard.vue';
 import filter from './SupplierFilter.js';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
        data-key="Supplier"
        url="Suppliers"
        :descriptor="SupplierDescriptor"
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@ -172,6 +172,7 @@ const filterColumns = computed(() => {
            >
                <template #more-create-dialog="{ data }">
                    <VnInput
+                        class="col-span-2"
                        :label="t('globals.name')"
                        v-model="data.socialName"
                        :uppercase="true"
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@ -1,10 +1,10 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import TicketDescriptor from './TicketDescriptor.vue';
 import filter from './TicketFilter.js';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
        data-key="Ticket"
        url="Tickets"
        :descriptor="TicketDescriptor"
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@ -54,8 +54,7 @@ onBeforeMount(() => {
 onMounted(async () => {
    if (!route.query) return;
    if (route.query?.createForm) {
-        formInitialData.value = JSON.parse(route.query?.createForm);
-        await onClientSelected(formInitialData.value);
+        await onClientSelected(JSON.parse(route.query?.createForm));
    } else if (route.query?.table) {
        const query = route.query?.table;
        const clientId = +JSON.parse(query)?.clientFk;
@ -273,12 +272,18 @@ const fetchAddresses = async (formData) => {
        return;
    }
    const { data } = await getAddresses(formData.clientId);
-    formInitialData.value = { clientId: formData.clientId };
-    if (!data) return;
+
+    if (!data) {
+        formInitialData.value = { clientId: formData.clientId };
+        return;
+    }
    addressesOptions.value = data;
    selectedClient.value = data[0].client;
    formData.addressId = selectedClient.value.defaultAddressFk;
-    formInitialData.value.addressId = formData.addressId;
+    formInitialData.value = {
+        clientId: formData.clientId,
+        addressId: formData.addressId,
+    };
 };
 watch(
    () => route.query.table,
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@ -1,10 +1,10 @@
 <script setup>
 import TravelDescriptor from './TravelDescriptor.vue';
-import VnCardBeta from 'src/components/common/VnCardBeta.vue';
+import VnCard from 'src/components/common/VnCard.vue';
 import filter from './TravelFilter.js';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
        data-key="Travel"
        url="Travels"
        :descriptor="TravelDescriptor"
--- a/src/pages/Wagon/Card/WagonCard.vue
+++ b/src/pages/Wagon/Card/WagonCard.vue
@ -1,6 +1,6 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCard from 'src/components/common/VnCard.vue';
 </script>
 <template>
-    <VnCard data-key="Wagon" url="Wagons" />
+    <VnCard data-key="Wagon" url="Wagons" :descriptor="{}" />
 </template>
--- a/src/pages/Wagon/WagonList.vue
+++ b/src/pages/Wagon/WagonList.vue
@ -8,6 +8,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
 import { computed, ref } from 'vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnSection from 'src/components/common/VnSection.vue';

 const quasar = useQuasar();
 const arrayData = useArrayData('WagonList');
@ -15,6 +16,7 @@ const store = arrayData.store;
 const router = useRouter();
 const { t } = useI18n();
 const tableRef = ref();
+const dataKey = 'WagonList';
 const filter = {
    include: {
        relation: 'type',
@ -75,101 +77,110 @@ function navigate(id) {
 }

 async function remove(row) {
-    try {
-        await axios.delete(`Wagons/${row.id}`).then(async () => {
-            quasar.notify({
-                message: t('wagon.list.removeItem'),
-                type: 'positive',
-            });
-            store.data.splice(store.data.indexOf(row), 1);
-            window.location.reload();
+    await axios.delete(`Wagons/${row.id}`).then(async () => {
+        quasar.notify({
+            message: t('wagon.list.removeItem'),
+            type: 'positive',
        });
-    } catch (error) {
-        //
-    }
+        store.data.splice(store.data.indexOf(row), 1);
+        window.location.reload();
+    });
 }
 </script>
-
 <template>
    <QPage class="column items-center q-pa-md">
-        <VnTable
-            ref="tableRef"
-            data-key="WagonList"
-            url="Wagons"
-            :filter="filter"
+        <VnSection
+            :data-key="dataKey"
            :columns="columns"
-            order="id DESC"
-            :column-search="false"
-            :default-mode="'card'"
-            :disable-option="{ table: true }"
-            :create="{
-                urlCreate: 'Wagons',
-                title: t('Create new wagon'),
-                onDataSaved: () => tableRef.reload(),
-                formInitialData: {},
+            prefix="card"
+            :array-data-props="{
+                url: 'Wagons',
+                exprBuilder,
+                order: 'id DESC',
            }"
        >
-            <template #more-create-dialog="{ data }">
-                <VnInput
-                    filled
-                    v-model="data.label"
-                    :label="t('wagon.create.label')"
-                    type="number"
-                    min="0"
-                    :rules="[(val) => !!val || t('wagon.warnings.labelNotEmpty')]"
-                />
-                <VnInput
-                    filled
-                    v-model="data.plate"
-                    :label="t('wagon.list.plate')"
-                    :rules="[(val) => !!val || t('wagon.warnings.plateNotEmpty')]"
-                />
-                <VnInput
-                    filled
-                    v-model="data.volume"
-                    :label="t('wagon.list.volume')"
-                    type="number"
-                    min="0"
-                    :rules="[(val) => !!val || t('wagon.warnings.volumeNotEmpty')]"
-                />
-                <VnSelect
-                    url="WagonTypes"
-                    filled
-                    v-model="data.typeFk"
-                    use-input
-                    fill-input
-                    hide-selected
-                    input-debounce="0"
-                    option-label="name"
-                    option-value="id"
-                    emit-value
-                    map-options
-                    :label="t('globals.type')"
-                    :options="filteredWagonTypes"
-                    :rules="[(val) => !!val || t('wagon.warnings.typeNotEmpty')]"
-                    @filter="filterType"
+            <template #body>
+                <VnTable
+                    ref="tableRef"
+                    :data-key="dataKey"
+                    :create="{
+                        urlCreate: 'Wagons',
+                        title: t('Create new wagon'),
+                        onDataSaved: () => tableRef.reload(),
+                        formInitialData: {},
+                    }"
+                    :filter="filter"
+                    :columns="columns"
+                    :column-search="false"
+                    :default-mode="'card'"
+                    :disable-option="{ table: true }"
+                    :right-search="false"
                >
-                    <template v-if="data.typeFk" #append>
-                        <QIcon
-                            name="cancel"
-                            @click.stop.prevent="data.typeFk = null"
-                            class="cursor-pointer"
+                    <template #more-create-dialog="{ data }">
+                        <VnInput
+                            filled
+                            v-model="data.label"
+                            :label="t('wagon.create.label')"
+                            type="number"
+                            min="0"
+                            :rules="[(val) => !!val || t('wagon.warnings.labelNotEmpty')]"
                        />
+                        <VnInput
+                            filled
+                            v-model="data.plate"
+                            :label="t('wagon.list.plate')"
+                            :rules="[(val) => !!val || t('wagon.warnings.plateNotEmpty')]"
+                        />
+                        <VnInput
+                            filled
+                            v-model="data.volume"
+                            :label="t('wagon.list.volume')"
+                            type="number"
+                            min="0"
+                            :rules="[
+                                (val) => !!val || t('wagon.warnings.volumeNotEmpty'),
+                            ]"
+                        />
+                        <VnSelect
+                            url="WagonTypes"
+                            filled
+                            v-model="data.typeFk"
+                            use-input
+                            fill-input
+                            hide-selected
+                            input-debounce="0"
+                            option-label="name"
+                            option-value="id"
+                            emit-value
+                            map-options
+                            :label="t('globals.type')"
+                            :options="filteredWagonTypes"
+                            :rules="[(val) => !!val || t('wagon.warnings.typeNotEmpty')]"
+                            @filter="filterType"
+                        >
+                            <template v-if="data.typeFk" #append>
+                                <QIcon
+                                    name="cancel"
+                                    @click.stop.prevent="data.typeFk = null"
+                                    class="cursor-pointer"
+                                />
+                            </template>
+                            <template #no-option>
+                                <QItem>
+                                    <QItemSection class="text-grey">
+                                        {{ t('wagon.warnings.noData') }}
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelect>
                    </template>
-                    <template #no-option>
-                        <QItem>
-                            <QItemSection class="text-grey">
-                                {{ t('wagon.warnings.noData') }}
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
+                </VnTable>
            </template>
-        </VnTable>
+        </VnSection>
    </QPage>
 </template>

 <i18n>
 es:
    Create new wagon: Crear nuevo vagón
-</i18n>
+</i18n>
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@ -96,6 +96,7 @@ async function setAdvancedSummary(data) {
                    option-label="name"
                    option-value="code"
                    v-model="data.maritalStatus"
+                    data-cy="MaritalStatus"
                />
            </VnRow>

@ -107,6 +108,7 @@ async function setAdvancedSummary(data) {
                    option-label="name"
                    option-value="id"
                    v-model="data.originCountryFk"
+                    data-cy="country"
                />
                <VnSelect
                    :label="t('Education level')"
@ -132,7 +134,7 @@ async function setAdvancedSummary(data) {
                <VnInputDate :label="t('seniority')" v-model="data.seniority" />
            </VnRow>
            <VnRow>
-                <VnInput v-model="data.fi" :label="t('fi')" />
+                <VnInput v-model="data.fi" :label="t('fi')" data-cy="fi" />
                <VnInputDate :label="t('birth')" v-model="data.birth" />
            </VnRow>
            <VnRow wrap>
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@ -1,9 +1,9 @@
 <script setup>
 import WorkerDescriptor from './WorkerDescriptor.vue';
-import VnCardBeta from 'src/components/common/VnCardBeta.vue';
+import VnCard from 'src/components/common/VnCard.vue';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
        data-key="Worker"
        url="Workers/summary"
        :id-in-where="true"
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@ -98,12 +98,14 @@ watch(
                            <VnInput
                                :label="t('worker.operator.numberOfWagons')"
                                v-model="row.numberOfWagons"
+                                data-cy="numberOfWagons"
                            />
                            <VnSelect
                                :label="t('worker.operator.train')"
                                :options="trainsData"
                                hide-selected
                                v-model="row.trainFk"
+                                data-cy="train"
                                :required="true"
                            />
                        </VnRow>
@ -116,6 +118,7 @@ watch(
                                option-value="code"
                                v-model="row.itemPackingTypeFk"
                                :required="true"
+                                data-cy="itemPackingType"
                            />
                            <VnSelect
                                :label="t('worker.operator.warehouse')"
@ -123,6 +126,7 @@ watch(
                                hide-selected
                                v-model="row.warehouseFk"
                                :required="true"
+                                data-cy="warehouse"
                            />
                        </VnRow>
                        <VnRow>
@ -132,6 +136,7 @@ watch(
                                hide-selected
                                option-label="description"
                                v-model="row.sectorFk"
+                                data-cy="sector"
                            />
                            <VnSelect
                                :label="t('worker.operator.labeler')"
@ -139,6 +144,7 @@ watch(
                                hide-selected
                                option-label="name"
                                v-model="row.labelerFk"
+                                data-cy="labeler"
                            >
                                <template #option="scope">
                                    <QItem v-bind="scope.itemProps">
@ -160,11 +166,13 @@ watch(
                                :label="t('worker.operator.linesLimit')"
                                v-model="row.linesLimit"
                                lazy-rules
+                                data-cy="linesLimit"
                            />
                            <VnInput
                                :label="t('worker.operator.volumeLimit')"
                                v-model="row.volumeLimit"
                                lazy-rules
+                                data-cy="volumeLimit"
                            />
                        </VnRow>
                        <VnRow>
@ -172,6 +180,7 @@ watch(
                                :label="t('worker.operator.sizeLimit')"
                                v-model="row.sizeLimit"
                                lazy-rules
+                                data-cy="sizeLimit"
                            />
                            <VnInput
                                :label="t('worker.operator.isOnReservationMode')"
--- a/src/pages/Worker/Card/WorkerPit.vue
+++ b/src/pages/Worker/Card/WorkerPit.vue
@ -68,8 +68,14 @@ const deleteRelative = async (id) => {
                        :label="t('familySituation')"
                        clearable
                        v-model="data.familySituation"
+                        data-cy="familySituation"
+                    />
+                    <VnInput
+                        :label="t('spouseNif')"
+                        clearable
+                        v-model="data.spouseNif"
+                        data-cy="spouseNif"
                    />
-                    <VnInput :label="t('spouseNif')" clearable v-model="data.spouseNif" />
                </VnRow>
                <VnRow>
                    <VnSelect
@ -93,11 +99,13 @@ const deleteRelative = async (id) => {
                        clearable
                        v-model="data.childPension"
                        :label="t(`childPension`)"
+                        data-cy="childPension"
                    />
                    <VnInput
                        clearable
                        v-model="data.spousePension"
                        :label="t(`spousePension`)"
+                        data-cy="spousePension"
                    />
                </VnRow>
                <VnRow wrap>
@ -190,12 +198,14 @@ const deleteRelative = async (id) => {
                                type="number"
                                v-model="row.birthed"
                                :label="t(`birthed`)"
+                                data-cy="birthed"
                            />

                            <VnInput
                                type="number"
                                v-model="row.adoptionYear"
                                :label="t(`adoptionYear`)"
+                                data-cy="adoptionYear"
                            />
                            <QCheckbox
                                v-model="row.isDependend"
--- a/src/pages/Worker/Card/WorkerTimeForm.vue
+++ b/src/pages/Worker/Card/WorkerTimeForm.vue
@ -53,7 +53,7 @@ const title = computed(() => (isEditMode.value ? t('Edit entry') : t('Add time')
 const urlCreate = computed(() =>
    isEditMode.value
        ? `WorkerTimeControls/${$props.entryId}/updateTimeEntry`
-        : `WorkerTimeControls/${route.params.id}/addTimeEntry`
+        : `WorkerTimeControls/${route.params.id}/addTimeEntry`,
 );

 onBeforeMount(() => {
@ -83,6 +83,7 @@ onBeforeMount(() => {
                autofocus
                :required="true"
                :is-clearable="false"
+                data-cy="entryHour"
            />
            <VnSelect
                :label="t('Type')"
@ -91,6 +92,7 @@ onBeforeMount(() => {
                option-value="code"
                option-label="description"
                hide-selected
+                data-cy="entryType"
            />
        </template>
    </FormModelPopup>
--- a/src/pages/Worker/Department/Card/DepartmentCard.vue
+++ b/src/pages/Worker/Department/Card/DepartmentCard.vue
@ -1,9 +1,9 @@
 <script setup>
-import VnCardBeta from 'components/common/VnCardBeta.vue';
+import VnCard from 'components/common/VnCard.vue';
 import DepartmentDescriptor from 'pages/Worker/Department/Card/DepartmentDescriptor.vue';
 </script>
 <template>
-    <VnCardBeta
+    <VnCard
        class="q-pa-md column items-center"
        v-bind="{ ...$attrs }"
        data-key="Department"
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@ -223,7 +223,7 @@ async function autofillBic(worker) {
                :right-search="false"
            >
                <template #more-create-dialog="{ data }">
-                    <div class="q-pa-lg full-width">
+                    <div class="col-span-2">
                        <VnRadio
                            v-model="data.isFreelance"
                            :val="false"
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@ -1,7 +1,7 @@
 <script setup>
-import VnCardBeta from 'src/components/common/VnCardBeta.vue';
+import VnCard from 'src/components/common/VnCard.vue';
 import ZoneDescriptor from './ZoneDescriptor.vue';
 </script>
 <template>
-    <VnCardBeta data-key="Zone" url="Zones" :descriptor="ZoneDescriptor" />
+    <VnCard data-key="Zone" url="Zones" :descriptor="ZoneDescriptor" />
 </template>
--- a/src/router/modules/wagon.js
+++ b/src/router/modules/wagon.js
@ -1,52 +1,60 @@
 import { RouterView } from 'vue-router';

+const wagonCard = {
+    name: 'WagonCard',
+    path: ':id',
+    component: () => import('src/pages/Wagon/Card/WagonCard.vue'),
+    redirect: { name: 'WagonEdit' },
+    meta: {
+        menu: ['WagonEdit'],
+    },
+    children: [
+        {
+            path: 'edit',
+            name: 'WagonEdit',
+            meta: {
+                title: 'wagonEdit',
+                icon: 'edit',
+            },
+            component: () => import('src/pages/Wagon/WagonCreate.vue'),
+        },
+    ],
+};
+
 export default {
-    path: '/wagon',
    name: 'Wagon',
+    path: '/wagon',
    meta: {
        title: 'wagons',
        icon: 'vn:trolley',
        moduleName: 'Wagon',
+        menu: ['WagonList', 'WagonTypeList', 'WagonCounter'],
    },
    component: RouterView,
    redirect: { name: 'WagonMain' },
-    menus: {
-        main: ['WagonList', 'WagonTypeList', 'WagonCounter', 'WagonTray'],
-        card: [],
-    },
    children: [
        {
-            path: '/wagon',
+            path: '',
            name: 'WagonMain',
            component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'WagonList' },
+            redirect: { name: 'WagonIndexMain' },
            children: [
                {
-                    path: 'list',
-                    name: 'WagonList',
-                    meta: {
-                        title: 'list',
-                        icon: 'vn:trolley',
-                    },
+                    path: '',
+                    name: 'WagonIndexMain',
+                    redirect: { name: 'WagonList' },
                    component: () => import('src/pages/Wagon/WagonList.vue'),
-                },
-                {
-                    path: 'create',
-                    name: 'WagonCreate',
-                    meta: {
-                        title: 'wagonCreate',
-                        icon: 'create',
-                    },
-                    component: () => import('src/pages/Wagon/WagonCreate.vue'),
-                },
-                {
-                    path: ':id/edit',
-                    name: 'WagonEdit',
-                    meta: {
-                        title: 'wagonEdit',
-                        icon: 'edit',
-                    },
-                    component: () => import('src/pages/Wagon/WagonCreate.vue'),
+                    children: [
+                        {
+                            name: 'WagonList',
+                            path: 'list',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
+                            },
+                        },
+                        wagonCard,
+                    ],
                },
                {
                    path: 'counter',
@ -57,40 +65,32 @@ export default {
                    },
                    component: () => import('src/pages/Wagon/WagonCounter.vue'),
                },
-            ],
-        },
-        {
-            path: '/wagon/type',
-            name: 'WagonTypeMain',
-            component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'WagonTypeList' },
-            children: [
                {
-                    path: 'list',
-                    name: 'WagonTypeList',
-                    meta: {
-                        title: 'typesList',
-                        icon: 'view_list',
-                    },
-                    component: () => import('src/pages/Wagon/Type/WagonTypeList.vue'),
-                },
-                {
-                    path: 'create',
-                    name: 'WagonTypeCreate',
-                    meta: {
-                        title: 'typeCreate',
-                        icon: 'create',
-                    },
-                    component: () => import('src/pages/Wagon/Type/WagonTypeList.vue'),
-                },
-                {
-                    path: ':id/edit',
-                    name: 'WagonTypeEdit',
-                    meta: {
-                        title: 'typeEdit',
-                        icon: 'edit',
-                    },
-                    component: () => import('src/pages/Wagon/Type/WagonTypeEdit.vue'),
+                    path: 'type',
+                    name: 'WagonTypeMain',
+                    redirect: { name: 'WagonTypeList' },
+                    children: [
+                        {
+                            path: 'list',
+                            name: 'WagonTypeList',
+                            meta: {
+                                title: 'typesList',
+                                icon: 'view_list',
+                            },
+                            component: () =>
+                                import('src/pages/Wagon/Type/WagonTypeList.vue'),
+                        },
+                        {
+                            path: ':id/edit',
+                            name: 'WagonTypeEdit',
+                            meta: {
+                                title: 'typeEdit',
+                                icon: 'edit',
+                            },
+                            component: () =>
+                                import('src/pages/Wagon/Type/WagonTypeEdit.vue'),
+                        },
+                    ],
                },
            ],
        },
--- a/test/cypress/integration/client/clientBalance.spec.js
+++ b/test/cypress/integration/client/clientBalance.spec.js
@ -5,7 +5,10 @@ describe('Client balance', () => {
        cy.login('developer');
        cy.visit('#/customer/1101/balance');
    });
-    it('Should load layout', () => {
-        cy.get('.q-page').should('be.visible');
+    it('Should create a mandate', () => {
+        cy.get('.q-page-sticky > div > .q-btn').click();
+        cy.selectOption('[data-cy="paymentBank"]', 2);
+        cy.dataCy('paymentAmount_input').type('100');
+        cy.saveCard();
    });
 });
--- a/test/cypress/integration/order/orderList.spec.js
+++ b/test/cypress/integration/order/orderList.spec.js
@ -34,8 +34,8 @@ describe('OrderList', () => {
        cy.dataCy('Customer ID_input').type('1101{enter}');
        cy.dataCy('vnTableCreateBtn').click();
        cy.dataCy('landedDate').find('input').type('06/01/2001');
-        cy.get(agencyCreateSelect).click();
-        cy.get('.q-menu > div> .q-item:nth-child(1)').click();
+        cy.selectOption(agencyCreateSelect, 1);
+
        cy.intercept('GET', /\/api\/Orders\/\d/).as('orderSale');
        cy.get('[data-cy="FormModelPopup_save"] > .q-btn__content > .block').click();
        cy.wait('@orderSale');
@ -60,8 +60,8 @@ describe('OrderList', () => {
        cy.get(clientCreateSelect).should('have.value', 'Bruce Wayne');
        cy.get(addressCreateSelect).should('have.value', 'Bruce Wayne');
        cy.dataCy('landedDate').find('input').type('06/01/2001');
-        cy.get(agencyCreateSelect).click();
-        cy.get('.q-menu > div> .q-item:nth-child(1)').click();
+        cy.selectOption(agencyCreateSelect, 1);
+
        cy.intercept('GET', /\/api\/Orders\/\d/).as('orderSale');
        cy.get('[data-cy="FormModelPopup_save"] > .q-btn__content > .block').click();
        cy.wait('@orderSale');
--- a/test/cypress/integration/route/routeExtendedList.spec.js
+++ b/test/cypress/integration/route/routeExtendedList.spec.js
@ -1,4 +1,4 @@
-describe('Route extended list', () => {
+describe.skip('Route extended list', () => {
    const getSelector = (colField) => `tr:last-child > [data-col-field="${colField}"]`;

    const selectors = {
--- a/test/cypress/integration/ticket/negative/TicketLackDetail.spec.js
+++ b/test/cypress/integration/ticket/negative/TicketLackDetail.spec.js
@ -138,7 +138,7 @@ describe.skip('Ticket Lack detail', () => {
            cy.get('[data-cy="itemProposal"]').click();
            cy.wait('@getItemGetSimilar');
        });
-        describe('Replace item if', () => {
+        describe.skip('Replace item if', () => {
            it('Quantity is less than available', () => {
                cy.get(':nth-child(1) > .text-right  > .q-btn').click();
            });
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@ -38,8 +38,8 @@ describe('TicketList', () => {
    it('filter client and create ticket', () => {
        cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketSearchbar');
        searchResults();
+        cy.wait('@ticketSearchbar');

-        cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketFilter');
        cy.dataCy('Customer ID_input').clear('1');
        cy.dataCy('Customer ID_input').type('1101{enter}');

--- a/test/cypress/integration/wagon/wagonCreate.spec.js
+++ b/test/cypress/integration/wagon/wagonCreate.spec.js
@ -1,4 +1,4 @@
-describe.skip('WagonCreate', () => {
+describe('WagonCreate', () => {
    beforeEach(() => {
        cy.viewport(1280, 720);
        cy.login('developer');
@ -17,7 +17,7 @@ describe.skip('WagonCreate', () => {
            '.grid-create > [label="Volume"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Volume_input"]',
        ).type('100');
        cy.selectOption('[data-cy="Type_select"]', '1');
-
+        cy.dataCy('FormModelPopup_save').click();
        cy.get('[title="Remove"] > .q-btn__content > .q-icon').first().click();
    });
 });
--- a/test/cypress/integration/wagon/wagonType/wagonTypeCreate.spec.js
+++ b/test/cypress/integration/wagon/wagonType/wagonTypeCreate.spec.js
@ -2,7 +2,7 @@ describe('WagonTypeCreate', () => {
    beforeEach(() => {
        cy.viewport(1920, 1080);
        cy.login('developer');
-        cy.visit('/#/wagon/type/create');
+        cy.visit('/#/wagon/type/list');
        cy.waitForElement('.q-page', 6000);
    });

--- a/test/cypress/integration/worker/workerBasicData.spec.js
+++ b/test/cypress/integration/worker/workerBasicData.spec.js
@ -0,0 +1,15 @@
+describe('WorkerBasicData', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('/#/worker/1107/basic-data');
+    });
+
+    it('should modify worker summary', () => {
+        cy.dataCy('MaritalStatus').type('Married');
+        cy.dataCy('fi').type('42572374H');
+        cy.dataCy('country').type('Alemania');
+        cy.saveCard();
+        cy.checkNotification('Data saved');
+    });
+});
--- a/test/cypress/integration/worker/workerBusiness.spec.js
+++ b/test/cypress/integration/worker/workerBusiness.spec.js
@ -0,0 +1,34 @@
+describe('WorkerBusiness', () => {
+    const saveBtn = '.q-mt-lg > .q-btn--standard';
+    const contributionCode = `Representantes de comercio`;
+    const contractType = `INDEFINIDO A TIEMPO COMPLETO`;
+
+    const Business = {
+        'Start Date': { val: '26-12-2002', type: 'date' },
+        Company: { val: `VNL`, type: 'select' },
+        Department: { val: `RECICLAJE`, type: 'select' },
+        'Professional Category': { val: `employee`, type: 'select' },
+        'Work Calendar': { val: `General schedule`, type: 'select' },
+        'Work Center': { val: `Silla`, type: 'select' },
+        'Contract Category': { val: `INFORMATICA`, type: 'select' },
+        'Contribution Code': { val: contributionCode, type: 'select' },
+        Rate: { val: `5` },
+        'Contract Type': { val: contractType, type: 'select' },
+        'Transport Workers Salary': { val: `1000` },
+    };
+
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('hr');
+        cy.visit('/#/worker/1107/business');
+        cy.addCard();
+    });
+
+    it('should create a business', () => {
+        cy.fillInForm({
+            ...Business,
+        });
+        cy.get(saveBtn).click();
+        cy.checkNotification('Data created');
+    });
+});
--- a/test/cypress/integration/worker/workerMutual.spec.js
+++ b/test/cypress/integration/worker/workerMutual.spec.js
@ -0,0 +1,23 @@
+/// <reference types="cypress" />
+describe('WorkerMutual', () => {
+    const userId = 1106;
+    const saveBtn = '.q-mt-lg > .q-btn--standard';
+    const medicalReview = {
+        Date: { val: '01-01-2001', type: 'date' },
+        'Formation Center': { val: '1', type: 'select' },
+        Invoice: { val: '24532' },
+        Amount: { val: '540' },
+    };
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit(`/#/worker/${userId}/medical`);
+        cy.addCard();
+    });
+
+    it('should create a medical Review', () => {
+        cy.fillInForm(medicalReview);
+        cy.get(saveBtn).click();
+        cy.checkNotification('Data created');
+    });
+});
--- a/test/cypress/integration/worker/workerNotes.spec.js
+++ b/test/cypress/integration/worker/workerNotes.spec.js
@ -0,0 +1,13 @@
+/// <reference types="cypress" />
+describe('WorkerNotes', () => {
+    const userId = 1106;
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit(`/#/worker/${userId}/notes`);
+    });
+
+    it('Should load layout', () => {
+        cy.get('.q-card').should('be.visible');
+    });
+});
--- a/test/cypress/integration/worker/workerOperator.spec.js
+++ b/test/cypress/integration/worker/workerOperator.spec.js
@ -0,0 +1,19 @@
+/// <reference types="cypress" />
+describe('WorkerOperator', () => {
+    const userId = 1106;
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('hr');
+        cy.visit(`/#/worker/${userId}/operator`);
+    });
+
+    it('should fill the operator form', () => {
+        cy.dataCy('numberOfWagons').type('4');
+        cy.dataCy('linesLimit').type('6');
+        cy.dataCy('volumeLimit').type('3');
+        cy.dataCy('sizeLimit').type('3');
+        cy.saveCard();
+
+        cy.checkNotification('Data saved');
+    });
+});
--- a/test/cypress/integration/worker/workerPit.spec.js
+++ b/test/cypress/integration/worker/workerPit.spec.js
@ -1,19 +1,5 @@
 describe('WorkerPit', () => {
-    const familySituationInput = '[data-cy="Family Situation_input"]';
-    const familySituation = '1';
-    const childPensionInput = '[data-cy="Child Pension_input"]';
-    const childPension = '120';
-    const spouseNifInput = '[data-cy="Spouse Pension_input"]';
-    const spouseNif = '65117125P';
-    const spousePensionInput = '[data-cy="Spouse Pension_input"]';
-    const spousePension = '120';
    const addRelative = '[data-cy="addRelative"]';
-    const isDescendantSelect = '[data-cy="Descendant/Ascendant"]';
-    const Descendant = 'Descendiente';
-    const birthedInput = '[data-cy="Birth Year_input"]';
-    const birthed = '2002';
-    const adoptionYearInput = '[data-cy="Adoption Year_input"]';
-    const adoptionYear = '2004';
    const saveRelative = '[data-cy="workerPitRelativeSaveBtn"]';
    const savePIT = '#st-actions > .q-btn-group > .q-btn--standard';

@ -24,15 +10,15 @@ describe('WorkerPit', () => {
    });

    it('complete PIT', () => {
-        cy.get(familySituationInput).type(familySituation);
-        cy.get(childPensionInput).type(childPension);
-        cy.get(spouseNifInput).type(spouseNif);
-        cy.get(spousePensionInput).type(spousePension);
+        cy.dataCy('familySituation').type('1');
+        cy.dataCy('childPension').type('120');
+        cy.dataCy('spouseNif').type('65117125P');
+        cy.dataCy('spousePension').type('120');
        cy.get(savePIT).click();
        cy.get(addRelative).click();
-        cy.get(isDescendantSelect).type(Descendant);
-        cy.get(birthedInput).type(birthed);
-        cy.get(adoptionYearInput).type(adoptionYear);
+        cy.dataCy('Descendant/Ascendant').type('Descendiente');
+        cy.dataCy('birthed').type('2002');
+        cy.dataCy('adoptionYear').type('2004');
        cy.get(saveRelative).click();
    });
 });
--- a/test/cypress/integration/worker/workerSummary.spec.js
+++ b/test/cypress/integration/worker/workerSummary.spec.js
@ -1,4 +1,6 @@
 describe('WorkerSummary', () => {
+    const departmentDescriptor = ':nth-child(1) > :nth-child(3) > .value > .link';
+    const roleDescriptor = ':nth-child(3) > :nth-child(4) > .value > .link';
    beforeEach(() => {
        cy.viewport(1280, 720);
        cy.login('developer');
@ -10,7 +12,17 @@ describe('WorkerSummary', () => {
        cy.get('.summaryHeader > div').should('have.text', '19 - salesboss salesboss');
        cy.get(':nth-child(1) > :nth-child(2) > .value > span').should(
            'have.text',
-            'salesBossNick'
+            'salesBossNick',
        );
    });
+
+    it('should try descriptors', () => {
+        cy.waitForElement('.summaryHeader');
+        cy.get(departmentDescriptor).click();
+        cy.get('.descriptor').should('be.visible');
+        cy.get('.q-item > .q-item__label').should('include.text', '43');
+        cy.get(roleDescriptor).click();
+        cy.get('.descriptor').should('be.visible');
+        cy.get('.q-item > .q-item__label').should('include.text', '19');
+    });
 });