diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58b68b7fa..10b7c73f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,41 @@
+# Version 25.08 - 2025-03-04
+
+### Added 🆕
+
+- feat: add order for table (origin/8681_ticketAdvance_updates) by:Javier Segarra
+- feat: detect when is descriptor proxy by:Javier Segarra
+- feat: refs #7356 update CrudModel by:Javier Segarra
+- feat: refs #8242 remove teleport by:Javier Segarra
+- feat: refs #8242 use stateStore by:Javier Segarra
+- fix: fixed negative bases style by:Jon
+- fix: fixed style when clicking on icons by:Jon
+- refactor: refs #6897 remove debug logs and unused style (origin/6897-fixSomeCaus) by:pablone
+- style: refs #7356 eslint format by:Javier Segarra
+
+### Changed 📦
+
+- perf: refs #7356 minor changes (origin/7356_ticketService) by:Javier Segarra
+- refactor: refs #6897 remove debug logs and unused style (origin/6897-fixSomeCaus) by:pablone
+- refactor: refs #6897 update component props and attributes for consistency and improved functionality (origin/6897-fixMinorIssues) by:pablone
+- refactor: refs #6897 update component props and improve UI handling in Entry pages by:pablone
+- refactor: refs #6897 update VnTable components for improved value handling and UI adjustments (origin/6897-minorFixes) by:pablone
+- refactor: refs #8697 simplify date handling in ItemDiary component by:pablone
+
+### Fixed 🛠️
+
+- fix: add datakey by:Javier Segarra
+- fix: fixed account descriptor menu and created e2e by:Jon
+- fix: fixed negative bases style by:Jon
+- fix: fixed style when clicking on icons by:Jon
+- fix: refs #6553 workerBusiness (origin/6553-fixWorkerBusinessV2) by:carlossa
+- fix: refs #6553 workerBusiness v3 by:carlossa
+- fix: refs #6897 prevent default event behavior in autocompleteExpense function by:pablone
+- fix: refs #7356 chaining params by:Javier Segarra
+- fix: refs #7356 ticketService by:Javier Segarra
+- fix: refs #8242 workerDepartmentTree bug (origin/8242_leftMenu_responsive) by:Javier Segarra
+- fix: workerBasicData by:carlossa
+- Revert "revert 1015acefb7e400be2d8b5958dba69b4d98276b34" (origin/fix_revert_revert, fix_revert_revert) by:alexm
+
 # Version 25.06 - 2025-02-18
 
 ### Added 🆕
