diff --git a/Jenkinsfile b/Jenkinsfile
index 8efc2f8801..341fffefa4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -122,7 +122,7 @@ pipeline {
                     }
                     post {
                         always {
-                            sh "docker-compose ${env.COMPOSE_PARAMS} down"
+                            sh "docker-compose ${env.COMPOSE_PARAMS} down -v"
                             junit(
                                 testResults: 'junit/e2e.xml',
                                 allowEmptyResults: true
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index 672eeff7a2..85943e91e5 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -1,12 +1,13 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, useAttrs, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useState } from 'src/composables/useState';
 
 import FormModel from 'components/FormModel.vue';
 
 const emit = defineEmits(['onDataSaved', 'onDataCanceled']);
 
-defineProps({
+const props = defineProps({
     title: {
         type: String,
         default: '',
@@ -22,12 +23,21 @@ defineProps({
 });
 
 const { t } = useI18n();
-
+const attrs = useAttrs();
+const state = useState();
 const formModelRef = ref(null);
 const closeButton = ref(null);
-const isSaveAndContinue = ref(false);
-const onDataSaved = (formData, requestResponse) => {
-    if (closeButton.value && !isSaveAndContinue.value) closeButton.value.click();
+const isSaveAndContinue = ref(props.showSaveAndContinueBtn);
+const isLoading = computed(() => formModelRef.value?.isLoading);
+const reset = computed(() => formModelRef.value?.reset);
+
+const onDataSaved = async (formData, requestResponse) => {
+    if (!isSaveAndContinue.value) closeButton.value?.click();
+    if (isSaveAndContinue.value) {
+        await nextTick();
+        state.set(attrs.model, attrs.formInitialData);
+    }
+    isSaveAndContinue.value = props.showSaveAndContinueBtn;
     emit('onDataSaved', formData, requestResponse);
 };
 
@@ -36,9 +46,6 @@ const onClick = async (saveAndContinue) => {
     await formModelRef.value.save();
 };
 
-const isLoading = computed(() => formModelRef.value?.isLoading);
-const reset = computed(() => formModelRef.value?.reset);
-
 defineExpose({
     isLoading,
     onDataSaved,
@@ -74,10 +81,7 @@ defineExpose({
                     data-cy="FormModelPopup_cancel"
                     v-close-popup
                     z-max
-                    @click="
-                        isSaveAndContinue = false;
-                        emit('onDataCanceled');
-                    "
+                    @click="emit('onDataCanceled')"
                 />
                 <QBtn
                     :flat="showSaveAndContinueBtn"
diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index 0de3834ead..e9660e4c22 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -91,7 +91,6 @@ const components = {
         event: updateEvent,
         attrs: {
             ...defaultAttrs,
-            style: 'min-width: 150px',
         },
         forceAttrs,
     },
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index fe4806193d..c1e541abb7 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -31,6 +31,7 @@ import VnLv from 'components/ui/VnLv.vue';
 import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
 import VnTableFilter from './VnTableFilter.vue';
 import { getColAlign } from 'src/composables/getColAlign';
+import RightMenu from '../common/RightMenu.vue';
 
 const arrayData = useArrayData(useAttrs()['data-key']);
 const $props = defineProps({
@@ -50,10 +51,6 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
-    rightSearchIcon: {
-        type: Boolean,
-        default: true,
-    },
     rowClick: {
         type: [Function, Boolean],
         default: null,
@@ -413,20 +410,13 @@ async function renderInput(rowId, field, clickedElement) {
         eventHandlers: {
             'update:modelValue': async (value) => {
                 if (isSelect && value) {
-                    row[column.name] = value[column.attrs?.optionValue ?? 'id'];
-                    row[column?.name + 'TextValue'] =
-                        value[column.attrs?.optionLabel ?? 'name'];
-                    await column?.cellEvent?.['update:modelValue']?.(
-                        value,
-                        oldValue,
-                        row,
-                    );
+                    await updateSelectValue(value, column, row, oldValue);
                 } else row[column.name] = value;
                 await column?.cellEvent?.['update:modelValue']?.(value, oldValue, row);
             },
             keyup: async (event) => {
                 if (event.key === 'Enter')
-                    await destroyInput(rowIndex, field, clickedElement);
+                    await destroyInput(rowId, field, clickedElement);
             },
             keydown: async (event) => {
                 switch (event.key) {
@@ -457,6 +447,17 @@ async function renderInput(rowId, field, clickedElement) {
         node.el?.querySelector('span > div > div').focus();
 }
 
+async function updateSelectValue(value, column, row, oldValue) {
+    row[column.name] = value[column.attrs?.optionValue ?? 'id'];
+
+    row[column?.name + 'VnTableTextValue'] = value[column.attrs?.optionLabel ?? 'name'];
+
+    if (column?.attrs?.find?.label)
+        row[column?.attrs?.find?.label] = value[column.attrs?.optionLabel ?? 'name'];
+
+    await column?.cellEvent?.['update:modelValue']?.(value, oldValue, row);
+}
+
 async function destroyInput(rowIndex, field, clickedElement) {
     if (!clickedElement)
         clickedElement = document.querySelector(
@@ -519,9 +520,9 @@ function getToggleIcon(value) {
 }
 
 function formatColumnValue(col, row, dashIfEmpty) {
-    if (col?.format || row[col?.name + 'TextValue']) {
-        if (selectRegex.test(col?.component) && row[col?.name + 'TextValue']) {
-            return dashIfEmpty(row[col?.name + 'TextValue']);
+    if (col?.format || row[col?.name + 'VnTableTextValue']) {
+        if (selectRegex.test(col?.component) && row[col?.name + 'VnTableTextValue']) {
+            return dashIfEmpty(row[col?.name + 'VnTableTextValue']);
         } else {
             return col.format(row, dashIfEmpty);
         }
@@ -554,19 +555,33 @@ function formatColumnValue(col, row, dashIfEmpty) {
     }
     return dashIfEmpty(row[col?.name]);
 }
+
 function cardClick(_, row) {
     if ($props.redirect) router.push({ path: `/${$props.redirect}/${row.id}` });
 }
+
+function removeTextValue(data, getChanges) {
+    let changes = data.updates;
+    if (!changes) return data;
+
+    for (const change of changes) {
+        for (const key in change.data) {
+            if (key.endsWith('VnTableTextValue')) {
+                delete change.data[key];
+            }
+        }
+    }
+
+    data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
+
+    if ($attrs?.beforeSaveFn) data = $attrs.beforeSaveFn(data, getChanges);
+
+    return data;
+}
 </script>
 <template>
-    <QDrawer
-        v-if="$props.rightSearch"
-        v-model="stateStore.rightDrawer"
-        side="right"
-        :width="256"
-        :overlay="$props.overlay"
-    >
-        <QScrollArea class="fit">
+    <RightMenu v-if="$props.rightSearch">
+        <template #right-panel>
             <VnTableFilter
                 :data-key="$attrs['data-key']"
                 :columns="columns"
@@ -580,8 +595,8 @@ function cardClick(_, row) {
                     <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
                 </template>
             </VnTableFilter>
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
     <CrudModel
         v-bind="$attrs"
         :class="$attrs['class'] ?? 'q-px-md'"
@@ -590,6 +605,7 @@ function cardClick(_, row) {
         @on-fetch="(...args) => emit('onFetch', ...args)"
         :search-url="searchUrl"
         :disable-infinite-scroll="isTableMode"
+        :before-save-fn="removeTextValue"
         @save-changes="reload"
         :has-sub-toolbar="$props.hasSubToolbar ?? isEditable"
         :auto-load="hasParams || $attrs['auto-load']"
@@ -634,6 +650,7 @@ function cardClick(_, row) {
                         :skip="columnsVisibilitySkipped"
                     />
                     <QBtnToggle
+                        v-if="!tableModes.some((mode) => mode.disable)"
                         v-model="mode"
                         toggle-color="primary"
                         class="bg-vn-section-color"
@@ -953,14 +970,6 @@ function cardClick(_, row) {
         transition-show="scale"
         transition-hide="scale"
         :full-width="createComplement?.isFullWidth ?? false"
-        @before-hide="
-            () => {
-                if (createRef.isSaveAndContinue) {
-                    showForm = true;
-                    createForm.formInitialData = { ...create.formInitialData };
-                }
-            }
-        "
         data-cy="vn-table-create-dialog"
     >
         <FormModelPopup
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 6f122ecd28..a29d1d4297 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -76,6 +76,15 @@ onBeforeMount(async () => {
     );
 });
 
+const routeName = computed(() => {
+    const DESCRIPTOR_PROXY = 'DescriptorProxy';
+
+    let name = $props.dataKey;
+    if ($props.dataKey.includes(DESCRIPTOR_PROXY)) {
+        name = name.split(DESCRIPTOR_PROXY)[0];
+    }
+    return `${name}Summary`;
+});
 async function getData() {
     store.url = $props.url;
     store.filter = $props.filter ?? {};
@@ -154,9 +163,7 @@ const toModule = computed(() =>
                         {{ t('components.smartCard.openSummary') }}
                     </QTooltip>
                 </QBtn>
-                <RouterLink
-                    :to="{ name: `${dataKey}Summary`, params: { id: entity.id } }"
-                >
+                <RouterLink :to="{ name: routeName, params: { id: entity.id } }">
                     <QBtn
                         class="link"
                         color="white"
@@ -196,7 +203,6 @@ const toModule = computed(() =>
                         <QItemLabel class="subtitle">
                             #{{ getValueFromPath(subtitle) ?? entity.id }}
                         </QItemLabel>
-
                         <QBtn
                             round
                             flat
@@ -210,7 +216,6 @@ const toModule = computed(() =>
                                 {{ t('globals.copyId') }}
                             </QTooltip>
                         </QBtn>
-                        <!-- </QItemLabel> -->
                     </QItem>
                 </QList>
                 <div class="list-box q-mt-xs">
@@ -220,7 +225,7 @@ const toModule = computed(() =>
             <div class="icons">
                 <slot name="icons" :entity="entity" />
             </div>
-            <div class="actions justify-center">
+            <div class="actions justify-center" data-cy="descriptor_actions">
                 <slot name="actions" :entity="entity" />
             </div>
             <slot name="after" />
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 9a60e9da13..9e46c54e36 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -153,6 +153,7 @@ globals:
     maxTemperature: Max
     minTemperature: Min
     changePass: Change password
+    setPass: Set password
     deleteConfirmTitle: Delete selected elements
     changeState: Change state
     raid: 'Raid {daysInForward} days'
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 846c442ea5..fd42d37c79 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -157,6 +157,7 @@ globals:
     maxTemperature: Máx
     minTemperature: Mín
     changePass: Cambiar contraseña
+    setPass: Establecer contraseña
     deleteConfirmTitle: Eliminar los elementos seleccionados
     changeState: Cambiar estado
     raid: 'Redada {daysInForward} días'
@@ -786,7 +787,7 @@ worker:
             notes: Notas
     operator:
         numberOfWagons: Número de vagones
-        train: tren
+        train: Tren
         itemPackingType: Tipo de embalaje
         warehouse: Almacén
         sector: Sector
diff --git a/src/pages/Account/Card/AccountDescriptorMenu.vue b/src/pages/Account/Card/AccountDescriptorMenu.vue
index 30584c61f4..eafd62df60 100644
--- a/src/pages/Account/Card/AccountDescriptorMenu.vue
+++ b/src/pages/Account/Card/AccountDescriptorMenu.vue
@@ -25,12 +25,13 @@ const $props = defineProps({
 const { t } = useI18n();
 const { hasAccount } = toRefs($props);
 const { openConfirmationModal } = useVnConfirm();
+const arrayData = useArrayData('Account');
 const route = useRoute();
 const router = useRouter();
 const state = useState();
 const user = state.getUser();
 const { notify } = useQuasar();
-const account = computed(() => useArrayData('Account').store.data[0]);
+const account = computed(() => arrayData.store.data);
 account.value.hasAccount = hasAccount.value;
 const entityId = computed(() => +route.params.id);
 const hasitManagementAccess = ref();
@@ -39,7 +40,7 @@ const isHimself = computed(() => user.value.id === account.value.id);
 const url = computed(() =>
     isHimself.value
         ? 'Accounts/change-password'
-        : `Accounts/${entityId.value}/setPassword`
+        : `Accounts/${entityId.value}/setPassword`,
 );
 
 async function updateStatusAccount(active) {
@@ -153,6 +154,7 @@ onMounted(() => {
                 t('account.card.actions.disableAccount.title'),
                 t('account.card.actions.disableAccount.subtitle'),
                 () => deleteAccount(),
+                () => deleteAccount(),
             )
         "
     >
@@ -172,6 +174,7 @@ onMounted(() => {
                 t('account.card.actions.enableAccount.title'),
                 t('account.card.actions.enableAccount.subtitle'),
                 () => updateStatusAccount(true),
+                () => updateStatusAccount(true),
             )
         "
     >
@@ -186,6 +189,7 @@ onMounted(() => {
                 t('account.card.actions.disableAccount.title'),
                 t('account.card.actions.disableAccount.subtitle'),
                 () => updateStatusAccount(false),
+                () => updateStatusAccount(false),
             )
         "
     >
@@ -201,6 +205,7 @@ onMounted(() => {
                 t('account.card.actions.activateUser.title'),
                 t('account.card.actions.activateUser.title'),
                 () => updateStatusUser(true),
+                () => updateStatusUser(true),
             )
         "
     >
@@ -215,6 +220,7 @@ onMounted(() => {
                 t('account.card.actions.deactivateUser.title'),
                 t('account.card.actions.deactivateUser.title'),
                 () => updateStatusUser(false),
+                () => updateStatusUser(false),
             )
         "
     >
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index 8ac7c224fc..baa36710ca 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -27,6 +27,7 @@ const claimActionsForm = ref();
 const rows = ref([]);
 const selectedRows = ref([]);
 const destinationTypes = ref([]);
+const shelvings = ref([]);
 const totalClaimed = ref(null);
 const DEFAULT_MAX_RESPONSABILITY = 5;
 const DEFAULT_MIN_RESPONSABILITY = 1;
@@ -56,6 +57,12 @@ const columns = computed(() => [
         field: (row) => row.claimDestinationFk,
         align: 'left',
     },
+    {
+        name: 'shelving',
+        label: t('shelvings.shelving'),
+        field: (row) => row.shelvingFk,
+        align: 'left',
+    },
     {
         name: 'Landed',
         label: t('Landed'),
@@ -125,6 +132,10 @@ async function updateDestination(claimDestinationFk, row, options = {}) {
         options.reload && claimActionsForm.value.reload();
     }
 }
+async function updateShelving(shelvingFk, row) {
+    await axios.patch(`ClaimEnds/${row.id}`, { shelvingFk });
+    claimActionsForm.value.reload();
+}
 
 async function regularizeClaim() {
     await post(`Claims/${claimId}/regularizeClaim`);
@@ -200,6 +211,7 @@ async function post(query, params) {
         auto-load
         @on-fetch="(data) => (destinationTypes = data)"
     />
+    <FetchData url="Shelvings" auto-load @on-fetch="(data) => (shelvings = data)" />
     <RightMenu v-if="claim">
         <template #right-panel>
             <QCard class="totalClaim q-my-md q-pa-sm no-box-shadow">
@@ -312,6 +324,20 @@ async function post(query, params) {
                         />
                     </QTd>
                 </template>
+                <template #body-cell-shelving="{ row }">
+                    <QTd>
+                        <VnSelect
+                            v-model="row.shelvingFk"
+                            :options="shelvings"
+                            option-label="code"
+                            option-value="id"
+                            style="width: 100px"
+                            hide-selected
+                            @update:model-value="(value) => updateShelving(value, row)"
+                        />
+                    </QTd>
+                </template>
+
                 <template #body-cell-price="{ value }">
                     <QTd align="center">
                         {{ toCurrency(value) }}
@@ -354,7 +380,7 @@ async function post(query, params) {
                                                     (value) =>
                                                         updateDestination(
                                                             value,
-                                                            props.row
+                                                            props.row,
                                                         )
                                                 "
                                             />
@@ -371,6 +397,17 @@ async function post(query, params) {
             </QTable>
         </template>
         <template #moreBeforeActions>
+            <QBtn
+                color="primary"
+                text-color="white"
+                :unelevated="true"
+                :label="tMobile('Import claim')"
+                :title="t('Import claim')"
+                icon="Download"
+                @click="importToNewRefundTicket"
+                :disable="claim.claimStateFk == resolvedStateId"
+                :loading="loading"
+            />
             <QBtn
                 color="primary"
                 text-color="white"
@@ -394,17 +431,6 @@ async function post(query, params) {
                 @click="dialogDestination = !dialogDestination"
                 :loading="loading"
             />
-            <QBtn
-                color="primary"
-                text-color="white"
-                :unelevated="true"
-                :label="tMobile('Import claim')"
-                :title="t('Import claim')"
-                icon="Upload"
-                @click="importToNewRefundTicket"
-                :disable="claim.claimStateFk == resolvedStateId"
-                :loading="loading"
-            />
         </template>
     </CrudModel>
     <QDialog v-model="dialogDestination">
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index 67034da1af..43941d1dcf 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -40,7 +40,7 @@ const workersOptions = ref([]);
             </VnRow>
             <VnRow>
                 <VnSelect
-                    :label="t('claim.assignedTo')"
+                    :label="t('claim.attendedBy')"
                     v-model="data.workerFk"
                     :options="workersOptions"
                     option-value="id"
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 66fb151e52..210b0c982f 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -233,20 +233,27 @@ function claimUrl(section) {
             <ClaimDescriptorMenu :claim="entity.claim" />
         </template>
         <template #body="{ entity: { claim, salesClaimed, developments } }">
-            <QCard class="vn-one" v-if="$route.name != 'ClaimSummary'">
+            <QCard class="vn-one">
                 <VnTitle
                     :url="claimUrl('basic-data')"
                     :text="t('globals.pageTitles.basicData')"
                 />
-                <VnLv :label="t('claim.created')" :value="toDate(claim.created)" />
-                <VnLv :label="t('claim.state')">
+                <VnLv
+                    v-if="$route.name != 'ClaimSummary'"
+                    :label="t('claim.created')"
+                    :value="toDate(claim.created)"
+                />
+                <VnLv v-if="$route.name != 'ClaimSummary'" :label="t('claim.state')">
                     <template #value>
                         <QChip :color="stateColor(claim.claimState.code)" dense>
                             {{ claim.claimState.description }}
                         </QChip>
                     </template>
                 </VnLv>
-                <VnLv :label="t('globals.salesPerson')">
+                <VnLv
+                    v-if="$route.name != 'ClaimSummary'"
+                    :label="t('globals.salesPerson')"
+                >
                     <template #value>
                         <VnUserLink
                             :name="claim.client?.salesPersonUser?.name"
@@ -254,7 +261,7 @@ function claimUrl(section) {
                         />
                     </template>
                 </VnLv>
-                <VnLv :label="t('claim.attendedBy')">
+                <VnLv v-if="$route.name != 'ClaimSummary'" :label="t('claim.attendedBy')">
                     <template #value>
                         <VnUserLink
                             :name="claim.worker?.user?.nickname"
@@ -262,7 +269,7 @@ function claimUrl(section) {
                         />
                     </template>
                 </VnLv>
-                <VnLv :label="t('claim.customer')">
+                <VnLv v-if="$route.name != 'ClaimSummary'" :label="t('claim.customer')">
                     <template #value>
                         <span class="link cursor-pointer">
                             {{ claim.client?.name }}
@@ -274,6 +281,11 @@ function claimUrl(section) {
                     :label="t('claim.pickup')"
                     :value="`${dashIfEmpty(claim.pickup)}`"
                 />
+                <VnLv
+                    :label="t('globals.packages')"
+                    :value="`${dashIfEmpty(claim.packages)}`"
+                    :translation="(value) => t(`claim.packages`)"
+                />
             </QCard>
             <QCard class="vn-two">
                 <VnTitle :url="claimUrl('notes')" :text="t('claim.notes')" />
diff --git a/src/pages/Claim/Card/ClaimSummaryAction.vue b/src/pages/Claim/Card/ClaimSummaryAction.vue
index d875126cba..e5273902c2 100644
--- a/src/pages/Claim/Card/ClaimSummaryAction.vue
+++ b/src/pages/Claim/Card/ClaimSummaryAction.vue
@@ -19,30 +19,36 @@ const columns = [
         name: 'itemFk',
         label: t('Id item'),
         columnFilter: false,
-        align: 'left',
+        align: 'right',
     },
     {
         name: 'ticketFk',
         label: t('Ticket'),
         columnFilter: false,
-        align: 'left',
+        align: 'right',
     },
     {
         name: 'claimDestinationFk',
         label: t('Destination'),
         columnFilter: false,
-        align: 'left',
+        align: 'right',
+    },
+    {
+        name: 'shelvingCode',
+        label: t('Shelving'),
+        columnFilter: false,
+        align: 'right',
     },
     {
         name: 'landed',
         label: t('Landed'),
         format: (row) => toDate(row.landed),
-        align: 'left',
+        align: 'center',
     },
     {
         name: 'quantity',
         label: t('Quantity'),
-        align: 'left',
+        align: 'right',
     },
     {
         name: 'concept',
@@ -52,18 +58,18 @@ const columns = [
     {
         name: 'price',
         label: t('Price'),
-        align: 'left',
+        align: 'right',
     },
     {
         name: 'discount',
         label: t('Discount'),
         format: ({ discount }) => toPercentage(discount / 100),
-        align: 'left',
+        align: 'right',
     },
     {
         name: 'total',
         label: t('Total'),
-        align: 'left',
+        align: 'right',
     },
 ];
 </script>
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index 6c941f59e8..0fe7fc5884 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -106,7 +106,6 @@ const props = defineProps({
                     :label="t('claim.zone')"
                     v-model="params.zoneFk"
                     url="Zones"
-                    :use-like="false"
                     outlined
                     rounded
                     dense
diff --git a/src/pages/Claim/locale/en.yml b/src/pages/Claim/locale/en.yml
index 11b4a2ca47..cdfa3963b9 100644
--- a/src/pages/Claim/locale/en.yml
+++ b/src/pages/Claim/locale/en.yml
@@ -13,7 +13,6 @@ claim:
     province: Province
     zone: Zone
     customerId: client ID
-    assignedTo: Assigned
     created: Created
     details: Details
     item: Item
diff --git a/src/pages/Claim/locale/es.yml b/src/pages/Claim/locale/es.yml
index d35d2c8e76..00f880f0c6 100644
--- a/src/pages/Claim/locale/es.yml
+++ b/src/pages/Claim/locale/es.yml
@@ -13,7 +13,6 @@ claim:
     province: Provincia
     zone: Zona
     customerId: ID de cliente
-    assignedTo: Asignado a
     created: Creado
     details: Detalles
     item: Artículo
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 21de8fa9bb..1c5a08304e 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -143,6 +143,7 @@ const exprBuilder = (param, value) => {
                         outlined
                         rounded
                         auto-load
+                        sortBy="name ASC"
                 /></QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index b8c1a743e5..0bfca7910a 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -78,10 +78,20 @@ const columns = computed(() => [
         component: 'select',
         attrs: {
             url: 'Workers/activeWithInheritedRole',
-            fields: ['id', 'name'],
+            fields: ['id', 'name', 'firstName'],
             where: { role: 'salesPerson' },
             optionFilter: 'firstName',
         },
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Workers/activeWithInheritedRole',
+                fields: ['id', 'name', 'firstName'],
+                where: { role: 'salesPerson' },
+                optionLabel: 'firstName',
+                optionValue: 'id',
+            },
+        },
         create: false,
         columnField: {
             component: null,
diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
index 8f61bac89e..6ecccc5447 100644
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -77,7 +77,6 @@ onBeforeMount(() => {
 function setPaymentType(accounting) {
     if (!accounting) return;
     accountingType.value = accounting.accountingType;
-
     initialData.description = [];
     initialData.payed = Date.vnNew();
     isCash.value = accountingType.value.code == 'cash';
@@ -87,14 +86,14 @@ function setPaymentType(accounting) {
             initialData.payed.getDate() + accountingType.value.daysInFuture,
         );
     maxAmount.value = accountingType.value && accountingType.value.maxAmount;
-
     if (accountingType.value.code == 'compensation')
         return (initialData.description = '');
-    if (accountingType.value.receiptDescription)
-        initialData.description.push(accountingType.value.receiptDescription);
-    if (initialData.description) initialData.description.push(initialData.description);
 
-    initialData.description = initialData.description.join(', ');
+    let descriptions = [];
+    if (accountingType.value.receiptDescription)
+        descriptions.push(accountingType.value.receiptDescription);
+    if (initialData.description) descriptions.push(initialData.description);
+    initialData.description = descriptions.join(', ');
 }
 
 const calculateFromAmount = (event) => {
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 8d241441d6..1294a5d255 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -18,6 +18,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import CustomerSamplesPreview from 'src/pages/Customer/components/CustomerSamplesPreview.vue';
 import FormPopup from 'src/components/FormPopup.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const { dialogRef, onDialogOK } = useDialogPluginComponent();
 
@@ -39,7 +40,7 @@ const optionsSamplesVisible = ref([]);
 const sampleType = ref({ hasPreview: false });
 const initialData = reactive({});
 const entityId = computed(() => route.params.id);
-const customer = computed(() => state.get('Customer'));
+const customer = computed(() => useArrayData('Customer').store?.data);
 const filterEmailUsers = { where: { userFk: user.value.id } };
 const filterClientsAddresses = {
     include: [
@@ -65,9 +66,9 @@ const filterSamplesVisible = {
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);
 
 onBeforeMount(async () => {
-    initialData.clientFk = customer.value.id;
-    initialData.recipient = customer.value.email;
-    initialData.recipientId = customer.value.id;
+    initialData.clientFk = customer.value?.id;
+    initialData.recipient = customer.value?.email;
+    initialData.recipientId = customer.value?.id;
 });
 
 const setEmailUser = (data) => {
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 81578c609e..67333b5bdb 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -639,7 +639,7 @@ onMounted(() => {
                 'flex-wrap': 'wrap',
                 gap: '16px',
                 position: 'relative',
-                height: '450px',
+                height: '500px',
             },
             columnGridStyle: {
                 'max-width': '50%',
@@ -650,7 +650,7 @@ onMounted(() => {
         :is-editable="editableMode"
         :without-header="!editableMode"
         :with-filters="editableMode"
-        :right-search="true"
+        :right-search="editableMode"
         :right-search-icon="true"
         :row-click="false"
         :columns="columns"
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 3c96a23028..a9cf2a5e2e 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -274,7 +274,7 @@ onBeforeMount(async () => {
         :array-data-props="{
             url: 'Entries/filter',
             order: 'landed DESC',
-            userFilter: EntryFilter,
+            userFilter: entryQueryFilter,
         }"
     >
         <template #advanced-menu>
diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index 4b6775183c..31b3c328e2 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -27,7 +27,7 @@ const user = state.getUser();
 const today = Date.vnNew();
 today.setHours(0, 0, 0, 0);
 const warehousesOptions = ref([]);
-const itemBalances = computed(() => arrayDataItemBalances.store.data);
+const itemBalances = computed(() => arrayDataItemBalances.store.data || []);
 const where = computed(() => arrayDataItemBalances.store.filter.where || {});
 const showWhatsBeforeInventory = ref(false);
 const inventoriedDate = ref(null);
@@ -313,8 +313,8 @@ async function updateWarehouse(warehouseFk) {
                             row.lineFk == row.lastPreparedLineFk
                                 ? 'black'
                                 : row.balance < 0
-                                ? 'negative'
-                                : ''
+                                  ? 'negative'
+                                  : ''
                         "
                         dense
                         style="font-size: 14px"
diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
index ed23ab5a68..ab26b9caea 100644
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -87,7 +87,7 @@ const insertTag = (rows) => {
                     tagFk: undefined,
                 }"
                 :default-remove="false"
-                :filter="{
+                :user-filter="{
                     fields: ['id', 'itemFk', 'tagFk', 'value', 'priority'],
                     where: { itemFk: route.params.id },
                     include: {
@@ -119,6 +119,7 @@ const insertTag = (rows) => {
                                 "
                                 :required="true"
                                 :rules="validate('itemTag.tagFk')"
+                                :data-cy="`tag${row?.tag?.name}`"
                             />
                             <VnSelect
                                 v-if="row.tag?.isFree === false"
@@ -145,6 +146,7 @@ const insertTag = (rows) => {
                                 :label="t('itemTags.value')"
                                 :is-clearable="false"
                                 @keyup.enter.stop="(data) => itemTagsRef.onSubmit(data)"
+                                :data-cy="`tag${row?.tag?.name}Value`"
                             />
                             <VnInput
                                 :label="t('itemBasicData.relevancy')"
@@ -162,6 +164,7 @@ const insertTag = (rows) => {
                                     name="delete"
                                     size="sm"
                                     dense
+                                    :data-cy="`deleteTag${row?.tag?.name}`"
                                 >
                                     <QTooltip>
                                         {{ t('itemTags.removeTag') }}
@@ -177,6 +180,7 @@ const insertTag = (rows) => {
                             icon="add"
                             v-shortcut="'+'"
                             fab
+                            data-cy="createNewTag"
                         >
                             <QTooltip>
                                 {{ t('itemTags.addTag') }}
diff --git a/src/pages/Route/RouteExtendedList.vue b/src/pages/Route/RouteExtendedList.vue
index a8d8477115..a7e192765c 100644
--- a/src/pages/Route/RouteExtendedList.vue
+++ b/src/pages/Route/RouteExtendedList.vue
@@ -3,7 +3,7 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useQuasar } from 'quasar';
-import { dashIfEmpty, toDate, toHour } from 'src/filters';
+import { toDate, toHour } from 'src/filters';
 import { useRouter } from 'vue-router';
 import { usePrintService } from 'src/composables/usePrintService';
 
@@ -335,7 +335,6 @@ const openTicketsDialog = (id) => {
                 <QBtn
                     icon="vn:clone"
                     color="primary"
-                    flat
                     class="q-mr-sm"
                     :disable="!selectedRows?.length"
                     @click="confirmationDialog = true"
@@ -345,7 +344,6 @@ const openTicketsDialog = (id) => {
                 <QBtn
                     icon="cloud_download"
                     color="primary"
-                    flat
                     class="q-mr-sm"
                     :disable="!selectedRows?.length"
                     @click="showRouteReport"
@@ -355,7 +353,6 @@ const openTicketsDialog = (id) => {
                 <QBtn
                     icon="check"
                     color="primary"
-                    flat
                     class="q-mr-sm"
                     :disable="!selectedRows?.length"
                     @click="markAsServed()"
diff --git a/src/pages/Shelving/Parking/Card/ParkingSummary.vue b/src/pages/Shelving/Parking/Card/ParkingSummary.vue
index 95620ebfd7..7188ebeb61 100644
--- a/src/pages/Shelving/Parking/Card/ParkingSummary.vue
+++ b/src/pages/Shelving/Parking/Card/ParkingSummary.vue
@@ -45,8 +45,6 @@ const filter = {
                         :label="t('parking.sector')"
                         :value="entity.sector?.description"
                     />
-                    <VnLv :label="t('parking.row')" :value="entity.row" />
-                    <VnLv :label="t('parking.column')" :value="entity.column" />
                 </QCard>
             </template>
         </CardSummary>
diff --git a/src/pages/Shelving/Parking/ParkingList.vue b/src/pages/Shelving/Parking/ParkingList.vue
index fe6c93ba53..7c5058a74c 100644
--- a/src/pages/Shelving/Parking/ParkingList.vue
+++ b/src/pages/Shelving/Parking/ParkingList.vue
@@ -1,19 +1,15 @@
 <script setup>
-import { onMounted, onUnmounted } from 'vue';
-import { useRouter } from 'vue-router';
+import { computed, onMounted, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import CardList from 'components/ui/CardList.vue';
-import VnLv from 'components/ui/VnLv.vue';
-import ParkingFilter from './ParkingFilter.vue';
-import ParkingSummary from './Card/ParkingSummary.vue';
-import exprBuilder from './ParkingExprBuilder.js';
+import VnTable from 'components/VnTable/VnTable.vue';
 import VnSection from 'src/components/common/VnSection.vue';
+import ParkingFilter from './ParkingFilter.vue';
+import exprBuilder from './ParkingExprBuilder.js';
+import ParkingSummary from './Card/ParkingSummary.vue';
 
 const stateStore = useStateStore();
-const { push } = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const dataKey = 'ParkingList';
@@ -24,7 +20,48 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 const filter = {
     fields: ['id', 'sectorFk', 'code', 'pickingOrder'],
 };
+
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'code',
+        label: t('globals.code'),
+        isId: true,
+        isTitle: true,
+        columnFilter: false,
+        sortable: true,
+    },
+    {
+        align: 'left',
+        name: 'sector',
+        label: t('parking.sector'),
+        format: (val) => val.sector.description ?? '',
+        sortable: true,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'pickingOrder',
+        label: t('parking.pickingOrder'),
+        sortable: true,
+        cardVisible: true,
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('components.smartCard.viewSummary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, ParkingSummary),
+                isPrimary: true,
+            },
+        ],
+    },
+]);
 </script>
+
 <template>
     <VnSection
         :data-key="dataKey"
@@ -40,41 +77,24 @@ const filter = {
             <ParkingFilter data-key="ParkingList" />
         </template>
         <template #body>
-            <QPage class="column items-center q-pa-md">
-                <div class="vn-card-list">
-                    <VnPaginate :data-key="dataKey">
-                        <template #body="{ rows }">
-                            <CardList
-                                v-for="row of rows"
-                                :key="row.id"
-                                :id="row.id"
-                                :title="row.code"
-                                @click="
-                                    push({ path: `/shelving/parking/${row.id}/summary` })
-                                "
-                            >
-                                <template #list-items>
-                                    <VnLv
-                                        label="Sector"
-                                        :value="row.sector?.description"
-                                    />
-                                    <VnLv
-                                        :label="t('parking.pickingOrder')"
-                                        :value="row.pickingOrder"
-                                    />
-                                </template>
-                                <template #actions>
-                                    <QBtn
-                                        :label="t('components.smartCard.openSummary')"
-                                        @click.stop="viewSummary(row.id, ParkingSummary)"
-                                        color="primary"
-                                    />
-                                </template>
-                            </CardList>
-                        </template>
-                    </VnPaginate>
-                </div>
-            </QPage>
+            <VnTable
+                :data-key="dataKey"
+                :columns="columns"
+                is-editable="false"
+                :right-search="false"
+                :use-model="true"
+                :disable-option="{ table: true }"
+                redirect="shelving/parking"
+                default-mode="card"
+            >
+                <template #actions="{ row }">
+                    <QBtn
+                        :label="t('components.smartCard.openSummary')"
+                        @click.stop="viewSummary(row.id, ParkingSummary)"
+                        color="primary"
+                    />
+                </template>
+            </VnTable>
         </template>
     </VnSection>
 </template>
diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue
index 14eec9db93..ff40a65925 100644
--- a/src/pages/Ticket/Card/TicketEditMana.vue
+++ b/src/pages/Ticket/Card/TicketEditMana.vue
@@ -1,32 +1,26 @@
 <script setup>
-import { ref } from 'vue';
+import axios from 'axios';
 import { useI18n } from 'vue-i18n';
+import { computed, ref } from 'vue';
+import { useRoute } from 'vue-router';
 import { toCurrency } from 'src/filters';
 import VnUsesMana from 'components/ui/VnUsesMana.vue';
 
 const $props = defineProps({
-    mana: {
-        type: Number,
-        default: null,
-    },
     newPrice: {
         type: Number,
         default: 0,
     },
-    usesMana: {
-        type: Boolean,
-        default: false,
-    },
-    manaCode: {
-        type: String,
-        default: 'mana',
-    },
     sale: {
         type: Object,
         default: null,
     },
 });
 
+const route = useRoute();
+const mana = ref(null);
+const usesMana = ref(false);
+
 const emit = defineEmits(['save', 'cancel']);
 
 const { t } = useI18n();
@@ -38,32 +32,47 @@ const save = (sale = $props.sale) => {
     QPopupProxyRef.value.hide();
 };
 
+const getMana = async () => {
+    const { data } = await axios.get(`Tickets/${route.params.id}/getSalesPersonMana`);
+    mana.value = data;
+    await getUsesMana();
+};
+
+const getUsesMana = async () => {
+    const { data } = await axios.get('Sales/usesMana');
+    usesMana.value = data;
+};
+
 const cancel = () => {
     emit('cancel');
     QPopupProxyRef.value.hide();
 };
+const hasMana = computed(() => typeof mana.value === 'number');
 defineExpose({ save });
 </script>
 
 <template>
-    <QPopupProxy ref="QPopupProxyRef" data-cy="ticketEditManaProxy">
+    <QPopupProxy
+        ref="QPopupProxyRef"
+        @before-show="getMana"
+        data-cy="ticketEditManaProxy"
+    >
         <div class="container">
-            <QSpinner v-if="!mana" color="primary" size="md" />
-            <div v-else>
-                <div class="header">Mana: {{ toCurrency(mana) }}</div>
-                <div class="q-pa-md">
-                    <slot :popup="QPopupProxyRef" />
-                    <div v-if="usesMana" class="column q-gutter-y-sm q-mt-sm">
-                        <VnUsesMana :mana-code="manaCode" />
-                    </div>
-                    <div v-if="newPrice" class="column items-center q-mt-lg">
-                        <span class="text-primary">{{ t('New price') }}</span>
-                        <span class="text-subtitle1">
-                            {{ toCurrency($props.newPrice) }}
-                        </span>
-                    </div>
+            <div class="header">Mana: {{ toCurrency(mana) }}</div>
+            <QSpinner v-if="!hasMana" color="primary" size="md" />
+            <div class="q-pa-md" v-else>
+                <slot :popup="QPopupProxyRef" />
+                <div v-if="usesMana" class="column q-gutter-y-sm q-mt-sm">
+                    <VnUsesMana :mana-code="manaCode" />
+                </div>
+                <div v-if="newPrice" class="column items-center q-mt-lg">
+                    <span class="text-primary">{{ t('New price') }}</span>
+                    <span class="text-subtitle1">
+                        {{ toCurrency($props.newPrice) }}
+                    </span>
                 </div>
             </div>
+
             <div class="row">
                 <QBtn
                     color="primary"
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index e680fb2901..e88133ff1e 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -45,7 +45,6 @@ const isTicketEditable = ref(false);
 const sales = ref([]);
 const editableStatesOptions = ref([]);
 const selectedSales = ref([]);
-const mana = ref(null);
 const manaCode = ref('mana');
 const ticketState = computed(() => store.data?.ticketState?.state?.code);
 const transfer = ref({
@@ -175,17 +174,21 @@ const getSaleTotal = (sale) => {
     return price - discount;
 };
 
+const getRowUpdateInputEvents = (sale) => ({
+    'keyup.enter': () => {
+        changeQuantity(sale);
+    },
+    blur: () => {
+        changeQuantity(sale);
+    },
+});
+
 const resetChanges = async () => {
     arrayData.fetch({ append: false });
     tableRef.value.reload();
 };
-const rowToUpdate = ref(null);
 const changeQuantity = async (sale) => {
-    if (
-        !sale.itemFk ||
-        sale.quantity == null ||
-        edit.value?.oldQuantity === sale.quantity
-    )
+    if (!sale.itemFk || sale.quantity == null || sale?.originalQuantity === sale.quantity)
         return;
     if (!sale.id) return addSale(sale);
 
@@ -197,11 +200,8 @@ const changeQuantity = async (sale) => {
 const updateQuantity = async (sale) => {
     try {
         let { quantity, id } = sale;
-        if (!rowToUpdate.value) return;
-        rowToUpdate.value = null;
         sale.isNew = false;
-        const params = { quantity: quantity };
-        await axios.post(`Sales/${id}/updateQuantity`, params);
+        await axios.post(`Sales/${id}/updateQuantity`, { quantity });
         notify('globals.dataSaved', 'positive');
         tableRef.value.reload();
     } catch (e) {
@@ -258,18 +258,6 @@ const DEFAULT_EDIT = {
     oldQuantity: null,
 };
 const edit = ref({ ...DEFAULT_EDIT });
-const usesMana = ref(null);
-
-const getUsesMana = async () => {
-    const { data } = await axios.get('Sales/usesMana');
-    usesMana.value = data;
-};
-
-const getMana = async () => {
-    const { data } = await axios.get(`Tickets/${route.params.id}/getSalesPersonMana`);
-    mana.value = data;
-    await getUsesMana();
-};
 
 const selectedValidSales = computed(() => {
     if (!sales.value) return;
@@ -277,7 +265,6 @@ const selectedValidSales = computed(() => {
 });
 
 const onOpenEditPricePopover = async (sale) => {
-    await getMana();
     edit.value = {
         sale: JSON.parse(JSON.stringify(sale)),
         price: sale.price,
@@ -285,7 +272,6 @@ const onOpenEditPricePopover = async (sale) => {
 };
 
 const onOpenEditDiscountPopover = async (sale) => {
-    await getMana();
     if (isLocked.value) return;
     if (sale) {
         edit.value = {
@@ -306,7 +292,6 @@ const changePrice = async (sale) => {
             await confirmUpdate(() => updatePrice(sale, newPrice));
         } else updatePrice(sale, newPrice);
     }
-    await getMana();
 };
 const updatePrice = async (sale, newPrice) => {
     await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
@@ -599,9 +584,7 @@ watch(
                     :is-ticket-editable="isTicketEditable"
                     :sales="selectedValidSales"
                     :disable="!hasSelectedRows"
-                    :mana="mana"
                     :ticket-config="ticketConfig"
-                    @get-mana="getMana()"
                     @update-discounts="updateDiscounts"
                     @refresh-table="resetChanges"
                 />
@@ -772,9 +755,7 @@ watch(
                 v-if="row.isNew || isTicketEditable"
                 type="number"
                 v-model.number="row.quantity"
-                @blur="changeQuantity(row)"
-                @keyup.enter.stop="changeQuantity(row)"
-                @update:model-value="() => (rowToUpdate = row)"
+                v-on="getRowUpdateInputEvents(row)"
                 @focus="edit.oldQuantity = row.quantity"
             />
             <span v-else>{{ row.quantity }}</span>
@@ -786,7 +767,6 @@ watch(
                 </QBtn>
                 <TicketEditManaProxy
                     ref="editPriceProxyRef"
-                    :mana="mana"
                     :sale="row"
                     :new-price="getNewPrice"
                     @save="changePrice"
@@ -809,10 +789,8 @@ watch(
 
                 <TicketEditManaProxy
                     ref="editManaProxyRef"
-                    :mana="mana"
                     :sale="row"
                     :new-price="getNewPrice"
-                    :uses-mana="usesMana"
                     :mana-code="manaCode"
                     @save="changeDiscount"
                 >
diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
index 4cc96e9e2d..840b625071 100644
--- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@@ -34,10 +34,6 @@ const props = defineProps({
         type: Array,
         default: () => [],
     },
-    mana: {
-        type: Number,
-        default: null,
-    },
     ticketConfig: {
         type: Array,
         default: () => [],
@@ -50,6 +46,7 @@ const { dialog } = useQuasar();
 const { notify } = useNotify();
 const acl = useAcl();
 const btnDropdownRef = ref(null);
+const editManaProxyRef = ref(null);
 const { openConfirmationModal } = useVnConfirm();
 
 const newDiscount = ref(null);
@@ -131,13 +128,13 @@ const createClaim = () => {
         openConfirmationModal(
             t('Claim out of time'),
             t('Do you want to continue?'),
-            onCreateClaimAccepted
+            onCreateClaimAccepted,
         );
     else
         openConfirmationModal(
             t('Do you want to create a claim?'),
             false,
-            onCreateClaimAccepted
+            onCreateClaimAccepted,
         );
 };
 
@@ -216,8 +213,14 @@ const createRefund = async (withWarehouse) => {
                 <QItemSection>
                     <QItemLabel>{{ t('Update discount') }}</QItemLabel>
                 </QItemSection>
-                <TicketEditManaProxy :mana="props.mana" @save="changeMultipleDiscount()">
+                <TicketEditManaProxy
+                    ref="editManaProxyRef"
+                    :sale="row"
+                    @save="changeMultipleDiscount"
+                >
                     <VnInput
+                        autofocus
+                        @keyup.enter.stop="() => editManaProxyRef.save(row)"
                         v-model.number="newDiscount"
                         :label="t('ticketSale.discount')"
                         type="number"
diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index 7a33df795f..723caacf52 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -31,7 +31,7 @@ const oldQuantity = ref(null);
 
 watch(
     () => route.params.id,
-    async () => nextTick(async () => await saleTrackingFetchDataRef.value.fetch())
+    async () => nextTick(async () => await saleTrackingFetchDataRef.value.fetch()),
 );
 
 const columns = computed(() => [
@@ -212,7 +212,7 @@ const updateShelving = async (sale) => {
 
     const { data: patchResponseData } = await axios.patch(
         `ItemShelvings/${sale.itemShelvingFk}`,
-        params
+        params,
     );
     const filter = {
         fields: ['parkingFk'],
@@ -385,7 +385,7 @@ const qCheckBoxController = (sale, action) => {
         </template>
         <template #body-cell-parking="{ row }">
             <QTd style="width: 10%">
-                {{ dashIfEmpty(row.parkingFk) }}
+                {{ dashIfEmpty(row.parkingCode) }}
             </QTd>
         </template>
         <template #body-cell-actions="{ row }">
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 5df08b8813..5838efa880 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -46,6 +46,15 @@ const descriptorData = useArrayData('Ticket');
 onMounted(async () => {
     ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
 });
+const formattedAddress = computed(() => {
+    if (!ticket.value) return '';
+
+    const address = ticket.value.address;
+    const postcode = address.postalCode;
+    const province = address.province ? `(${address.province.name})` : '';
+
+    return `${address.street} - ${postcode} - ${address.city} ${province}`;
+});
 
 function isEditable() {
     try {
@@ -238,7 +247,7 @@ onMounted(async () => {
                 />
                 <VnLv
                     :label="t('ticket.summary.consigneeStreet')"
-                    :value="entity.address?.street"
+                    :value="formattedAddress"
                 />
             </QCard>
             <QCard class="vn-one" v-if="entity.notes.length">
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 4b50892b09..c82c0067f5 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -293,6 +293,7 @@ en:
         clientFk: Customer
         orderFk: Order
         from: From
+        shipped: Shipped
         to: To
         salesPersonFk: Salesperson
         stateFk: State
@@ -320,6 +321,7 @@ es:
         clientFk: Cliente
         orderFk: Pedido
         from: Desde
+        shipped: F. envío
         to: Hasta
         salesPersonFk: Comercial
         stateFk: Estado
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 88878076d4..78bebc2978 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -108,13 +108,11 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'shippedDate',
+        name: 'shipped',
         cardVisible: true,
         label: t('ticketList.shipped'),
         columnFilter: {
             component: 'date',
-            alias: 't',
-            inWhere: true,
         },
         format: ({ shippedDate }) => toDate(shippedDate),
     },
diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index 78142301c3..b8c1c54dfc 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -46,8 +46,18 @@ async function setAdvancedSummary(data) {
     >
         <template #form="{ data }">
             <VnRow>
-                <VnInput :label="t('Name')" clearable v-model="data.firstName" />
-                <VnInput :label="t('Last name')" clearable v-model="data.lastName" />
+                <VnInput
+                    :label="t('Name')"
+                    clearable
+                    v-model="data.firstName"
+                    :required="true"
+                />
+                <VnInput
+                    :label="t('Last name')"
+                    clearable
+                    v-model="data.lastName"
+                    :required="true"
+                />
             </VnRow>
             <VnRow>
                 <VnInput v-model="data.phone" :label="t('Business phone')" clearable />
diff --git a/src/pages/Worker/Card/WorkerBusiness.vue b/src/pages/Worker/Card/WorkerBusiness.vue
index 6025ae289a..e3582a2d53 100644
--- a/src/pages/Worker/Card/WorkerBusiness.vue
+++ b/src/pages/Worker/Card/WorkerBusiness.vue
@@ -3,7 +3,7 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import VnTable from 'components/VnTable/VnTable.vue';
-import { toDate } from 'src/filters';
+import { dashIfEmpty, toDate } from 'src/filters';
 import { useQuasar } from 'quasar';
 import axios from 'axios';
 
@@ -15,7 +15,7 @@ const quasar = useQuasar();
 
 async function reactivateWorker() {
     const hasToReactive = tableRef.value.CrudModelRef.formData.find(
-        (data) => !data.ended
+        (data) => !data.ended,
     );
     if (hasToReactive) {
         quasar
@@ -38,25 +38,25 @@ const columns = computed(() => [
     {
         name: 'started',
         label: t('worker.business.tableVisibleColumns.started'),
-        align: 'left',
         format: ({ started }) => toDate(started),
         component: 'date',
         cardVisible: true,
         create: true,
+        width: '90px',
     },
 
     {
         name: 'ended',
         label: t('worker.business.tableVisibleColumns.ended'),
-        align: 'left',
         format: ({ ended }) => toDate(ended),
         component: 'date',
         cardVisible: true,
         create: true,
+        width: '90px',
     },
     {
         label: t('worker.business.tableVisibleColumns.company'),
-        align: 'left',
+        toolTip: t('worker.business.tableVisibleColumns.company'),
         name: 'companyCodeFk',
         component: 'select',
         attrs: {
@@ -65,23 +65,23 @@ const columns = computed(() => [
             optionLabel: 'code',
             optionValue: 'code',
         },
-        cardVisible: true,
         create: true,
+        width: '60px',
     },
     {
-        align: 'left',
         name: 'reasonEndFk',
         component: 'select',
         label: t('worker.business.tableVisibleColumns.reasonEnd'),
+        toolTip: t('worker.business.tableVisibleColumns.reasonEnd'),
         attrs: {
             url: 'BusinessReasonEnds',
             fields: ['id', 'reason'],
             optionLabel: 'reason',
         },
         cardVisible: true,
+        format: ({ reason }, dashIfEmpty) => dashIfEmpty(reason),
     },
     {
-        align: 'left',
         name: 'departmentFk',
         component: 'select',
         label: t('worker.business.tableVisibleColumns.department'),
@@ -89,15 +89,19 @@ const columns = computed(() => [
             url: 'Departments',
             fields: ['id', 'name'],
             optionLabel: 'name',
+            optionValue: 'id',
         },
         cardVisible: true,
         create: true,
+        width: '80px',
+        format: ({ departmentName }, dashIfEmpty) => dashIfEmpty(departmentName),
     },
     {
         align: 'left',
         name: 'workerBusinessProfessionalCategoryFk',
         component: 'select',
         label: t('worker.business.tableVisibleColumns.professionalCategory'),
+        toolTip: t('worker.business.tableVisibleColumns.professionalCategory'),
         attrs: {
             url: 'WorkerBusinessProfessionalCategories',
             fields: ['id', 'description', 'code'],
@@ -105,6 +109,9 @@ const columns = computed(() => [
         },
         cardVisible: true,
         create: true,
+        width: '100px',
+        format: ({ professionalDescription }, dashIfEmpty) =>
+            dashIfEmpty(professionalDescription),
     },
     {
         align: 'left',
@@ -118,6 +125,8 @@ const columns = computed(() => [
         },
         cardVisible: true,
         create: true,
+        format: ({ calendarTypeDescription }, dashIfEmpty) =>
+            dashIfEmpty(calendarTypeDescription),
     },
     {
         align: 'left',
@@ -131,6 +140,8 @@ const columns = computed(() => [
         },
         cardVisible: true,
         create: true,
+        width: '100px',
+        format: ({ workCenterName }, dashIfEmpty) => dashIfEmpty(workCenterName),
     },
     {
         align: 'left',
@@ -144,6 +155,7 @@ const columns = computed(() => [
         },
         cardVisible: true,
         create: true,
+        format: ({ payrollDescription }, dashIfEmpty) => dashIfEmpty(payrollDescription),
     },
     {
         align: 'left',
@@ -157,6 +169,7 @@ const columns = computed(() => [
         },
         cardVisible: true,
         create: true,
+        format: ({ occupationName }, dashIfEmpty) => dashIfEmpty(occupationName),
     },
     {
         align: 'left',
@@ -165,6 +178,7 @@ const columns = computed(() => [
         component: 'input',
         cardVisible: true,
         create: true,
+        width: '50px',
     },
     {
         align: 'left',
@@ -177,6 +191,8 @@ const columns = computed(() => [
         },
         cardVisible: true,
         create: true,
+        format: ({ workerBusinessTypeName }, dashIfEmpty) =>
+            dashIfEmpty(workerBusinessTypeName),
     },
     {
         align: 'left',
@@ -185,6 +201,7 @@ const columns = computed(() => [
         component: 'input',
         cardVisible: true,
         create: true,
+        width: '70px',
     },
     {
         align: 'left',
@@ -193,6 +210,7 @@ const columns = computed(() => [
         component: 'input',
         cardVisible: true,
         create: true,
+        width: '70px',
     },
     {
         name: 'notes',
@@ -208,7 +226,7 @@ const columns = computed(() => [
     <VnTable
         ref="tableRef"
         data-key="WorkerBusiness"
-        :url="`Workers/${entityId}/Business`"
+        :url="`Workers/${entityId}/getWorkerBusiness`"
         save-url="/Businesses/crud"
         :create="{
             urlCreate: `Workers/${entityId}/Business`,
@@ -218,13 +236,12 @@ const columns = computed(() => [
         }"
         order="id DESC"
         :columns="columns"
-        default-mode="card"
         auto-load
-        :disable-option="{ table: true }"
+        :disable-option="{ card: true }"
         :right-search="false"
-        card-class="grid-two q-gutter-x-xl q-gutter-y-md q-pr-lg q-py-lg"
         :is-editable="true"
         :use-model="true"
+        :right-search-icon="false"
         @save-changes="(data) => reactivateWorker(data)"
     />
 </template>
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index de3f634e2c..0e946f1ddc 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -111,6 +111,7 @@ const handlePhotoUpdated = (evt = false) => {
         <template #body="{ entity }">
             <VnLv :label="t('globals.user')" :value="entity.user?.name" />
             <VnLv
+                class="ellipsis-text"
                 :label="t('globals.params.email')"
                 :value="entity.user?.emailUser?.email"
                 copy
@@ -177,6 +178,12 @@ const handlePhotoUpdated = (evt = false) => {
 .photo {
     height: 256px;
 }
+.ellipsis-text {
+    width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
 </style>
 
 <i18n>
diff --git a/src/pages/Worker/Card/WorkerDescriptorProxy.vue b/src/pages/Worker/Card/WorkerDescriptorProxy.vue
index a142570f9c..5f71abbead 100644
--- a/src/pages/Worker/Card/WorkerDescriptorProxy.vue
+++ b/src/pages/Worker/Card/WorkerDescriptorProxy.vue
@@ -12,6 +12,11 @@ const $props = defineProps({
 
 <template>
     <QPopupProxy>
-        <WorkerDescriptor v-if="$props.id" :id="$props.id" :summary="WorkerSummary" />
+        <WorkerDescriptor
+            v-if="$props.id"
+            :id="$props.id"
+            :summary="WorkerSummary"
+            data-key="WorkerDescriptorProxy"
+        />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Worker/Card/WorkerOperator.vue b/src/pages/Worker/Card/WorkerOperator.vue
index ab763f4c25..34d9ba0201 100644
--- a/src/pages/Worker/Card/WorkerOperator.vue
+++ b/src/pages/Worker/Card/WorkerOperator.vue
@@ -106,6 +106,7 @@ watch(
                                 hide-selected
                                 v-model="row.trainFk"
                                 data-cy="train"
+                                :required="true"
                             />
                         </VnRow>
                         <VnRow>
@@ -116,6 +117,7 @@ watch(
                                 option-label="code"
                                 option-value="code"
                                 v-model="row.itemPackingTypeFk"
+                                :required="true"
                                 data-cy="itemPackingType"
                             />
                             <VnSelect
@@ -123,6 +125,7 @@ watch(
                                 :options="warehousesData"
                                 hide-selected
                                 v-model="row.warehouseFk"
+                                :required="true"
                                 data-cy="warehouse"
                             />
                         </VnRow>
@@ -183,6 +186,7 @@ watch(
                                 :label="t('worker.operator.isOnReservationMode')"
                                 v-model="row.isOnReservationMode"
                                 lazy-rules
+                                :required="true"
                             />
                         </VnRow>
                         <VnRow>
diff --git a/src/pages/Worker/Card/WorkerPBX.vue b/src/pages/Worker/Card/WorkerPBX.vue
index 12f2a4b237..dae1984388 100644
--- a/src/pages/Worker/Card/WorkerPBX.vue
+++ b/src/pages/Worker/Card/WorkerPBX.vue
@@ -1,8 +1,8 @@
-src/pages/Worker/Card/WorkerPBX.vue
-
 <script setup>
+import { useI18n } from 'vue-i18n';
 import FormModel from 'src/components/FormModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+const { t } = useI18n();
 </script>
 
 <template>
@@ -26,3 +26,8 @@ import VnInput from 'src/components/common/VnInput.vue';
         </template>
     </FormModel>
 </template>
+
+<i18n>
+    es:
+        It must be a 4-digit number and must not end in 00: Debe ser un número de 4 cifras y no terminar en 00
+</i18n>
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index 47e13cf6d5..d329414946 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -140,6 +140,7 @@ function reloadData() {
                                     id="deviceProductionFk"
                                     hide-selected
                                     data-cy="pda-dialog-select"
+                                    :required="true"
                                 >
                                     <template #option="scope">
                                         <QItem v-bind="scope.itemProps">
diff --git a/src/pages/Worker/WorkerDepartment.vue b/src/pages/Worker/WorkerDepartment.vue
index baf6db1543..e1411250b7 100644
--- a/src/pages/Worker/WorkerDepartment.vue
+++ b/src/pages/Worker/WorkerDepartment.vue
@@ -1,16 +1,9 @@
 <script setup>
-import VnSection from 'src/components/common/VnSection.vue';
 import WorkerDepartmentTree from './WorkerDepartmentTree.vue';
 </script>
 
 <template>
-    <VnSection data-key="WorkerDepartment" :search-bar="false">
-        <template #body>
-            <div class="flex flex-center q-pa-md">
-                <WorkerDepartmentTree />
-            </div>
-        </template>
-    </VnSection>
+    <QPage class="q-pa-md flex justify-center"> <WorkerDepartmentTree /> </QPage>
 </template>
 
 <i18n>
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index a82bbb2854..4df84e4bdd 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -65,6 +65,7 @@ const tableFilter = {
 
 const columns = computed(() => [
     {
+        align: 'left',
         name: 'id',
         label: t('list.id'),
         chip: {
@@ -74,8 +75,6 @@ const columns = computed(() => [
         columnFilter: {
             inWhere: true,
         },
-        columnClass: 'shrink-column',
-        component: 'number',
     },
     {
         align: 'left',
@@ -107,6 +106,7 @@ const columns = computed(() => [
         format: (row, dashIfEmpty) => dashIfEmpty(row?.agencyMode?.name),
     },
     {
+        align: 'left',
         name: 'price',
         label: t('list.price'),
         cardVisible: true,
@@ -114,11 +114,9 @@ const columns = computed(() => [
         columnFilter: {
             inWhere: true,
         },
-        columnClass: 'shrink-column',
-        component: 'number',
     },
     {
-        align: 'center',
+        align: 'left',
         name: 'hour',
         label: t('list.close'),
         cardVisible: true,
@@ -180,73 +178,67 @@ function formatRow(row) {
             <ZoneFilterPanel data-key="ZonesList" />
         </template>
     </RightMenu>
-    <div class="table-container">
-        <div class="column items-center">
-            <VnTable
-                ref="tableRef"
-                data-key="ZonesList"
-                url="Zones"
-                :create="{
-                    urlCreate: 'Zones',
-                    title: t('list.createZone'),
-                    onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
-                    formInitialData: {},
-                }"
-                :user-filter="tableFilter"
-                :columns="columns"
-                redirect="zone"
-                :right-search="false"
-                table-height="85vh"
-                order="id ASC"
-            >
-                <template #column-addressFk="{ row }">
-                    {{ dashIfEmpty(formatRow(row)) }}
-                </template>
-                <template #more-create-dialog="{ data }">
-                    <VnSelect
-                        url="AgencyModes"
-                        v-model="data.agencyModeFk"
-                        option-value="id"
-                        option-label="name"
-                        :label="t('list.agency')"
-                    />
-                    <VnInput
-                        v-model="data.price"
-                        :label="t('list.price')"
-                        min="0"
-                        type="number"
-                        required="true"
-                    />
-                    <VnInput
-                        v-model="data.bonus"
-                        :label="t('zone.bonus')"
-                        min="0"
-                        type="number"
-                    />
-                    <VnInput
-                        v-model="data.travelingDays"
-                        :label="t('zone.travelingDays')"
-                        type="number"
-                        min="0"
-                    />
-                    <VnInputTime v-model="data.hour" :label="t('list.close')" />
-                    <VnSelect
-                        url="Warehouses"
-                        v-model="data.warehouseFK"
-                        option-value="id"
-                        option-label="name"
-                        :label="t('list.warehouse')"
-                        :options="warehouseOptions"
-                    />
-                    <QCheckbox
-                        v-model="data.isVolumetric"
-                        :label="t('list.isVolumetric')"
-                        :toggle-indeterminate="false"
-                    />
-                </template>
-            </VnTable>
-        </div>
-    </div>
+    <VnTable
+        ref="tableRef"
+        data-key="ZonesList"
+        url="Zones"
+        :create="{
+            urlCreate: 'Zones',
+            title: t('list.createZone'),
+            onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
+            formInitialData: {},
+        }"
+        :user-filter="tableFilter"
+        :columns="columns"
+        redirect="zone"
+        :right-search="false"
+    >
+        <template #column-addressFk="{ row }">
+            {{ dashIfEmpty(formatRow(row)) }}
+        </template>
+        <template #more-create-dialog="{ data }">
+            <VnSelect
+                url="AgencyModes"
+                v-model="data.agencyModeFk"
+                option-value="id"
+                option-label="name"
+                :label="t('list.agency')"
+            />
+            <VnInput
+                v-model="data.price"
+                :label="t('list.price')"
+                min="0"
+                type="number"
+                required="true"
+            />
+            <VnInput
+                v-model="data.bonus"
+                :label="t('zone.bonus')"
+                min="0"
+                type="number"
+            />
+            <VnInput
+                v-model="data.travelingDays"
+                :label="t('zone.travelingDays')"
+                type="number"
+                min="0"
+            />
+            <VnInputTime v-model="data.hour" :label="t('list.close')" />
+            <VnSelect
+                url="Warehouses"
+                v-model="data.warehouseFK"
+                option-value="id"
+                option-label="name"
+                :label="t('list.warehouse')"
+                :options="warehouseOptions"
+            />
+            <QCheckbox
+                v-model="data.isVolumetric"
+                :label="t('list.isVolumetric')"
+                :toggle-indeterminate="false"
+            />
+        </template>
+    </VnTable>
 </template>
 
 <i18n>
@@ -254,20 +246,3 @@ es:
     Search zone: Buscar zona
     You can search zones by id or name: Puedes buscar zonas por id o nombre
 </i18n>
-
-<style lang="scss" scoped>
-.table-container {
-    display: flex;
-    justify-content: center;
-}
-.column {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    min-width: 70%;
-}
-
-:deep(.shrink-column) {
-    width: 8%;
-}
-</style>
diff --git a/test/cypress/integration/account/accountDescriptorMenu.spec.js b/test/cypress/integration/account/accountDescriptorMenu.spec.js
new file mode 100644
index 0000000000..67a7d8ef66
--- /dev/null
+++ b/test/cypress/integration/account/accountDescriptorMenu.spec.js
@@ -0,0 +1,24 @@
+describe('ClaimNotes', () => {
+    const descriptorOptions = '[data-cy="descriptor-more-opts-menu"] > .q-list';
+    const url = '/#/account/1/summary';
+
+    it('should see all the account options', () => {
+        cy.login('itManagement');
+        cy.visit(url);
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get(descriptorOptions)
+            .find('.q-item')
+            .its('length')
+            .then((count) => {
+                cy.log('Número de opciones:', count);
+                expect(count).to.equal(5);
+            });
+    });
+
+    it('should not see any option', () => {
+        cy.login('salesPerson');
+        cy.visit(url);
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get(descriptorOptions).should('not.be.visible');
+    });
+});
diff --git a/test/cypress/integration/claim/claimAction.spec.js b/test/cypress/integration/claim/claimAction.spec.js
index e98be85fc8..b0a16a2add 100644
--- a/test/cypress/integration/claim/claimAction.spec.js
+++ b/test/cypress/integration/claim/claimAction.spec.js
@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
 describe('ClaimAction', () => {
-    const claimId = 2;
+    const claimId = 1;
 
     const firstRow = 'tbody > :nth-child(1)';
     const destinationRow = '.q-item__section > .q-field';
diff --git a/test/cypress/integration/claim/claimDevelopment.spec.js b/test/cypress/integration/claim/claimDevelopment.spec.js
index df9d09a49d..7ca6472af1 100755
--- a/test/cypress/integration/claim/claimDevelopment.spec.js
+++ b/test/cypress/integration/claim/claimDevelopment.spec.js
@@ -35,8 +35,7 @@ describe('ClaimDevelopment', () => {
         cy.saveCard();
     });
 
-    // TODO: #8112
-    xit('should add and remove new line', () => {
+    it('should add and remove new line', () => {
         cy.wait(['@workers', '@workers']);
         cy.addCard();
 
diff --git a/test/cypress/integration/claim/claimNotes.spec.js b/test/cypress/integration/claim/claimNotes.spec.js
index 576671a383..fa4a214a14 100644
--- a/test/cypress/integration/claim/claimNotes.spec.js
+++ b/test/cypress/integration/claim/claimNotes.spec.js
@@ -8,10 +8,7 @@ describe('ClaimNotes', () => {
 
     it('should add a new note', () => {
         const message = 'This is a new message.';
-        cy.get('.q-textarea')
-            .should('be.visible')
-            .should('not.be.disabled')
-            .type(message);
+        cy.get('.q-textarea').should('not.be.disabled').type(message);
 
         cy.get(saveBtn).click();
         cy.get(firstNote).should('have.text', message);
diff --git a/test/cypress/integration/claim/claimPhoto.spec.js b/test/cypress/integration/claim/claimPhoto.spec.js
index 2d33e66c1e..c3522cbfed 100755
--- a/test/cypress/integration/claim/claimPhoto.spec.js
+++ b/test/cypress/integration/claim/claimPhoto.spec.js
@@ -25,33 +25,33 @@ describe.skip('ClaimPhoto', () => {
     it('should open first image dialog change to second and close', () => {
         cy.get(':nth-last-child(1) > .q-card').click();
         cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
-            'be.visible'
+            'be.visible',
         );
 
         cy.get('.q-carousel__control > button').click();
 
         cy.get(
-            '.q-dialog__inner > .q-toolbar > .q-btn > .q-btn__content > .q-icon'
+            '.q-dialog__inner > .q-toolbar > .q-btn > .q-btn__content > .q-icon',
         ).click();
         cy.get('.q-carousel__slide > .q-img > .q-img__container > .q-img__image').should(
-            'not.be.visible'
+            'not.be.visible',
         );
     });
 
     it('should remove third and fourth file', () => {
         cy.get(
-            '.multimediaParent > :nth-last-child(1) > .q-btn > .q-btn__content > .q-icon'
+            '.multimediaParent > :nth-last-child(1) > .q-btn > .q-btn__content > .q-icon',
         ).click();
         cy.get(
-            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block',
         ).click();
         cy.get('.q-notification__message').should('have.text', 'Data deleted');
 
         cy.get(
-            '.multimediaParent > :nth-last-child(1) > .q-btn > .q-btn__content > .q-icon'
+            '.multimediaParent > :nth-last-child(1) > .q-btn > .q-btn__content > .q-icon',
         ).click();
         cy.get(
-            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block',
         ).click();
         cy.get('.q-notification__message').should('have.text', 'Data deleted');
     });
diff --git a/test/cypress/integration/client/clientAddress.spec.js b/test/cypress/integration/client/clientAddress.spec.js
index 434180047e..8673c90839 100644
--- a/test/cypress/integration/client/clientAddress.spec.js
+++ b/test/cypress/integration/client/clientAddress.spec.js
@@ -4,7 +4,6 @@ describe('Client consignee', () => {
         cy.viewport(1280, 720);
         cy.login('developer');
         cy.visit('#/customer/1107/address');
-        cy.domContentLoad();
     });
     it('Should load layout', () => {
         cy.get('.q-card').should('be.visible');
diff --git a/test/cypress/integration/client/clientFiscalData.spec.js b/test/cypress/integration/client/clientFiscalData.spec.js
index d189f896ae..58d2d956f0 100644
--- a/test/cypress/integration/client/clientFiscalData.spec.js
+++ b/test/cypress/integration/client/clientFiscalData.spec.js
@@ -4,7 +4,6 @@ describe('Client fiscal data', () => {
         cy.viewport(1280, 720);
         cy.login('developer');
         cy.visit('#/customer/1107/fiscal-data');
-        cy.domContentLoad();
     });
     it('Should change required value when change customer', () => {
         cy.get('.q-card').should('be.visible');
diff --git a/test/cypress/integration/client/clientList.spec.js b/test/cypress/integration/client/clientList.spec.js
index f2e3671baa..f83d292789 100644
--- a/test/cypress/integration/client/clientList.spec.js
+++ b/test/cypress/integration/client/clientList.spec.js
@@ -1,7 +1,6 @@
 /// <reference types="cypress" />
 describe('Client list', () => {
     beforeEach(() => {
-        cy.viewport(1280, 720);
         cy.login('developer');
         cy.visit('/#/customer/list', {
             timeout: 5000,
@@ -28,7 +27,7 @@ describe('Client list', () => {
             Email: { val: `user.test${randomInt}@cypress.com` },
             'Sales person': { val: 'salesPerson', type: 'select' },
             Location: { val: '46000', type: 'select' },
-            'Business type': { val: 'Otros', type: 'select' },
+            'Business type': { val: 'others', type: 'select' },
         };
         cy.fillInForm(data);
 
@@ -37,6 +36,7 @@ describe('Client list', () => {
         cy.checkNotification('Data created');
         cy.url().should('include', '/summary');
     });
+
     it('Client list search client', () => {
         const search = 'Jessica Jones';
         cy.searchByLabel('Name', search);
@@ -59,6 +59,7 @@ describe('Client list', () => {
         cy.checkValueForm(1, search);
         cy.checkValueForm(2, search);
     });
+
     it('Client founded create order', () => {
         const search = 'Jessica Jones';
         cy.searchByLabel('Name', search);
diff --git a/test/cypress/integration/entry/entryList.spec.js b/test/cypress/integration/entry/entryList.spec.js
index 3ed686cae4..6a700c093b 100644
--- a/test/cypress/integration/entry/entryList.spec.js
+++ b/test/cypress/integration/entry/entryList.spec.js
@@ -20,7 +20,7 @@ describe('Entry', () => {
         );
     });
 
-    it.skip('Create entry, modify travel and add buys', () => {
+    it('Create entry, modify travel and add buys', () => {
         createEntryAndBuy();
         cy.get('a[data-cy="EntryBasicData-menu-item"]').click();
         selectTravel('two');
@@ -184,9 +184,8 @@ describe('Entry', () => {
     }
 
     function deleteEntry() {
-        cy.get('[data-cy="descriptor-more-opts"]').click();
-        cy.waitForElement('div[data-cy="delete-entry"]');
-        cy.get('div[data-cy="delete-entry"]').should('be.visible').click();
+        cy.get('[data-cy="descriptor-more-opts"]').should('be.visible').click();
+        cy.waitForElement('div[data-cy="delete-entry"]').click();
         cy.url().should('include', 'list');
     }
 
diff --git a/test/cypress/integration/invoiceIn/invoiceInList.spec.js b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
index 4e2b8f9cca..d9ab3f7e79 100644
--- a/test/cypress/integration/invoiceIn/invoiceInList.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
@@ -9,7 +9,7 @@ describe('InvoiceInList', () => {
         cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/invoice-in/list`);
-        cy.get('#searchbar input').should('be.visible').type('{enter}');
+        cy.get('#searchbar input').type('{enter}');
     });
 
     it('should redirect on clicking a invoice', () => {
@@ -21,7 +21,7 @@ describe('InvoiceInList', () => {
                 cy.url().should('include', `/invoice-in/${id}/summary`);
             });
     });
-    // https://redmine.verdnatura.es/issues/8420
+
     it('should open the details', () => {
         cy.get(firstDetailBtn).click();
         cy.get(summaryHeaders).eq(1).contains('Basic data');
diff --git a/test/cypress/integration/item/ItemFixedPrice.spec.js b/test/cypress/integration/item/ItemFixedPrice.spec.js
index edb6a63fee..2cf9c2cafa 100644
--- a/test/cypress/integration/item/ItemFixedPrice.spec.js
+++ b/test/cypress/integration/item/ItemFixedPrice.spec.js
@@ -11,7 +11,7 @@ describe('Handle Items FixedPrice', () => {
         cy.visit('/#/item/fixed-price', { timeout: 5000 });
         cy.waitForElement('.q-table');
         cy.get(
-            '.q-header > .q-toolbar > :nth-child(1) > .q-btn__content > .q-icon'
+            '.q-header > .q-toolbar > :nth-child(1) > .q-btn__content > .q-icon',
         ).click();
     });
     it.skip('filter', function () {
@@ -38,7 +38,7 @@ describe('Handle Items FixedPrice', () => {
         cy.get('.q-gutter-x-sm > .q-btn > .q-btn__content > .q-icon').click();
         cy.get(`${firstRow} > .text-right > .q-btn > .q-btn__content > .q-icon`).click();
         cy.get(
-            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block',
         ).click();
         cy.get('.q-notification__message').should('have.text', 'Data saved');
     });
@@ -56,7 +56,7 @@ describe('Handle Items FixedPrice', () => {
         cy.get(' .bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner ').click();
         cy.get('#subToolbar > .q-btn--flat').click();
         cy.get(
-            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block'
+            '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block',
         ).click();
         cy.get('.q-notification__message').should('have.text', 'Data saved');
     });
diff --git a/test/cypress/integration/item/itemList.spec.js b/test/cypress/integration/item/itemList.spec.js
index 97e85a2120..f0c744f214 100644
--- a/test/cypress/integration/item/itemList.spec.js
+++ b/test/cypress/integration/item/itemList.spec.js
@@ -15,6 +15,7 @@ describe('Item list', () => {
         cy.get('.q-menu .q-item').contains('Anthurium').click();
         cy.get('.q-virtual-scroll__content > :nth-child(4) > :nth-child(4)').click();
     });
+
     // https://redmine.verdnatura.es/issues/8421
     it.skip('should create an item', () => {
         const data = {
@@ -28,7 +29,7 @@ describe('Item list', () => {
         cy.dataCy('FormModelPopup_save').click();
         cy.checkNotification('Data created');
         cy.get(
-            ':nth-child(2) > .q-drawer > .q-drawer__content > .q-scrollarea > .q-scrollarea__container > .q-scrollarea__content'
+            ':nth-child(2) > .q-drawer > .q-drawer__content > .q-scrollarea > .q-scrollarea__container > .q-scrollarea__content',
         ).should('be.visible');
     });
 });
diff --git a/test/cypress/integration/item/itemTag.spec.js b/test/cypress/integration/item/itemTag.spec.js
index d7a9ea4b36..425eaffe63 100644
--- a/test/cypress/integration/item/itemTag.spec.js
+++ b/test/cypress/integration/item/itemTag.spec.js
@@ -1,4 +1,3 @@
-/// <reference types="cypress" />
 describe('Item tag', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
@@ -8,25 +7,27 @@ describe('Item tag', () => {
         cy.waitForElement('[data-cy="itemTags"]');
     });
 
+    const createNewTag = 'createNewTag';
+    const saveBtn = 'crudModelDefaultSaveBtn';
+    const newTag = 'tagundefined';
+
     it('should throw an error adding an existent tag', () => {
-        cy.get('.q-page-sticky > div').click();
-        cy.selectOption(':nth-child(8) > .q-select', 'Tallos');
-        cy.get(':nth-child(8) > [label="Value"]').type('1');
-        cy.dataCy('crudModelDefaultSaveBtn').click();
+        cy.dataCy(createNewTag).click();
+        cy.dataCy(newTag).should('be.visible').click().type('Genero{enter}');
+        cy.dataCy('tagGeneroValue').eq(1).should('be.visible');
+        cy.dataCy(saveBtn).click();
         cy.checkNotification("The tag or priority can't be repeated for an item");
     });
 
     it('should add a new tag', () => {
-        cy.get('.q-page-sticky > div').click();
-        cy.selectOption(':nth-child(8) > .q-select', 'Ancho de la base');
-        cy.get(':nth-child(8) > [label="Value"]').type('50');
-        cy.dataCy('crudModelDefaultSaveBtn').click();
+        cy.dataCy(createNewTag).click();
+        cy.dataCy(newTag).should('be.visible').click().type('Forma{enter}');
+        cy.dataCy('tagFormaValue').should('be.visible').type('50');
+        cy.dataCy(saveBtn).click();
+
         cy.checkNotification('Data saved');
-        cy.dataCy('itemTags')
-            .children(':nth-child(8)')
-            .find('.justify-center > .q-icon')
-            .click();
-        cy.dataCy('VnConfirm_confirm').click();
+        cy.dataCy('deleteTagForma').should('be.visible').click();
+        cy.dataCy('VnConfirm_confirm').should('be.visible').click();
         cy.checkNotification('Data saved');
     });
 });
diff --git a/test/cypress/integration/parking/parkingBasicData.spec.js b/test/cypress/integration/parking/parkingBasicData.spec.js
deleted file mode 100644
index f64f23ec83..0000000000
--- a/test/cypress/integration/parking/parkingBasicData.spec.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/// <reference types="cypress" />
-describe('ParkingBasicData', () => {
-    const codeInput = 'form .q-card .q-input input';
-    const sectorSelect = 'form .q-card .q-select input';
-    const sectorOpt = '.q-menu .q-item';
-    beforeEach(() => {
-        cy.login('developer');
-        cy.visit(`/#/shelving/parking/1/basic-data`);
-    });
-
-    it('should edit the code and sector', () => {
-        cy.get(sectorSelect).type('Second');
-        cy.get(sectorOpt).click();
-
-        cy.get(codeInput).eq(0).clear();
-        cy.get(codeInput).eq(0).type('900-001');
-
-        cy.saveCard();
-
-        cy.get(sectorSelect).should('have.value', 'Second sector');
-        cy.get(codeInput).should('have.value', '900-001');
-    });
-});
diff --git a/test/cypress/integration/parking/parkingList.spec.js b/test/cypress/integration/parking/parkingList.spec.js
deleted file mode 100644
index 8b7152ca43..0000000000
--- a/test/cypress/integration/parking/parkingList.spec.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/// <reference types="cypress" />
-describe('ParkingList', () => {
-    const searchbar = '#searchbar input';
-    const firstCard = '.q-card:nth-child(1)';
-    const firstChipId =
-        ':nth-child(1) > :nth-child(1) > .justify-between > .flex > .q-chip > .q-chip__content';
-    const firstDetailBtn =
-        ':nth-child(1) > :nth-child(1) > .card-list-body > .actions > .q-btn';
-    const summaryHeader = '.summaryBody .header';
-
-    beforeEach(() => {
-        cy.viewport(1920, 1080);
-        cy.login('developer');
-        cy.visit(`/#/shelving/parking/list`);
-    });
-
-    it('should redirect on clicking a parking', () => {
-        cy.get(searchbar).type('{enter}');
-        cy.get(firstChipId)
-            .invoke('text')
-            .then((content) => {
-                const id = content.substring(4);
-                cy.get(firstCard).click();
-                cy.url().should('include', `/parking/${id}/summary`);
-            });
-    });
-
-    it('should open the details', () => {
-        cy.get(searchbar).type('{enter}');
-        cy.get(firstDetailBtn).click();
-        cy.get(summaryHeader).contains('Basic data');
-    });
-});
diff --git a/test/cypress/integration/shelving/parking/parkingBasicData.spec.js b/test/cypress/integration/shelving/parking/parkingBasicData.spec.js
new file mode 100644
index 0000000000..e28d7eecab
--- /dev/null
+++ b/test/cypress/integration/shelving/parking/parkingBasicData.spec.js
@@ -0,0 +1,32 @@
+/// <reference types="cypress" />
+describe('ParkingBasicData', () => {
+    const codeInput = 'form .q-card .q-input input';
+    const sectorSelect = 'form .q-card .q-select input';
+    const sectorOpt = '.q-menu .q-item';
+    beforeEach(() => {
+        cy.login('developer');
+        cy.visit(`/#/shelving/parking/1/basic-data`);
+    });
+
+    it('should give an error if the code aldready exists', () => {
+        cy.get(codeInput).eq(0).should('have.value', '700-01').clear();
+        cy.get(codeInput).eq(0).type('700-02');
+        cy.saveCard();
+        cy.get('.q-notification__message').should('have.text', 'The code already exists');
+    });
+
+    it('should edit the code and sector', () => {
+        cy.get(sectorSelect).type('First');
+        cy.get(sectorOpt).click();
+
+        cy.get(codeInput).eq(0).clear();
+        cy.get(codeInput).eq(0).type('700-01');
+        cy.dataCy('Picking order_input').clear().type(80230);
+
+        cy.saveCard();
+        cy.get('.q-notification__message').should('have.text', 'Data saved');
+        cy.get(sectorSelect).should('have.value', 'First sector');
+        cy.get(codeInput).should('have.value', '700-01');
+        cy.dataCy('Picking order_input').should('have.value', 80230);
+    });
+});
diff --git a/test/cypress/integration/shelving/parking/parkingList.spec.js b/test/cypress/integration/shelving/parking/parkingList.spec.js
new file mode 100644
index 0000000000..ecee8aab74
--- /dev/null
+++ b/test/cypress/integration/shelving/parking/parkingList.spec.js
@@ -0,0 +1,30 @@
+/// <reference types="cypress" />
+describe('ParkingList', () => {
+    const searchbar = '#searchbar input';
+    const firstCard = ':nth-child(1) > .q-card > .no-margin > .q-py-none';   
+    const summaryHeader = '.summaryBody .header';
+
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/shelving/parking/list`);
+    });
+
+    it('should redirect on clicking a parking', () => {
+        cy.get(searchbar).type('{enter}');
+        cy.get(firstCard).click();
+        cy.get(summaryHeader).contains('Basic data');
+    });
+
+    it('should filter and redirect if there is only one result', () => {
+        cy.dataCy('Code_input').type('1{enter}');
+        cy.dataCy('Sector_select').type('Normal{enter}');
+        cy.get(summaryHeader).contains('Basic data');
+    });
+
+    it('should filter and redirect to summary if only one result', () => {
+        cy.dataCy('Code_input').type('A{enter}');
+        cy.dataCy('Sector_select').type('First Sector{enter}');
+        cy.url().should('match', /\/shelving\/parking\/\d+\/summary/);
+    });
+});
diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index cd9f288f5d..3fc2842d35 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -30,8 +30,6 @@ describe('Ticket descriptor', () => {
 
     it('should set the weight of the ticket', () => {
         cy.visit('/#/ticket/10/summary');
-        cy.intercept('GET', /\/api\/Tickets\/\d/).as('ticket');
-        cy.wait('@ticket');
         cy.openActionsDescriptor();
         cy.contains(listItem, setWeightOpt).click();
         cy.intercept('POST', /\/api\/Tickets\/\d+\/setWeight/).as('weight');
diff --git a/test/cypress/integration/ticket/ticketExpedition.spec.js b/test/cypress/integration/ticket/ticketExpedition.spec.js
index d957f2136e..6d7dc67212 100644
--- a/test/cypress/integration/ticket/ticketExpedition.spec.js
+++ b/test/cypress/integration/ticket/ticketExpedition.spec.js
@@ -1,6 +1,5 @@
 /// <reference types="cypress" />
-// https://redmine.verdnatura.es/issues/8423
-describe.skip('Ticket expedtion', () => {
+describe('Ticket expedtion', () => {
     const tableContent = '.q-table .q-virtual-scroll__content';
     const stateTd = 'td:nth-child(9)';
 
diff --git a/test/cypress/integration/vnComponent/VnAccountNumber.spec.js b/test/cypress/integration/vnComponent/VnAccountNumber.spec.js
index 000c2151d3..63ab646fe4 100644
--- a/test/cypress/integration/vnComponent/VnAccountNumber.spec.js
+++ b/test/cypress/integration/vnComponent/VnAccountNumber.spec.js
@@ -3,7 +3,6 @@ describe('VnInput Component', () => {
         cy.login('developer');
         cy.viewport(1920, 1080);
         cy.visit('/#/supplier/1/fiscal-data');
-        cy.domContentLoad();
     });
 
     it('should replace character at cursor position in insert mode', () => {
@@ -14,8 +13,7 @@ describe('VnInput Component', () => {
         cy.dataCy('supplierFiscalDataAccount').type('{movetostart}');
         // Escribe un número y verifica que se reemplace correctamente
         cy.dataCy('supplierFiscalDataAccount').type('999');
-        cy.dataCy('supplierFiscalDataAccount')
-        .should('have.value', '9990000001');
+        cy.dataCy('supplierFiscalDataAccount').should('have.value', '9990000001');
     });
 
     it('should replace character at cursor position in insert mode', () => {
@@ -26,14 +24,12 @@ describe('VnInput Component', () => {
         cy.dataCy('supplierFiscalDataAccount').type('{movetostart}');
         // Escribe un número y verifica que se reemplace correctamente en la posicion incial
         cy.dataCy('supplierFiscalDataAccount').type('999');
-        cy.dataCy('supplierFiscalDataAccount')
-        .should('have.value', '9990000001');
+        cy.dataCy('supplierFiscalDataAccount').should('have.value', '9990000001');
     });
 
     it('should respect maxlength prop', () => {
         cy.dataCy('supplierFiscalDataAccount').clear();
         cy.dataCy('supplierFiscalDataAccount').type('123456789012345');
-        cy.dataCy('supplierFiscalDataAccount')
-        .should('have.value', '1234567890'); // asumiendo que maxlength es 10
+        cy.dataCy('supplierFiscalDataAccount').should('have.value', '1234567890'); // asumiendo que maxlength es 10
     });
 });
diff --git a/test/cypress/integration/vnComponent/VnLocation.spec.js b/test/cypress/integration/vnComponent/VnLocation.spec.js
index 292b2a3958..986cbcaaf6 100644
--- a/test/cypress/integration/vnComponent/VnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/VnLocation.spec.js
@@ -17,7 +17,6 @@ describe('VnLocation', () => {
             cy.viewport(1280, 720);
             cy.login('developer');
             cy.visit('/#/supplier/567/fiscal-data', { timeout: 7000 });
-            cy.domContentLoad();
             cy.get(createLocationButton).click();
         });
         it('should filter provinces based on selected country', () => {
diff --git a/test/cypress/integration/wagon/wagonCreate.spec.js b/test/cypress/integration/wagon/wagonCreate.spec.js
index ce3723e540..4e78e57de9 100644
--- a/test/cypress/integration/wagon/wagonCreate.spec.js
+++ b/test/cypress/integration/wagon/wagonCreate.spec.js
@@ -18,6 +18,6 @@ describe('WagonCreate', () => {
         ).type('100');
         cy.dataCy('Type_select').type('{downarrow}{enter}');
 
-        cy.get('[title="Remove"] > .q-btn__content > .q-icon').click();
+        cy.get('[title="Remove"] > .q-btn__content > .q-icon').first().click();
     });
 });
diff --git a/test/cypress/integration/worker/workerCreate.spec.js b/test/cypress/integration/worker/workerCreate.spec.js
index 71fd6b347e..6349f04a0e 100644
--- a/test/cypress/integration/worker/workerCreate.spec.js
+++ b/test/cypress/integration/worker/workerCreate.spec.js
@@ -1,4 +1,4 @@
-describe('WorkerCreate', () => {
+describe.skip('WorkerCreate', () => {
     const externalRadio = '.q-radio:nth-child(2)';
     const developerBossId = 120;
     const payMethodCross =
diff --git a/test/cypress/integration/zone/zoneBasicData.spec.js b/test/cypress/integration/zone/zoneBasicData.spec.js
index 70ded3f796..6db39b0722 100644
--- a/test/cypress/integration/zone/zoneBasicData.spec.js
+++ b/test/cypress/integration/zone/zoneBasicData.spec.js
@@ -9,13 +9,7 @@ describe('ZoneBasicData', () => {
     });
 
     it('should throw an error if the name is empty', () => {
-        cy.intercept('GET', /\/api\/Zones\/4./).as('zone');
-
-        cy.wait('@zone').then(() => {
-            cy.get('[data-cy="zone-basic-data-name"] input').type(
-                '{selectall}{backspace}',
-            );
-        });
+        cy.get('[data-cy="zone-basic-data-name"] input').type('{selectall}{backspace}');
 
         cy.get(saveBtn).click();
         cy.checkNotification("can't be blank");
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index bc8158b626..096a29dc15 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -33,7 +33,8 @@ Cypress.Commands.add('waitUntil', { prevSubject: 'optional' }, waitUntil);
 Cypress.Commands.add('resetDB', () => {
     cy.exec('pnpm run resetDatabase');
 });
-Cypress.Commands.add('login', (user) => {
+
+Cypress.Commands.add('login', (user = 'developer') => {
     //cy.visit('/#/login');
     cy.request({
         method: 'POST',
@@ -56,9 +57,12 @@ Cypress.Commands.add('login', (user) => {
     });
 });
 
-Cypress.Commands.add('domContentLoad', (element, timeout = 5000) => {
+Cypress.Commands.overwrite('visit', (originalFn, url, options) => {
+    originalFn(url, options);
     cy.waitUntil(() => cy.document().then((doc) => doc.readyState === 'complete'));
+    cy.waitUntil(() => cy.get('main').should('exist'));
 });
+
 Cypress.Commands.add('waitForElement', (element, timeout = 10000) => {
     cy.get(element, { timeout }).should('be.visible').and('not.be.disabled');
 });
@@ -112,7 +116,7 @@ function selectItem(selector, option, ariaControl, hasWrite = true) {
             .find((item) => item.innerText.includes(option));
         if (matchingItem) return cy.wrap(matchingItem).click();
 
-        if (hasWrite) cy.get(selector).clear().type(option, { delay: 0 });
+        if (hasWrite) cy.get(selector).clear().type(option);
         return selectItem(selector, option, ariaControl, false);
     });
 }
@@ -329,8 +333,13 @@ Cypress.Commands.add('openUserPanel', () => {
 Cypress.Commands.add('checkNotification', (text) => {
     cy.get('.q-notification', { timeout: 10000 })
         .should('be.visible')
-        .filter((_, el) => Cypress.$(el).text().includes(text))
-        .should('have.length.greaterThan', 0);
+        .should('have.length.greaterThan', 0)
+        .should(($elements) => {
+            const found = $elements
+                .toArray()
+                .some((el) => Cypress.$(el).text().includes(text));
+            expect(found).to.be.true;
+        });
 });
 
 Cypress.Commands.add('openActions', (row) => {
@@ -376,7 +385,13 @@ Cypress.Commands.add('clickButtonWith', (type, value) => {
     }
 });
 Cypress.Commands.add('clickButtonWithIcon', (iconClass) => {
-    cy.get(`.q-icon.${iconClass}`).parent().click();
+    cy.waitForElement('[data-cy="descriptor_actions"]');
+    cy.get('[data-cy="loading-spinner"]', { timeout: 10000 }).should('not.be.visible');
+    cy.get('.q-btn')
+        .filter((index, el) => Cypress.$(el).find('.q-icon.' + iconClass).length > 0)
+        .then(($btn) => {
+            cy.wrap($btn).click();
+        });
 });
 Cypress.Commands.add('clickButtonWithText', (buttonText) => {
     cy.get('.q-btn').contains(buttonText).click();