diff --git a/Jenkinsfile b/Jenkinsfile
index ea3f1b439..e6647a654 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -26,6 +26,7 @@ node {
        // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables
         echo "NODE_NAME: ${env.NODE_NAME}"
         echo "WORKSPACE: ${env.WORKSPACE}"
+        echo "CHANGE_TARGET: ${env.CHANGE_TARGET}"
 
         configFileProvider([
             configFile(fileId: 'salix-front.properties',
@@ -107,7 +108,6 @@ pipeline {
                 }
                 stage('E2E') {
                     environment {
-                        CREDENTIALS = credentials('docker-registry')
                         COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}"
                         COMPOSE_PARAMS = "-p ${env.COMPOSE_PROJECT} -f test/cypress/docker-compose.yml --project-directory ."
                     }
@@ -115,8 +115,10 @@ pipeline {
                         script {
                             sh 'rm junit/e2e-*.xml || true'
                             env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev'
+                            withDockerRegistry([credentialsId: 'docker-registry', url: "https://${env.REGISTRY}" ]) {
+                                sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
+                            }
                             def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
-                            sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
                             image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ") {
                                 sh 'cypress run --browser chromium || true'
                             }
diff --git a/package.json b/package.json
index 1361d1fd8..80706f895 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "25.10.0",
+    "version": "25.12.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -71,4 +71,4 @@
         "vite": "^6.0.11",
         "vitest": "^0.31.1"
     }
-}
+}
\ No newline at end of file
diff --git a/src/components/FilterTravelForm.vue b/src/components/FilterTravelForm.vue
index 765d97763..c522d0269 100644
--- a/src/components/FilterTravelForm.vue
+++ b/src/components/FilterTravelForm.vue
@@ -124,7 +124,7 @@ const selectTravel = ({ id }) => {
     <FetchData
         url="AgencyModes"
         @on-fetch="(data) => (agenciesOptions = data)"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         auto-load
     />
     <FetchData
diff --git a/src/components/TicketProblems.vue b/src/components/TicketProblems.vue
index 783f2556f..255bea9cd 100644
--- a/src/components/TicketProblems.vue
+++ b/src/components/TicketProblems.vue
@@ -12,20 +12,31 @@ defineProps({ row: { type: Object, required: true } });
         >
             <QIcon name="vn:claims" size="xs">
                 <QTooltip>
-                    {{ t('ticketSale.claim') }}:
+                    {{ $t('ticketSale.claim') }}:
                     {{ row.claim?.claimFk }}
                 </QTooltip>
             </QIcon>
         </router-link>
         <QIcon
-            v-if="row?.risk"
+            v-if="row?.reserved"
+            color="primary"
+            name="vn:reserva"
+            size="xs"
+            data-cy="ticketSaleReservedIcon"
+        >
+            <QTooltip>
+                {{ t('ticketSale.reserved') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon
+            v-if="row?.hasRisk"
             name="vn:risk"
             :color="row.hasHighRisk ? 'negative' : 'primary'"
             size="xs"
         >
             <QTooltip>
                 {{ $t('salesTicketsTable.risk') }}:
-                {{ toCurrency(row.risk - row.credit) }}
+                {{ toCurrency(row.risk - (row.credit ?? 0)) }}
             </QTooltip>
         </QIcon>
         <QIcon
@@ -67,12 +78,7 @@ defineProps({ row: { type: Object, required: true } });
         >
             <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
         </QIcon>
-        <QIcon
-            v-if="row?.isTaxDataChecked !== 0"
-            name="vn:no036"
-            color="primary"
-            size="xs"
-        >
+        <QIcon v-if="row?.isTaxDataChecked" name="vn:no036" color="primary" size="xs">
             <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
         </QIcon>
         <QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs">
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 7e9f7aae0..d0c657f8a 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -55,6 +55,10 @@ const $props = defineProps({
         type: [Function, Boolean],
         default: null,
     },
+    rowCtrlClick: {
+        type: [Function, Boolean],
+        default: null,
+    },
     redirect: {
         type: String,
         default: null,
diff --git a/src/components/common/VnAccountNumber.vue b/src/components/common/VnAccountNumber.vue
index c4fa78674..56add7329 100644
--- a/src/components/common/VnAccountNumber.vue
+++ b/src/components/common/VnAccountNumber.vue
@@ -1,12 +1,9 @@
 <script setup>
-import { nextTick, ref, watch } from 'vue';
-import { QInput } from 'quasar';
+import { nextTick, ref } from 'vue';
+import VnInput from './VnInput.vue';
+import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
 
 const $props = defineProps({
-    modelValue: {
-        type: String,
-        default: '',
-    },
     insertable: {
         type: Boolean,
         default: false,
@@ -14,70 +11,25 @@ const $props = defineProps({
 });
 
 const emit = defineEmits(['update:modelValue', 'accountShortToStandard']);
+const model = defineModel({ prop: 'modelValue' });
+const inputRef = ref(false);
 
-let internalValue = ref($props.modelValue);
-
-watch(
-    () => $props.modelValue,
-    (newVal) => {
-        internalValue.value = newVal;
-    }
-);
-
-watch(
-    () => internalValue.value,
-    (newVal) => {
-        emit('update:modelValue', newVal);
-        accountShortToStandard();
-    }
-);
-
-const handleKeydown = (e) => {
-    if (e.key === 'Backspace') return;
-    if (e.key === '.') {
-        accountShortToStandard();
-        // TODO: Fix this setTimeout, with nextTick doesn't work
-        setTimeout(() => {
-            setCursorPosition(0, e.target);
-        }, 1);
-        return;
-    }
-
-    if ($props.insertable && e.key.match(/[0-9]/)) {
-        handleInsertMode(e);
-    }
-};
-function setCursorPosition(pos, el = vnInputRef.value) {
-    el.focus();
-    el.setSelectionRange(pos, pos);
+function setCursorPosition(pos) {
+    const input = inputRef.value.vnInputRef.$el.querySelector('input');
+    input.focus();
+    input.setSelectionRange(pos, pos);
 }
-const vnInputRef = ref(false);
-const handleInsertMode = (e) => {
-    e.preventDefault();
-    const input = e.target;
-    const cursorPos = input.selectionStart;
-    const { maxlength } = vnInputRef.value;
-    let currentValue = internalValue.value;
-    if (!currentValue) currentValue = e.key;
-    const newValue = e.key;
-    if (newValue && !isNaN(newValue) && cursorPos < maxlength) {
-        internalValue.value =
-            currentValue.substring(0, cursorPos) +
-            newValue +
-            currentValue.substring(cursorPos + 1);
-    }
-    nextTick(() => {
-        input.setSelectionRange(cursorPos + 1, cursorPos + 1);
-    });
-};
-function accountShortToStandard() {
-    internalValue.value = internalValue.value?.replace(
-        '.',
-        '0'.repeat(11 - internalValue.value.length)
-    );
+
+async function handleUpdateModel(val) {
+    model.value = val?.at(-1) === '.' ? useAccountShortToStandard(val) : val;
+    await nextTick(() => setCursorPosition(0));
 }
 </script>
-
 <template>
-    <QInput @keydown="handleKeydown" ref="vnInputRef" v-model="internalValue" />
+    <VnInput
+        v-model="model"
+        ref="inputRef"
+        :insertable
+        @update:model-value="handleUpdateModel"
+    />
 </template>
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index aeb4a31fd..9e13f5351 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -83,7 +83,7 @@ const mixinRules = [
     requiredFieldRule,
     ...($attrs.rules ?? []),
     (val) => {
-        const { maxlength } = vnInputRef.value;
+        const maxlength = $props.maxlength;
         if (maxlength && +val.length > maxlength)
             return t(`maxLength`, { value: maxlength });
         const { min, max } = vnInputRef.value.$attrs;
@@ -108,7 +108,7 @@ const handleInsertMode = (e) => {
     e.preventDefault();
     const input = e.target;
     const cursorPos = input.selectionStart;
-    const { maxlength } = vnInputRef.value;
+    const maxlength = $props.maxlength;
     let currentValue = value.value;
     if (!currentValue) currentValue = e.key;
     const newValue = e.key;
@@ -143,7 +143,7 @@ const handleUppercase = () => {
             :rules="mixinRules"
             :lazy-rules="true"
             hide-bottom-space
-            :data-cy="$attrs.dataCy ?? $attrs.label + '_input'"
+            :data-cy="$attrs['data-cy'] ?? $attrs.label + '_input'"
         >
             <template #prepend v-if="$slots.prepend">
                 <slot name="prepend" />
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index d111780bd..339f90e0e 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -302,6 +302,8 @@ defineExpose({ opts: myOptions, vnSelectRef });
 
 function handleKeyDown(event) {
     if (event.key === 'Tab' && !event.shiftKey) {
+        event.preventDefault();
+
         const inputValue = vnSelectRef.value?.inputValue;
 
         if (inputValue) {
diff --git a/src/components/ui/CatalogItem.vue b/src/components/ui/CatalogItem.vue
index 7806562b2..0ae890e37 100644
--- a/src/components/ui/CatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@@ -132,7 +132,8 @@ const card = toRef(props, 'item');
     display: flex;
     flex-direction: column;
     gap: 4px;
-
+    white-space: nowrap;
+    width: 192px;
     p {
         margin-bottom: 0;
     }
diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index ec6289a67..eb0804af0 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -18,20 +18,16 @@ import VnInput from 'components/common/VnInput.vue';
 
 const emit = defineEmits(['onFetch']);
 
-const originalAttrs = useAttrs();
-
-const $attrs = computed(() => {
-    const { style, ...rest } = originalAttrs;
-    return rest;
-});
+const $attrs = useAttrs();
 
 const isRequired = computed(() => {
-    return Object.keys($attrs).includes('required')
+    return Object.keys($attrs).includes('required');
 });
 
 const $props = defineProps({
     url: { type: String, default: null },
-    saveUrl: {type: String, default: null},
+    saveUrl: { type: String, default: null },
+    userFilter: { type: Object, default: () => {} },
     filter: { type: Object, default: () => {} },
     body: { type: Object, default: () => {} },
     addNote: { type: Boolean, default: false },
@@ -65,7 +61,7 @@ async function insert() {
 }
 
 function confirmAndUpdate() {
-    if(!newNote.text && originalText)
+    if (!newNote.text && originalText)
         quasar
             .dialog({
                 component: VnConfirm,
@@ -88,11 +84,17 @@ async function update() {
         ...body,
         ...{ notes: newNote.text },
     };
-    await axios.patch(`${$props.saveUrl ?? `${$props.url}/${$props.body.workerFk}`}`, newBody);
+    await axios.patch(
+        `${$props.saveUrl ?? `${$props.url}/${$props.body.workerFk}`}`,
+        newBody,
+    );
 }
 
 onBeforeRouteLeave((to, from, next) => {
-    if ((newNote.text && !$props.justInput) || (newNote.text !== originalText) && $props.justInput)
+    if (
+        (newNote.text && !$props.justInput) ||
+        (newNote.text !== originalText && $props.justInput)
+    )
         quasar.dialog({
             component: VnConfirm,
             componentProps: {
@@ -104,12 +106,11 @@ onBeforeRouteLeave((to, from, next) => {
     else next();
 });
 
-function fetchData([ data ]) {
+function fetchData([data]) {
     newNote.text = data?.notes;
     originalText = data?.notes;
     emit('onFetch', data);
 }
-
 </script>
 <template>
     <FetchData
@@ -126,8 +127,8 @@ function fetchData([ data ]) {
         @on-fetch="fetchData"
         auto-load
     />
-    <QCard 
-        class="q-pa-xs q-mb-lg full-width" 
+    <QCard
+        class="q-pa-xs q-mb-lg full-width"
         :class="{ 'just-input': $props.justInput }"
         v-if="$props.addNote || $props.justInput"
     >
@@ -179,7 +180,8 @@ function fetchData([ data ]) {
         :url="$props.url"
         order="created DESC"
         :limit="0"
-        :user-filter="$props.filter"
+        :user-filter="userFilter"
+        :filter="filter"
         auto-load
         ref="vnPaginateRef"
         class="show"
@@ -218,7 +220,7 @@ function fetchData([ data ]) {
                                 >
                                     {{
                                         observationTypes.find(
-                                            (ot) => ot.id === note.observationTypeFk
+                                            (ot) => ot.id === note.observationTypeFk,
                                         )?.description
                                     }}
                                 </QBadge>
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 5b667555e..d7187371e 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -369,6 +369,7 @@ globals:
         countryFk: Country
         countryCodeFk: Country
         companyFk: Company
+        nickname: Alias
     model: Model
     fuel: Fuel
     active: Active
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 3f004485d..fc3018f39 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -370,6 +370,7 @@ globals:
         countryFk: País
         countryCodeFk: País
         companyFk: Empresa
+        nickname: Alias
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index cc6e33779..68cb220ee 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, useAttrs } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useState } from 'src/composables/useState';
 import VnNotes from 'src/components/ui/VnNotes.vue';
@@ -7,7 +7,6 @@ import VnNotes from 'src/components/ui/VnNotes.vue';
 const route = useRoute();
 const state = useState();
 const user = state.getUser();
-const $attrs = useAttrs();
 
 const $props = defineProps({
     id: { type: [Number, String], default: null },
@@ -15,24 +14,21 @@ const $props = defineProps({
 });
 const claimId = computed(() => $props.id || route.params.id);
 
-const claimFilter = computed(() => {
-    return {
-        where: { claimFk: claimId.value },
-        fields: ['id', 'created', 'workerFk', 'text'],
-        include: {
-            relation: 'worker',
-            scope: {
-                fields: ['id', 'firstName', 'lastName'],
-                include: {
-                    relation: 'user',
-                    scope: {
-                        fields: ['id', 'nickname', 'name'],
-                    },
+const claimFilter = {
+    fields: ['id', 'created', 'workerFk', 'text'],
+    include: {
+        relation: 'worker',
+        scope: {
+            fields: ['id', 'firstName', 'lastName'],
+            include: {
+                relation: 'user',
+                scope: {
+                    fields: ['id', 'nickname', 'name'],
                 },
             },
         },
-    };
-});
+    },
+};
 
 const body = {
     claimFk: claimId.value,
@@ -43,7 +39,8 @@ const body = {
     <VnNotes
         url="claimObservations"
         :add-note="$props.addNote"
-        :filter="claimFilter"
+        :user-filter="claimFilter"
+        :filter="{ where: { claimFk: claimId } }"
         :body="body"
         v-bind="$attrs"
         style="overflow-y: auto"
diff --git a/src/pages/Claim/Card/ClaimPhoto.vue b/src/pages/Claim/Card/ClaimPhoto.vue
index d4acc9bbe..4ced7e862 100644
--- a/src/pages/Claim/Card/ClaimPhoto.vue
+++ b/src/pages/Claim/Card/ClaimPhoto.vue
@@ -210,6 +210,7 @@ function onDrag() {
                     class="all-pointer-events absolute delete-button zindex"
                     @click.stop="viewDeleteDms(index)"
                     round
+                    :data-cy="`delete-button-${index+1}`"
                 />
                 <QIcon
                     name="play_circle"
@@ -227,6 +228,7 @@ function onDrag() {
                         class="rounded-borders cursor-pointer fit"
                         @click="openDialog(media.dmsFk)"
                         v-if="!media.isVideo"
+                        :data-cy="`file-${index+1}`"
                     >
                     </QImg>
                     <video
@@ -235,6 +237,7 @@ function onDrag() {
                         muted="muted"
                         v-if="media.isVideo"
                         @click="openDialog(media.dmsFk)"
+                        :data-cy="`file-${index+1}`"
                     />
                 </QCard>
             </div>
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 89f9d9449..e3156dd6d 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -118,14 +118,6 @@ const debtWarning = computed(() => {
                 >
                     <QTooltip>{{ t('Allowed substitution') }}</QTooltip>
                 </QIcon>
-                <QIcon
-                    v-if="customer?.isFreezed"
-                    name="vn:frozen"
-                    size="xs"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
-                </QIcon>
                 <QIcon
                     v-if="!entity.account?.active"
                     color="primary"
@@ -150,6 +142,14 @@ const debtWarning = computed(() => {
                 >
                     <QTooltip>{{ t('customer.card.notChecked') }}</QTooltip>
                 </QIcon>
+                <QIcon
+                    v-if="entity?.isFreezed"
+                    name="vn:frozen"
+                    size="xs"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
+                </QIcon>
                 <QBtn
                     v-if="entity.unpaid"
                     flat
@@ -163,13 +163,13 @@ const debtWarning = computed(() => {
                         <br />
                         {{
                             t('unpaidDated', {
-                                dated: toDate(customer.unpaid?.dated),
+                                dated: toDate(entity.unpaid?.dated),
                             })
                         }}
                         <br />
                         {{
                             t('unpaidAmount', {
-                                amount: toCurrency(customer.unpaid?.amount),
+                                amount: toCurrency(entity.unpaid?.amount),
                             })
                         }}
                     </QTooltip>
diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue
index 189b59904..5a078b0cb 100644
--- a/src/pages/Customer/Card/CustomerNotes.vue
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@@ -1,28 +1,15 @@
 <script setup>
-import { computed } from 'vue';
-import { useRoute } from 'vue-router';
 import VnNotes from 'src/components/ui/VnNotes.vue';
-
-const route = useRoute();
-
-const noteFilter = computed(() => {
-    return {
-        order: 'created DESC',
-        where: {
-            clientFk: `${route.params.id}`,
-        },
-    };
-});
 </script>
-
 <template>
     <VnNotes
         url="clientObservations"
         :add-note="true"
-        :filter="noteFilter"
-        :body="{ clientFk: route.params.id }"
+        :filter="{ where: { clientFk: $route.params.id } }"
+        :body="{ clientFk: $route.params.id }"
         style="overflow-y: auto"
         :select-type="true"
         required
+        order="created DESC"
     />
 </template>
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index 6bce6aa04..c283e4a0b 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -145,6 +145,7 @@ const entryFilterPanel = ref();
                         v-model="params.agencyModeId"
                         @update:model-value="searchFn()"
                         url="AgencyModes"
+                        sort-by="name ASC"
                         :fields="['id', 'name']"
                         hide-selected
                         dense
diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 2ec862df0..782175cd6 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -17,6 +17,7 @@ import MonitorTicketFilter from './MonitorTicketFilter.vue';
 import TicketProblems from 'src/components/TicketProblems.vue';
 import VnDateBadge from 'src/components/common/VnDateBadge.vue';
 import { useStateStore } from 'src/stores/useStateStore';
+import useOpenURL from 'src/composables/useOpenURL';
 
 const DEFAULT_AUTO_REFRESH = 2 * 60 * 1000;
 const { t } = useI18n();
@@ -321,8 +322,7 @@ const totalPriceColor = (ticket) => {
     if (total > 0 && total < 50) return 'warning';
 };
 
-const openTab = (id) =>
-    window.open(`#/ticket/${id}/sale`, '_blank', 'noopener, noreferrer');
+const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
 </script>
 <template>
     <FetchData
@@ -397,6 +397,7 @@ const openTab = (id) =>
         default-mode="table"
         auto-load
         :row-click="({ id }) => openTab(id)"
+        :row-ctrl-click="(_, { id }) => openTab(id)"
         :disable-option="{ card: true }"
         :user-params="{ from, to, scopeDays: 0 }"
     >
diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml
index 496c8761a..c049a5e53 100644
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@@ -22,7 +22,7 @@ salesTicketsTable:
     notVisible: Not visible
     purchaseRequest: Purchase request
     clientFrozen: Client frozen
-    risk: Risk
+    risk: Excess risk
     componentLack: Component lack
     tooLittle: Ticket too little
     identifier: Identifier
diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml
index f6a29879f..a02d7f36f 100644
--- a/src/pages/Monitor/locale/es.yml
+++ b/src/pages/Monitor/locale/es.yml
@@ -22,7 +22,7 @@ salesTicketsTable:
     notVisible: No visible
     purchaseRequest: Petición de compra
     clientFrozen: Cliente congelado
-    risk: Riesgo
+    risk: Exceso de riesgo
     componentLack: Faltan componentes
     tooLittle: Ticket demasiado pequeño
     identifier: Identificador
diff --git a/src/pages/Route/Card/RouteAutonomousFilter.vue b/src/pages/Route/Card/RouteAutonomousFilter.vue
index 3be409ec9..f70f60e1c 100644
--- a/src/pages/Route/Card/RouteAutonomousFilter.vue
+++ b/src/pages/Route/Card/RouteAutonomousFilter.vue
@@ -44,8 +44,7 @@ const exprBuilder = (param, value) => {
 <template>
     <FetchData
         url="AgencyModes"
-        :filter="{ fields: ['id', 'name'] }"
-        sort-by="name ASC"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         @on-fetch="(data) => (agencyList = data)"
         auto-load
     />
diff --git a/src/pages/Shelving/ShelvingList.vue b/src/pages/Shelving/ShelvingList.vue
index 4e0c21100..651121de8 100644
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@@ -1,14 +1,17 @@
 <script setup>
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import CardList from 'components/ui/CardList.vue';
-import VnLv from 'components/ui/VnLv.vue';
+import { computed } from 'vue';
 import { useRouter } from 'vue-router';
-import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
-import ShelvingSummary from 'pages/Shelving/Card/ShelvingSummary.vue';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useI18n } from 'vue-i18n';
+import VnTable from 'components/VnTable/VnTable.vue';
 import VnSection from 'src/components/common/VnSection.vue';
+import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
+import ShelvingSummary from './Card/ShelvingSummary.vue';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import exprBuilder from './ShelvingExprBuilder.js';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnCheckbox from 'src/components/common/VnCheckbox.vue';
 
+const { t } = useI18n();
 const router = useRouter();
 const { viewSummary } = useSummaryDialog();
 const dataKey = 'ShelvingList';
@@ -17,9 +20,56 @@ const filter = {
     include: [{ relation: 'parking' }],
 };
 
-function navigate(id) {
-    router.push({ path: `/shelving/${id}` });
-}
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'code',
+        label: t('globals.code'),
+        isId: true,
+        isTitle: true,
+        columnFilter: false,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'parking',
+        label: t('shelving.list.parking'),
+        sortable: true,
+        format: (val) => val?.code ?? '',
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'priority',
+        label: t('shelving.list.priority'),
+        sortable: true,
+        cardVisible: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'isRecyclable',
+        label: t('shelving.summary.recyclable'),
+        sortable: true,
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('components.smartCard.viewSummary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, ShelvingSummary),
+                isPrimary: true,
+            },
+        ],
+    },
+]);
+
+const onDataSaved = ({ id }) => {
+    router.push({ name: 'ShelvingBasicData', params: { id } });
+};
 </script>
 
 <template>
@@ -37,48 +87,75 @@ function navigate(id) {
             <ShelvingFilter data-key="ShelvingList" />
         </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="navigate(row.id)"
-                            >
-                                <template #list-items>
-                                    <VnLv
-                                        :label="$t('shelving.list.parking')"
-                                        :title-label="$t('shelving.list.parking')"
-                                        :value="row.parking?.code"
-                                    />
-                                    <VnLv
-                                        :label="$t('shelving.list.priority')"
-                                        :value="row?.priority"
-                                    />
-                                </template>
-                                <template #actions>
-                                    <QBtn
-                                        :label="$t('components.smartCard.openSummary')"
-                                        @click.stop="viewSummary(row.id, ShelvingSummary)"
-                                        color="primary"
-                                    />
-                                </template>
-                            </CardList>
-                        </template>
-                    </VnPaginate>
-                </div>
-                <QPageSticky :offset="[20, 20]">
-                    <RouterLink :to="{ name: 'ShelvingCreate' }">
-                        <QBtn fab icon="add" color="primary" v-shortcut="'+'" />
-                        <QTooltip>
-                            {{ $t('shelving.list.newShelving') }}
-                        </QTooltip>
-                    </RouterLink>
-                </QPageSticky>
-            </QPage>
+            <VnTable
+                :data-key="dataKey"
+                :columns="columns"
+                is-editable="false"
+                :right-search="false"
+                :use-model="true"
+                :disable-option="{ table: true }"
+                redirect="shelving"
+                default-mode="card"
+                :create="{
+                    urlCreate: 'Shelvings',
+                    title: t('globals.pageTitles.shelvingCreate'),
+                    onDataSaved,
+                    formInitialData: {
+                        parkingFk: null,
+                        priority: null,
+                        code: '',
+                        isRecyclable: false,
+                    },
+                }"
+            >
+                <template #more-create-dialog="{ data }">
+                    <VnSelect
+                        v-model="data.parkingFk"
+                        url="Parkings"
+                        option-value="id"
+                        option-label="code"
+                        :label="t('shelving.list.parking')"
+                        :filter-options="['id', 'code']"
+                        :fields="['id', 'code']"
+                    />
+                    <VnCheckbox
+                        v-model="data.isRecyclable"
+                        :label="t('shelving.summary.recyclable')"
+                    />
+                </template>
+            </VnTable>
         </template>
     </VnSection>
 </template>
+
+<style lang="scss" scoped>
+.list {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 55%;
+}
+.list-container {
+    display: flex;
+    justify-content: center;
+}
+</style>
+
+<i18n>
+    es:
+        shelving:
+            list:
+                parking: Estacionamiento
+                priority: Prioridad
+        
+            summary:
+                recyclable: Reciclable
+    en:
+        shelving:
+            list:
+                parking: Parking
+                priority: Priority
+        
+            summary:
+                recyclable: Recyclable
+</i18n>
diff --git a/src/pages/Supplier/Card/SupplierFilter.js b/src/pages/Supplier/Card/SupplierFilter.js
index 3ce5c3de2..3aabe2c6d 100644
--- a/src/pages/Supplier/Card/SupplierFilter.js
+++ b/src/pages/Supplier/Card/SupplierFilter.js
@@ -11,6 +11,11 @@ export default {
         'isSerious',
         'isTrucker',
         'account',
+        'workerFk',
+        'note',
+        'isReal',
+        'isPayMethodChecked',
+        'companySize',
     ],
     include: [
         {
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index ecee5b76b..4293bd41a 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -108,7 +108,6 @@ function handleLocation(data, location) {
                 <VnAccountNumber
                     v-model="data.account"
                     :label="t('supplier.fiscalData.account')"
-                    clearable
                     data-cy="supplierFiscalDataAccount"
                     insertable
                     :maxlength="10"
@@ -185,8 +184,8 @@ function handleLocation(data, location) {
                     />
                     <VnCheckbox
                         v-model="data.isVies"
-                        :label="t('globals.isVies')" 
-                        :info="t('whenActivatingIt')" 
+                        :label="t('globals.isVies')"
+                        :info="t('whenActivatingIt')"
                     />
                 </div>
             </VnRow>
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index c9625518f..d1d437a19 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSection from 'src/components/common/VnSection.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'src/components/FetchData.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import SupplierSummary from './Card/SupplierSummary.vue';
@@ -53,7 +52,7 @@ const columns = computed(() => [
         label: t('globals.alias'),
         name: 'alias',
         columnFilter: {
-            name: 'search',
+            name: 'nickname',
         },
         cardVisible: true,
     },
@@ -120,6 +119,21 @@ const columns = computed(() => [
         ],
     },
 ]);
+
+const filterColumns = computed(() => {
+    const copy = [...columns.value];
+    copy.splice(copy.length - 1, 0, {
+        align: 'left',
+        label: t('globals.params.provinceFk'),
+        name: 'provinceFk',
+        options: provincesOptions.value,
+        columnFilter: {
+            component: 'select',
+        },
+    });
+
+    return copy;
+});
 </script>
 <template>
     <FetchData
@@ -130,7 +144,7 @@ const columns = computed(() => [
     />
     <VnSection
         :data-key="dataKey"
-        :columns="columns"
+        :columns="filterColumns"
         prefix="supplier"
         :array-data-props="{
             url: 'Suppliers/filter',
@@ -165,17 +179,6 @@ const columns = computed(() => [
                 </template>
             </VnTable>
         </template>
-        <template #moreFilterPanel="{ params, searchFn }">
-            <VnSelect
-                :label="t('globals.params.provinceFk')"
-                v-model="params.provinceFk"
-                @update:model-value="searchFn()"
-                :options="provincesOptions"
-                filled
-                dense
-                class="q-px-sm q-pr-lg"
-            />
-        </template>
     </VnSection>
 </template>
 
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index c5f3233b1..1e585592f 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -93,9 +93,9 @@ function ticketFilter(ticket) {
             <VnLv :label="t('globals.warehouse')" :value="entity.warehouse?.name" />
             <VnLv :label="t('globals.alias')" :value="entity.nickname" />
         </template>
-        <template #icons>
+        <template #icons="{ entity }">
             <QCardActions class="q-gutter-x-xs">
-                <TicketProblems :row="problems" />
+                <TicketProblems :row="{ ...entity?.client, ...problems }" />
             </QCardActions>
         </template>
         <template #actions="{ entity }">
diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index a41d492ed..e9e153b70 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -37,7 +37,6 @@ const expeditionStateTypes = ref([]);
 
 const expeditionsFilter = computed(() => ({
     where: { ticketFk: route.params.id },
-    order: ['created DESC'],
 }));
 
 const ticketArrayData = useArrayData('Ticket');
@@ -325,6 +324,7 @@ onMounted(async () => {
         "
         :redirect="false"
         order="created DESC"
+        :filter="expeditionsFilter"
     >
         <template #column-freightItemName="{ row }">
             <span class="link" @click.stop>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 456a151a3..cc16af72c 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -681,6 +681,17 @@ watch(
         :disabled-attr="isTicketEditable"
     >
         <template #column-statusIcons="{ row }">
+            <QIcon
+                v-if="row.saleGroupFk"
+                name="inventory_2"
+                size="xs"
+                color="primary"
+                class="cursor-pointer"
+            >
+                <QTooltip class="no-pointer-events">
+                    {{ `saleGroup: ${row.saleGroupFk}` }}
+                </QTooltip>
+            </QIcon>
             <TicketProblems :row="row" />
         </template>
         <template #body-cell-picture="{ row }">
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 5da2a858c..bdf75c826 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -48,7 +48,7 @@ const getGroupedStates = (data) => {
     />
     <FetchData
         url="AgencyModes"
-        :sort-by="['name ASC']"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         @on-fetch="(data) => (agencies = data)"
         auto-load
     />
@@ -256,8 +256,6 @@ const getGroupedStates = (data) => {
                         v-model="params.agencyModeFk"
                         @update:model-value="searchFn()"
                         :options="agencies"
-                        option-value="id"
-                        option-label="name"
                         emit-value
                         map-options
                         use-input
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 29d342334..ae6e695be 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -73,6 +73,7 @@ warehouses();
     />
     <FetchData
         url="AgencyModes"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />
diff --git a/src/pages/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
index 72c34aad8..35a936134 100644
--- a/src/pages/Travel/TravelCreate.vue
+++ b/src/pages/Travel/TravelCreate.vue
@@ -39,6 +39,7 @@ const redirectToTravelBasicData = (_, { id }) => {
 <template>
     <FetchData
         url="AgencyModes"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index 90901ee4d..4a9c80952 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -52,9 +52,8 @@ defineExpose({ states });
                     v-model="params.agencyModeFk"
                     @update:model-value="searchFn()"
                     url="agencyModes"
+                    sort-by="name ASC"
                     :use-like="false"
-                    option-value="id"
-                    option-label="name"
                     option-filter="name"
                     dense
                     outlined
diff --git a/src/pages/Worker/Card/WorkerNotes.vue b/src/pages/Worker/Card/WorkerNotes.vue
index 4f123206b..da274f3fa 100644
--- a/src/pages/Worker/Card/WorkerNotes.vue
+++ b/src/pages/Worker/Card/WorkerNotes.vue
@@ -5,9 +5,9 @@ import VnNotes from 'src/components/ui/VnNotes.vue';
 
 const route = useRoute();
 
-const filter = {
+const userFilter = {
     order: 'created DESC',
-    where: { workerFk: route.params.id },
+
     include: {
         relation: 'worker',
         scope: {
@@ -22,11 +22,15 @@ const filter = {
     },
 };
 
-const body = {
-    workerFk: route.params.id,
-};
+const body = { workerFk: route.params.id };
 </script>
 
 <template>
-    <VnNotes :add-note="true" url="WorkerObservations" :filter="filter" :body="body" />
+    <VnNotes
+        :add-note="true"
+        url="WorkerObservations"
+        :user-filter="userFilter"
+        :filter="{ where: { workerFk: $route.params.id } }"
+        :body="body"
+    />
 </template>
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 7def6e94c..9c0fa6758 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -343,19 +343,29 @@ const updateData = async () => {
 
 const getMailStates = async (date) => {
     const url = `WorkerTimeControls/${route.params.id}/getMailStates`;
+    const year = date.getFullYear();
     const month = date.getMonth() + 1;
-    const prevMonth = month == 1 ? 12 : month - 1;
-    const params = {
-        month,
-        year: date.getFullYear(),
+
+    const getMonthStates = async (month, year) => {
+        return (await axios.get(url, { params: { month, year } })).data;
     };
 
-    const curMonthStates = (await axios.get(url, { params })).data;
-    const prevMonthStates = (
-        await axios.get(url, { params: { ...params, month: prevMonth } })
-    ).data;
+    const curMonthStates = await getMonthStates(month, year);
 
-    workerTimeControlMails.value = curMonthStates.concat(prevMonthStates);
+    const prevMonthStates = await getMonthStates(
+        month === 1 ? 12 : month - 1,
+        month === 1 ? year - 1 : year,
+    );
+
+    const postMonthStates = await getMonthStates(
+        month === 12 ? 1 : month + 1,
+        month === 12 ? year + 1 : year,
+    );
+    workerTimeControlMails.value = [
+        ...curMonthStates,
+        ...prevMonthStates,
+        ...postMonthStates,
+    ];
 };
 
 const showWorkerTimeForm = (propValue, formType) => {
diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 03013f011..089208453 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -9,22 +9,22 @@ import VnInputTime from 'src/components/common/VnInputTime.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
-const validAddresses = ref([]);
 const addresses = ref([]);
 
 const setFilteredAddresses = (data) => {
-    const validIds = new Set(validAddresses.value.map((item) => item.addressFk));
-    addresses.value = data.filter((address) => validIds.has(address.id));
+    addresses.value = data.map(({ address }) => address);
 };
 </script>
 
 <template>
     <FetchData
         url="RoadmapAddresses"
+        :filter="{
+            include: { relation: 'address' },
+        }"
         auto-load
-        @on-fetch="(data) => (validAddresses = data)"
+        @on-fetch="setFilteredAddresses"
     />
-    <FetchData url="Addresses" auto-load @on-fetch="setFilteredAddresses" />
     <FormModel auto-load model="Zone">
         <template #form="{ data, validate }">
             <VnRow>
@@ -125,7 +125,6 @@ const setFilteredAddresses = (data) => {
                     map-options
                     :rules="validate('data.addressFk')"
                     :filter-options="['id']"
-                    :where="filterWhere"
                 />
             </VnRow>
             <VnRow>
diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index bbe12189a..ff65479e4 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -5,6 +5,7 @@ import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
+import order from 'src/router/modules/order';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -24,7 +25,7 @@ const agencies = ref([]);
 <template>
     <FetchData
         url="AgencyModes"
-        :filter="{ fields: ['id', 'name'] }"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
         @on-fetch="(data) => (agencies = data)"
         auto-load
     />
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 4df84e4bd..eb54ec15b 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -199,9 +199,8 @@ function formatRow(row) {
         <template #more-create-dialog="{ data }">
             <VnSelect
                 url="AgencyModes"
+                sort-by="name ASC"
                 v-model="data.agencyModeFk"
-                option-value="id"
-                option-label="name"
                 :label="t('list.agency')"
             />
             <VnInput
diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index c085dd8dc..94ff274dc 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -111,15 +111,6 @@ export default {
                         shelvingCard,
                     ],
                 },
-                {
-                    path: 'create',
-                    name: 'ShelvingCreate',
-                    meta: {
-                        title: 'shelvingCreate',
-                        icon: 'add',
-                    },
-                    component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'),
-                },
                 {
                     path: 'parking',
                     name: 'ParkingMain',
diff --git a/test/cypress/integration/claim/claimPhoto.spec.js b/test/cypress/integration/claim/claimPhoto.spec.js
index c3522cbfe..592642f4d 100755
--- a/test/cypress/integration/claim/claimPhoto.spec.js
+++ b/test/cypress/integration/claim/claimPhoto.spec.js
@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
-// redmine.verdnatura.es/issues/8417
-describe.skip('ClaimPhoto', () => {
+describe('ClaimPhoto', () => {
+    const carrouselClose = '.q-dialog__inner > .q-toolbar > .q-btn > .q-btn__content > .q-icon';
     beforeEach(() => {
         const claimId = 1;
         cy.login('developer');
@@ -16,6 +16,7 @@ describe.skip('ClaimPhoto', () => {
     });
 
     it('should add new file with drag and drop', () => {
+        cy.get('.container').should('be.visible').and('exist');
         cy.get('.container').selectFile('test/cypress/fixtures/image.jpg', {
             action: 'drag-drop',
         });
@@ -23,33 +24,23 @@ 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',
-        );
+        cy.dataCy('file-1').click();
+        cy.get(carrouselClose).click();
 
-        cy.get('.q-carousel__control > button').click();
-
-        cy.get(
-            '.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',
-        );
+        cy.dataCy('file-1').click();
+        cy.get('.q-carousel__control > button').as('nextButton').click();
+        cy.get('.q-carousel__slide > .q-ma-none').should('be.visible');
+        cy.get(carrouselClose).click();
     });
 
     it('should remove third and fourth file', () => {
-        cy.get(
-            '.multimediaParent > :nth-last-child(1) > .q-btn > .q-btn__content > .q-icon',
-        ).click();
+        cy.dataCy('delete-button-4').click();
         cy.get(
             '.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',
-        ).click();
+        cy.dataCy('delete-button-3').click();
         cy.get(
             '.q-card__actions > .q-btn--unelevated > .q-btn__content > .block',
         ).click();
diff --git a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
index 333f7e2c4..8370ac6fd 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
@@ -17,7 +17,6 @@ describe('InvoiceOut summary', () => {
         cy.login('developer');
         cy.visit(`/#/invoice-out/1/summary`);
     });
-
     it('open the descriptors', () => {
         cy.get(firstRowDescriptors(1)).click();
         cy.get('.descriptor').should('be.visible');
@@ -35,7 +34,6 @@ describe('InvoiceOut summary', () => {
 
     it('should open the ticket list', () => {
         cy.get(toTicketList).click();
-        cy.get('.descriptor').should('be.visible');
         cy.dataCy('vnFilterPanelChip').should('include.text', 'T1111111');
     });
 
diff --git a/test/cypress/integration/shelving/parking/parkingList.spec.js b/test/cypress/integration/shelving/parking/parkingList.spec.js
index ecee8aab7..ca1877621 100644
--- a/test/cypress/integration/shelving/parking/parkingList.spec.js
+++ b/test/cypress/integration/shelving/parking/parkingList.spec.js
@@ -1,7 +1,7 @@
 /// <reference types="cypress" />
 describe('ParkingList', () => {
     const searchbar = '#searchbar input';
-    const firstCard = ':nth-child(1) > .q-card > .no-margin > .q-py-none';   
+    const firstCard = ':nth-child(1) > .q-card > .no-margin > .q-py-none';
     const summaryHeader = '.summaryBody .header';
 
     beforeEach(() => {
diff --git a/test/cypress/integration/shelving/shelvingBasicData.spec.js b/test/cypress/integration/shelving/shelvingBasicData.spec.js
new file mode 100644
index 000000000..d7b0dc692
--- /dev/null
+++ b/test/cypress/integration/shelving/shelvingBasicData.spec.js
@@ -0,0 +1,24 @@
+/// <reference types="cypress" />
+describe('ShelvingList', () => {
+    const parking =
+        '.q-card > :nth-child(1) > .q-select > .q-field__inner > .q-field__control > .q-field__control-container';
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/shelving/1/basic-data`);
+    });
+
+    it('should give an error if the code aldready exists', () => {
+        cy.dataCy('Code_input').should('exist').clear().type('AA7');
+        cy.saveCard();
+        cy.get('.q-notification__message').should('have.text', 'The code already exists');
+    });
+    it('should edit the data and save', () => {
+        cy.selectOption(parking, 'P-01-1');
+        cy.dataCy('Code_input').clear().type('AA1');
+        cy.dataCy('Priority_input').clear().type('10');
+        cy.get(':nth-child(2) > .q-checkbox > .q-checkbox__inner').click();
+        cy.saveCard();
+        cy.get('.q-notification__message').should('have.text', 'Data saved');
+    });
+});
diff --git a/test/cypress/integration/shelving/shelvingList.spec.js b/test/cypress/integration/shelving/shelvingList.spec.js
new file mode 100644
index 000000000..745dd1b78
--- /dev/null
+++ b/test/cypress/integration/shelving/shelvingList.spec.js
@@ -0,0 +1,41 @@
+/// <reference types="cypress" />
+describe('ShelvingList', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/shelving/list`);
+    });
+
+    it('should redirect on clicking a shelving', () => {
+        cy.typeSearchbar('{enter}');
+        cy.dataCy('cardBtn').eq(0).click();
+        cy.get('.summaryHeader > .header > .q-icon').click();
+        cy.url().should('include', '/shelving/1/summary');
+    });
+
+    it('should redirect from preview to basic-data', () => {
+        cy.typeSearchbar('{enter}');
+        cy.dataCy('cardBtn').eq(0).click();
+        cy.get('.q-card > .header').click();
+        cy.url().should('include', '/shelving/1/basic-data');
+    });
+
+    it('should filter and redirect if only one result', () => {
+        cy.selectOption('[data-cy="Parking_select"]', 'P-02-2');
+        cy.dataCy('Parking_select').type('{enter}');
+        cy.url().should('match', /\/shelving\/\d+\/summary/);
+    });
+
+    it('should create a new shelving', () => {
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.dataCy('code-create-popup').type('Test');
+        cy.dataCy('Priority_input').type('10');
+        cy.selectOption(
+            '.grid-create > .q-select > .q-field__inner > .q-field__control > .q-field__control-container',
+            '100-01',
+        );
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data created');
+        cy.url().should('match', /\/shelving\/\d+\/basic-data/);
+    });
+});
diff --git a/test/cypress/integration/ticket/ticketFilter.spec.js b/test/cypress/integration/ticket/ticketFilter.spec.js
index 659a9f83c..2e5a3f3ce 100644
--- a/test/cypress/integration/ticket/ticketFilter.spec.js
+++ b/test/cypress/integration/ticket/ticketFilter.spec.js
@@ -8,43 +8,8 @@ describe('TicketFilter', () => {
 
     it('use search button', function () {
         cy.waitForElement('.q-page');
-        cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketFilter');
+        cy.get('[data-cy="Customer ID_input"]').type('1105');
         cy.searchBtnFilterPanel();
-        cy.waitRequest('@ticketFilter', ({ request }) => {
-            const { query } = request;
-            expect(query).to.have.property('from');
-            expect(query).to.have.property('to');
-        });
-        cy.on('uncaught:exception', () => {
-            return false;
-        });
-        cy.get('.q-field__control-container > [data-cy="From_date"]')
-            .type(`${today()} `)
-            .type('{enter}');
-        cy.get('.q-notification').should(
-            'contain',
-            `The date range must have both 'from' and 'to'`,
-        );
-
-        cy.get('.q-field__control-container > [data-cy="To_date"]').type(
-            `${today()}{enter}`,
-        );
-        cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketFilter');
-        cy.searchBtnFilterPanel();
-        cy.wait('@ticketFilter').then(({ request }) => {
-            const { query } = request;
-            expect(query).to.have.property('from');
-            expect(query).to.have.property('to');
-        });
-        cy.location('href').should('contain', '#/ticket/999999');
+        cy.location('href').should('contain', '#/ticket/15/summary');
     });
 });
-function today(date) {
-    // return new Date().toISOString().split('T')[0];
-
-    return new Intl.DateTimeFormat('es-ES', {
-        day: '2-digit',
-        month: '2-digit',
-        year: 'numeric',
-    }).format(date ?? new Date());
-}
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 6a6dc24af..c9b3092a8 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -11,12 +11,12 @@ describe('TicketList', () => {
     const searchResults = (search) => {
         if (search) cy.typeSearchbar().type(search);
         cy.dataCy('vn-searchbar').find('input').type('{enter}');
-        cy.dataCy('ticketListTable').should('exist');
+        // cy.dataCy('ticketListTable').should('exist');
         cy.get(firstRow).should('exist');
     };
 
     it('should search results', () => {
-        cy.dataCy('ticketListTable').should('not.exist');
+        // cy.dataCy('ticketListTable').should('not.exist');
         cy.get('.q-field__control').should('exist');
         searchResults();
     });
@@ -40,21 +40,11 @@ describe('TicketList', () => {
     it('filter client and create ticket', () => {
         cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketSearchbar');
         searchResults();
-        cy.wait('@ticketSearchbar').then(({ request }) => {
-            const { query } = request;
-            expect(query).to.have.property('from');
-            expect(query).to.have.property('to');
-            expect(query).to.not.have.property('clientFk');
-        });
+
         cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketFilter');
         cy.dataCy('Customer ID_input').clear('1');
         cy.dataCy('Customer ID_input').type('1101{enter}');
-        cy.wait('@ticketFilter').then(({ request }) => {
-            const { query } = request;
-            expect(query).to.not.have.property('from');
-            expect(query).to.not.have.property('to');
-            expect(query).to.have.property('clientFk');
-        });
+
         cy.get('[data-cy="vnTableCreateBtn"] > .q-btn__content > .q-icon').click();
         cy.dataCy('Customer_select').should('have.value', 'Bruce Wayne');
         cy.dataCy('Address_select').click();
diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js
index b59765ca6..805198857 100644
--- a/test/cypress/integration/ticket/ticketSale.spec.js
+++ b/test/cypress/integration/ticket/ticketSale.spec.js
@@ -112,7 +112,6 @@ describe('TicketSale', () => {
             cy.dataCy('ticketSaleTransferBtn').click();
             cy.dataCy('ticketTransferPopup').should('exist');
             cy.dataCy('ticketTransferNewTicketBtn').click();
-            //check the new ticket has been created succesfully
             cy.get('.q-item > .q-item__label').should('not.have.text', ' #32');
         });
 
@@ -138,7 +137,7 @@ describe('TicketSale', () => {
         it('update price', () => {
             const price = Number((Math.random() * 99 + 1).toFixed(2));
             cy.waitForElement(firstRow);
-            cy.get(':nth-child(10) > .q-btn').click();
+            cy.get('[data-col-field="price"]').find('.q-btn').click();
             cy.waitForElement('[data-cy="ticketEditManaProxy"]');
             cy.dataCy('ticketEditManaProxy').should('exist');
             cy.waitForElement('[data-cy="Price_input"]');
@@ -147,15 +146,14 @@ describe('TicketSale', () => {
             cy.dataCy('saveManaBtn').click();
             handleVnConfirm();
 
-            cy.get(':nth-child(10) > .q-btn > .q-btn__content').should(
-                'have.text',
-                `€${price}`,
-            );
+            cy.get('[data-col-field="price"]')
+                .find('.q-btn > .q-btn__content')
+                .should('have.text', `€${price}`);
         });
-        it('update dicount', () => {
+        it('update discount', () => {
             const discount = Math.floor(Math.random() * 100) + 1;
             selectFirstRow();
-            cy.get(':nth-child(11) > .q-btn').click();
+            cy.get('[data-col-field="discount"]').find('.q-btn').click();
             cy.waitForElement('[data-cy="ticketEditManaProxy"]');
             cy.dataCy('ticketEditManaProxy').should('exist');
             cy.waitForElement('[data-cy="Disc_input"]');
@@ -164,26 +162,24 @@ describe('TicketSale', () => {
             cy.dataCy('saveManaBtn').click();
             handleVnConfirm();
 
-            cy.get(':nth-child(11) > .q-btn > .q-btn__content').should(
-                'have.text',
-                `${discount}.00%`,
-            );
+            cy.get('[data-col-field="discount"]')
+                .find('.q-btn > .q-btn__content')
+                .should('have.text', `${discount}.00%`);
         });
 
         it('change concept', () => {
-            const quantity = Math.floor(Math.random() * 100) + 1;
+            const concept = Math.floor(Math.random() * 100) + 1;
             cy.waitForElement(firstRow);
-            cy.get(':nth-child(8) > .row').click();
-            cy.get(
-                '.q-menu > [data-v-ca3f07a4=""] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="undefined_input"]',
-            )
-                .type(quantity)
+            cy.get('[data-col-field="item"]').click();
+            cy.get('.q-menu')
+                .find('[data-cy="undefined_input"]')
+                .type(concept)
                 .type('{enter}');
             handleVnConfirm();
 
-            cy.get(':nth-child(8) >.row').should('contain.text', `${quantity}`);
+            cy.get('[data-col-field="item"]').should('contain.text', `${concept}`);
         });
-        it('changequantity ', () => {
+        it('change quantity ', () => {
             const quantity = Math.floor(Math.random() * 100) + 1;
             cy.waitForElement(firstRow);
             cy.dataCy('ticketSaleQuantityInput').clear();
@@ -200,7 +196,7 @@ describe('TicketSale', () => {
 });
 
 function handleVnConfirm() {
-    cy.get('[data-cy="VnConfirm_confirm"] > .q-btn__content > .block').click();
+    cy.get('[data-cy="VnConfirm_confirm"]').click();
     cy.waitForElement('.q-notification__message');
 
     cy.get('.q-notification__message').should('be.visible');
diff --git a/test/cypress/integration/vnComponent/VnAccountNumber.spec.js b/test/cypress/integration/vnComponent/VnAccountNumber.spec.js
index 63ab646fe..0dc12205b 100644
--- a/test/cypress/integration/vnComponent/VnAccountNumber.spec.js
+++ b/test/cypress/integration/vnComponent/VnAccountNumber.spec.js
@@ -1,35 +1,50 @@
-describe('VnInput Component', () => {
+describe('VnAccountNumber', () => {
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);
         cy.visit('/#/supplier/1/fiscal-data');
     });
 
-    it('should replace character at cursor position in insert mode', () => {
-        // Simula escribir en el input
-        cy.dataCy('supplierFiscalDataAccount').clear();
-        cy.dataCy('supplierFiscalDataAccount').type('4100000001');
-        // Coloca el cursor en la posición 0
-        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');
+    describe('VnInput handleInsertMode()', () => {
+        it('should replace character at cursor position in insert mode', () => {
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').type(
+                '{selectall}4100000001',
+            );
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').type('{movetostart}');
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').type('999');
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').should(
+                'have.value',
+                '9990000001',
+            );
+        });
+
+        it('should replace character at cursor position in insert mode', () => {
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').clear();
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').type('4100000001');
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').type('{movetostart}');
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').type('999');
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').should(
+                'have.value',
+                '9990000001',
+            );
+        });
+
+        it('should respect maxlength prop', () => {
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').clear();
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').type('123456789012345');
+            cy.get('input[data-cy="supplierFiscalDataAccount"]').should(
+                'have.value',
+                '1234567890',
+            );
+        });
     });
 
-    it('should replace character at cursor position in insert mode', () => {
-        // Simula escribir en el input
-        cy.dataCy('supplierFiscalDataAccount').clear();
-        cy.dataCy('supplierFiscalDataAccount').type('4100000001');
-        // Coloca el cursor en la posición 0
-        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');
-    });
-
-    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
+    it('should convert short account number to standard format', () => {
+        cy.get('input[data-cy="supplierFiscalDataAccount"]').clear();
+        cy.get('input[data-cy="supplierFiscalDataAccount"]').type('123.');
+        cy.get('input[data-cy="supplierFiscalDataAccount"]').should(
+            'have.value',
+            '1230000000',
+        );
     });
 });