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 c27d467ee..cd0f40b01 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -94,7 +94,7 @@ pipeline {
             parallel {
                 stage('Unit') {
                     steps {
-                        sh 'pnpm run test:unit:ci'
+                        sh 'pnpm run test:front:ci'
                     }
                     post {
                         always {
diff --git a/README.md b/README.md
index e87a84d60..262e12e58 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ quasar dev
 ### Run unit tests
 
 ```bash
-pnpm run test:unit
+pnpm run test:front
 ```
 
 ### Run e2e tests
diff --git a/package.json b/package.json
index 0e7fe4a54..e2570de47 100644
--- a/package.json
+++ b/package.json
@@ -16,8 +16,8 @@
         "test:e2e:parallel": "bash ./test/cypress/cypressParallel.sh",
         "test:e2e:summary": "bash ./test/cypress/summary.sh",
         "test": "echo \"See package.json => scripts for available tests.\" && exit 0",
-        "test:unit": "vitest",
-        "test:unit:ci": "vitest run",
+        "test:front": "vitest",
+        "test:front:ci": "vitest run",
         "commitlint": "commitlint --edit",
         "prepare": "npx husky install",
         "addReferenceTag": "node .husky/addReferenceTag.js",
diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 93a2ac96a..8c4f70f3b 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -184,8 +184,11 @@ async function saveChanges(data) {
     if ($props.beforeSaveFn) {
         changes = await $props.beforeSaveFn(changes, getChanges);
     }
-
     try {
+        if (changes?.creates?.length === 0 && changes?.updates?.length === 0) {
+            return;
+        }
+
         await axios.post($props.saveUrl || $props.url + '/crud', changes);
     } finally {
         isLoading.value = false;
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..5978f4e21 100644
--- a/src/components/TicketProblems.vue
+++ b/src/components/TicketProblems.vue
@@ -18,14 +18,25 @@ defineProps({ row: { type: Object, required: true } });
             </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 dd2cefd89..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,
@@ -681,6 +685,7 @@ const rowCtrlClickFunction = computed(() => {
                 @update:selected="emit('update:selected', $event)"
                 @selection="(details) => handleSelection(details, rows)"
                 :hide-selected-banner="true"
+                :data-cy="$props.dataCy ?? 'vnTable'"
             >
                 <template #top-left v-if="!$props.withoutHeader">
                     <slot name="top-left"> </slot>
diff --git a/src/components/__tests__/CrudModel.spec.js b/src/components/__tests__/CrudModel.spec.js
index e0afd30ad..f6c93e0d5 100644
--- a/src/components/__tests__/CrudModel.spec.js
+++ b/src/components/__tests__/CrudModel.spec.js
@@ -30,8 +30,8 @@ describe('CrudModel', () => {
                 saveFn: '',
             },
         });
-        wrapper=wrapper.wrapper;
-        vm=wrapper.vm;
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
     });
 
     beforeEach(() => {
@@ -143,14 +143,14 @@ describe('CrudModel', () => {
         });
 
         it('should return true if object is empty', async () => {
-            dummyObj ={};
-            result = vm.isEmpty(dummyObj);    
+            dummyObj = {};
+            result = vm.isEmpty(dummyObj);
 
             expect(result).toBe(true);
         });
 
         it('should return false if object is not empty', async () => {
-            dummyObj = {a:1, b:2, c:3};
+            dummyObj = { a: 1, b: 2, c: 3 };
             result = vm.isEmpty(dummyObj);
 
             expect(result).toBe(false);
@@ -158,29 +158,31 @@ describe('CrudModel', () => {
 
         it('should return true if array is empty', async () => {
             dummyArray = [];
-            result = vm.isEmpty(dummyArray); 
+            result = vm.isEmpty(dummyArray);
 
             expect(result).toBe(true);
         });
-        
+
         it('should return false if array is not empty', async () => {
-            dummyArray = [1,2,3];
+            dummyArray = [1, 2, 3];
             result = vm.isEmpty(dummyArray);
 
             expect(result).toBe(false);
-        })
+        });
     });
 
     describe('resetData()', () => {
         it('should add $index to elements in data[] and sets originalData and formData with data', async () => {
-            data = [{
-                name: 'Tony',
-                lastName: 'Stark',
-                age: 42,
-            }];
+            data = [
+                {
+                    name: 'Tony',
+                    lastName: 'Stark',
+                    age: 42,
+                },
+            ];
 
             vm.resetData(data);
-            
+
             expect(vm.originalData).toEqual(data);
             expect(vm.originalData[0].$index).toEqual(0);
             expect(vm.formData).toEqual(data);
@@ -200,7 +202,7 @@ describe('CrudModel', () => {
                 lastName: 'Stark',
                 age: 42,
             };
-            
+
             vm.resetData(data);
 
             expect(vm.originalData).toEqual(data);
@@ -210,17 +212,19 @@ describe('CrudModel', () => {
     });
 
     describe('saveChanges()', () => {
-        data = [{
-            name: 'Tony',
-            lastName: 'Stark',
-            age: 42,
-        }];
+        data = [
+            {
+                name: 'Tony',
+                lastName: 'Stark',
+                age: 42,
+            },
+        ];
 
         it('should call saveFn if exists', async () => {
             await wrapper.setProps({ saveFn: vi.fn() });
 
             vm.saveChanges(data);
-            
+
             expect(vm.saveFn).toHaveBeenCalledOnce();
             expect(vm.isLoading).toBe(false);
             expect(vm.hasChanges).toBe(false);
@@ -229,13 +233,15 @@ describe('CrudModel', () => {
         });
 
         it("should use default url if there's not saveFn", async () => {
-            const postMock =vi.spyOn(axios, 'post');
-            
-            vm.formData = [{
-                name: 'Bruce',
-                lastName: 'Wayne',
-                age: 45,
-            }]
+            const postMock = vi.spyOn(axios, 'post');
+
+            vm.formData = [
+                {
+                    name: 'Bruce',
+                    lastName: 'Wayne',
+                    age: 45,
+                },
+            ];
 
             await vm.saveChanges(data);
 
diff --git a/src/components/common/VnCardBeta.vue b/src/components/common/VnCardBeta.vue
index 7c82316dc..620dc2ad2 100644
--- a/src/components/common/VnCardBeta.vue
+++ b/src/components/common/VnCardBeta.vue
@@ -1,10 +1,9 @@
 <script setup>
 import { onBeforeMount } from 'vue';
-import { useRouter, onBeforeRouteUpdate } from 'vue-router';
+import { useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
-import LeftMenu from 'components/LeftMenu.vue';
 import VnSubToolbar from '../ui/VnSubToolbar.vue';
 
 const props = defineProps({
@@ -27,7 +26,13 @@ const arrayData = useArrayData(props.dataKey, {
     oneRecord: true,
 });
 
+onBeforeRouteLeave(() => {
+    stateStore.cardDescriptorChangeValue(null);
+});
+
 onBeforeMount(async () => {
+    stateStore.cardDescriptorChangeValue(props.descriptor);
+
     const route = router.currentRoute.value;
     try {
         await fetch(route.params.id);
@@ -62,11 +67,6 @@ function hasRouteParam(params, valueToCheck = ':addressId') {
 }
 </script>
 <template>
-    <Teleport to="#left-panel" v-if="stateStore.isHeaderMounted()">
-        <component :is="descriptor" />
-        <QSeparator />
-        <LeftMenu source="card" />
-    </Teleport>
     <VnSubToolbar />
     <div :class="[useCardSize(), $attrs.class]">
         <RouterView :key="$route.path" />
diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index d870e487f..8f106a9f1 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -641,15 +641,7 @@ watch(
                                                     >
                                                         {{ prop.nameI18n }}:
                                                     </span>
-                                                    <VnJsonValue :value="prop.val.val" />
-                                                    <span
-                                                        v-if="prop.val.id"
-                                                        class="id-value"
-                                                    >
-                                                        #{{ prop.val.id }}
-                                                    </span>
                                                     <span v-if="log.action == 'update'">
-                                                        ←
                                                         <VnJsonValue
                                                             :value="prop.old.val"
                                                         />
@@ -659,6 +651,26 @@ watch(
                                                         >
                                                             #{{ prop.old.id }}
                                                         </span>
+                                                        →
+                                                        <VnJsonValue
+                                                            :value="prop.val.val"
+                                                        />
+                                                        <span
+                                                            v-if="prop.val.id"
+                                                            class="id-value"
+                                                        >
+                                                            #{{ prop.val.id }}
+                                                        </span>
+                                                    </span>
+                                                    <span v-else="prop.old.val">
+                                                        <VnJsonValue
+                                                            :value="prop.val.val"
+                                                        />
+                                                        <span
+                                                            v-if="prop.old.id"
+                                                            class="id-value"
+                                                            >#{{ prop.old.id }}</span
+                                                        >
                                                     </span>
                                                 </div>
                                             </span>
diff --git a/src/components/common/VnModule.vue b/src/components/common/VnModule.vue
index 038ee1d60..747a7c951 100644
--- a/src/components/common/VnModule.vue
+++ b/src/components/common/VnModule.vue
@@ -12,7 +12,7 @@ const $props = defineProps({
     },
 });
 onMounted(
-    () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false)
+    () => (stateStore.leftDrawer = useQuasar().screen.gt.xs ? $props.leftDrawer : false),
 );
 
 const teleportRef = ref({});
@@ -35,8 +35,14 @@ onMounted(() => {
 <template>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit text-grey-8">
-            <div id="left-panel" ref="teleportRef"></div>
-            <LeftMenu v-if="!hasContent" />
+            <div id="left-panel" ref="teleportRef">
+                <template v-if="stateStore.cardDescriptor">
+                    <component :is="stateStore.cardDescriptor" />
+                    <QSeparator />
+                    <LeftMenu source="card" />
+                </template>
+                <template v-else> <LeftMenu /></template>
+            </div>
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
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/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/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/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/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 324da0771..c98bf1ffb 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -325,7 +325,7 @@ const sumRisk = ({ clientRisks }) => {
             </QCard>
             <QCard class="vn-max">
                 <VnTitle :text="t('Latest tickets')" />
-                <CustomerSummaryTable />
+                <CustomerSummaryTable :id="entityId" />
             </QCard>
         </template>
     </CardSummary>
diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index bb6f4442b..09c7e714c 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -20,7 +20,12 @@ const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 const { viewSummary } = useSummaryDialog();
-
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: null,
+    },
+});
 const filter = {
     include: [
         {
@@ -43,7 +48,7 @@ const filter = {
             },
         },
     ],
-    where: { clientFk: route.params.id },
+    where: { clientFk: $props.id ?? route.params.id },
     order: ['shipped DESC', 'id'],
     limit: 30,
 };
diff --git a/src/pages/Customer/composables/__tests__/getAddresses.spec.js b/src/pages/Customer/composables/__tests__/getAddresses.spec.js
index 9e04a83cc..8c90bf281 100644
--- a/src/pages/Customer/composables/__tests__/getAddresses.spec.js
+++ b/src/pages/Customer/composables/__tests__/getAddresses.spec.js
@@ -17,9 +17,9 @@ describe('getAddresses', () => {
         expect(axios.get).toHaveBeenCalledWith(`Clients/${clientId}/addresses`, {
             params: {
                 filter: JSON.stringify({
-                    fields: ['nickname', 'street', 'city', 'id'],
+                    fields: ['nickname', 'street', 'city', 'id', 'isActive'],
                     where: { isActive: true },
-                    order: 'nickname ASC',
+                    order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
                 }),
             },
         });
@@ -30,4 +30,4 @@ describe('getAddresses', () => {
 
         expect(axios.get).not.toHaveBeenCalled();
     });
-});
\ No newline at end of file
+});
diff --git a/src/pages/Customer/composables/getAddresses.js b/src/pages/Customer/composables/getAddresses.js
index e65e64455..5f18530e7 100644
--- a/src/pages/Customer/composables/getAddresses.js
+++ b/src/pages/Customer/composables/getAddresses.js
@@ -1,15 +1,15 @@
 import axios from 'axios';
 
-export async function getAddresses(clientId, _filter = {}) {   
+export async function getAddresses(clientId, _filter = {}) {
     if (!clientId) return;
     const filter = {
         ..._filter,
-        fields: ['nickname', 'street', 'city', 'id'],
+        fields: ['nickname', 'street', 'city', 'id', 'isActive'],
         where: { isActive: true },
-        order: 'nickname ASC',
+        order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
     };
     const params = { filter: JSON.stringify(filter) };
     return await axios.get(`Clients/${clientId}/addresses`, {
         params,
     });
-};
\ No newline at end of file
+}
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 6e67c31ed..684ed5f59 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -656,7 +656,6 @@ onMounted(() => {
         :without-header="!editableMode"
         :with-filters="editableMode"
         :right-search="editableMode"
-        :right-search-icon="true"
         :row-click="false"
         :columns="columns"
         :beforeSaveFn="beforeSave"
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/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index 83cd562a0..f839c1f71 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -158,15 +158,10 @@ const getBadgeAttrs = (_date) => {
 
 const scrollToToday = async () => {
     await nextTick();
-    const todayCell = document.querySelector(`td[data-date="${today.toISOString()}"]`);
-    if (todayCell) {
-        todayCell.scrollIntoView({ behavior: 'smooth', block: 'center' });
-    }
-};
-
-const formatDateForAttribute = (dateValue) => {
-    if (dateValue instanceof Date) return date.formatDate(dateValue, 'YYYY-MM-DD');
-    return dateValue;
+    const todayCell = document.querySelector(
+        `td[data-date="${date.formatDate(today, 'YYYY-MM-DD')}"]`,
+    );
+    if (todayCell) todayCell.scrollIntoView({ behavior: 'smooth', block: 'center' });
 };
 
 async function updateWarehouse(warehouseFk) {
@@ -242,7 +237,7 @@ async function updateWarehouse(warehouseFk) {
                 </QTd>
             </template>
             <template #body-cell-date="{ row }">
-                <QTd @click.stop :data-date="formatDateForAttribute(row.shipped)">
+                <QTd @click.stop :data-date="row?.shipped.substring(0, 10)">
                     <QBadge
                         v-bind="getBadgeAttrs(row.shipped)"
                         class="q-ma-none"
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/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index 4b3992f21..dbb66c0ec 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -10,6 +10,7 @@ import OrderCatalogFilter from 'src/pages/Order/Card/OrderCatalogFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import { onUnmounted } from 'vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -23,16 +24,40 @@ const catalogParams = {
 const arrayData = useArrayData(dataKey, {
     url: 'Orders/CatalogFilter',
     userParams: catalogParams,
+    exprBuilder,
+    searchUrl: 'table',
 });
 const store = arrayData.store;
 const tags = ref([]);
 const itemRefs = ref({});
 
-onMounted(() => {
+onMounted(async () => {
     stateStore.rightDrawer = true;
     checkOrderConfirmation();
+
+    if (
+        arrayData.store.userParams &&
+        Object.keys(arrayData.store.userParams).some((key) => !key.startsWith('order'))
+    ) {
+        await arrayData.fetch({});
+    }
 });
 
+onUnmounted(() => {
+    arrayData.destroy();
+});
+
+function exprBuilder(param, value) {
+    switch (param) {
+        case 'categoryFk':
+        case 'typeFk':
+            return { [param]: value };
+        case 'search':
+            if (/^\d+$/.test(value)) return { 'i.id': value };
+            else return { 'i.name': { like: `%${value}%` } };
+    }
+}
+
 async function checkOrderConfirmation() {
     const response = await axios.get(`Orders/${route.params.id}`);
     if (response.data.isConfirmed === 1) {
@@ -96,6 +121,7 @@ watch(
                 :tag-value="tagValue"
                 :tags="tags"
                 :initial-catalog-params="catalogParams"
+                :arrayData
             />
         </template>
     </RightMenu>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 76e608983..d16a92017 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -24,6 +24,10 @@ const props = defineProps({
         type: Array,
         required: true,
     },
+    arrayData: {
+        type: Object,
+        required: true,
+    },
 });
 
 const { t } = useI18n();
@@ -74,17 +78,6 @@ const loadTypes = async (id) => {
     typeList.value = data;
 };
 
-function exprBuilder(param, value) {
-    switch (param) {
-        case 'categoryFk':
-        case 'typeFk':
-            return { [param]: value };
-        case 'search':
-            if (/^\d+$/.test(value)) return { 'i.id': value };
-            else return { 'i.name': { like: `%${value}%` } };
-    }
-}
-
 const applyTags = (tagInfo, params, search) => {
     if (!tagInfo || !tagInfo.values.length) {
         params.tagGroups = null;
@@ -152,9 +145,8 @@ function addOrder(value, field, params) {
         :data-key="props.dataKey"
         :hidden-tags="['filter', 'orderFk', 'orderBy']"
         :unremovable-params="['orderFk', 'orderBy']"
-        :expr-builder="exprBuilder"
         :custom-tags="['tagGroups', 'categoryFk']"
-        :redirect="false"
+        :arrayData
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'typeFk' && typeList">
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 40990f329..59ec37f98 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -155,11 +155,23 @@ onMounted(() => {
 });
 
 async function fetchClientAddress(id, formData = {}) {
-    const { data } = await axios.get(
-        `Clients/${id}/addresses?filter[order]=isActive DESC`
-    );
+    const { data } = await axios.get(`Clients/${id}/addresses`, {
+        params: {
+            filter: JSON.stringify({
+                include: [
+                    {
+                        relation: 'client',
+                        scope: {
+                            fields: ['defaultAddressFk'],
+                        },
+                    },
+                ],
+                order: ['isActive DESC'],
+            }),
+        },
+    });
     addressOptions.value = data;
-    formData.addressId = data.defaultAddressFk;
+    formData.addressId = data[0].client.defaultAddressFk;
     fetchAgencies(formData);
 }
 
@@ -167,7 +179,13 @@ async function fetchAgencies({ landed, addressId }) {
     if (!landed || !addressId) return (agencyList.value = []);
 
     const { data } = await axios.get('Agencies/landsThatDay', {
-        params: { addressFk: addressId, landed },
+        params: {
+            filter: JSON.stringify({
+                order: ['agencyMode DESC', 'agencyModeFk ASC'],
+            }),
+            addressFk: addressId,
+            landed,
+        },
     });
     agencyList.value = data;
 }
@@ -258,6 +276,7 @@ const getDateColor = (date) => {
                         </template>
                     </VnSelect>
                     <VnSelect
+                        :disable="!data.clientFk"
                         v-model="data.addressId"
                         :options="addressOptions"
                         :label="t('module.address')"
@@ -284,6 +303,9 @@ const getDateColor = (date) => {
                                         {{ scope.opt?.street }},
                                         {{ scope.opt?.city }}
                                     </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id}` }}
+                                    </QItemLabel>
                                 </QItemSection>
                             </QItem>
                         </template>
diff --git a/src/pages/Route/Agency/composables/__tests__/getAgencies.spec.js b/src/pages/Route/Agency/composables/__tests__/getAgencies.spec.js
index ccf7872cb..99966569c 100644
--- a/src/pages/Route/Agency/composables/__tests__/getAgencies.spec.js
+++ b/src/pages/Route/Agency/composables/__tests__/getAgencies.spec.js
@@ -27,14 +27,17 @@ describe('getAgencies', () => {
             landed: 'true',
         };
         const filter = {
-            fields: ['nickname', 'street', 'city', 'id'],
+            fields: ['name', 'street', 'city', 'id'],
             where: { isActive: true },
-            order: 'nickname ASC',
+            order: ['name ASC'],
         };
 
         await getAgencies(formData, null, filter);
 
-        expect(axios.get).toHaveBeenCalledWith('Agencies/getAgenciesWithWarehouse', generateParams(formData, filter));
+        expect(axios.get).toHaveBeenCalledWith(
+            'Agencies/getAgenciesWithWarehouse',
+            generateParams(formData, filter),
+        );
     });
 
     it('should not call API when formData is missing required landed field', async () => {
@@ -64,19 +67,19 @@ describe('getAgencies', () => {
     it('should return options and agency when default agency is found', async () => {
         const formData = { warehouseId: '123', addressId: '456', landed: 'true' };
         const client = { defaultAddress: { agencyModeFk: 'Agency1' } };
-        
+
         const { options, agency } = await getAgencies(formData, client);
-        
+
         expect(options).toEqual(response.data);
         expect(agency).toEqual(response.data[0]);
-      });
+    });
 
-      it('should return options and agency when client is not provided', async () => {
+    it('should return options and agency when client is not provided', async () => {
         const formData = { warehouseId: '123', addressId: '456', landed: 'true' };
-        
+
         const { options, agency } = await getAgencies(formData);
-        
+
         expect(options).toEqual(response.data);
         expect(agency).toBeNull();
-      });
+    });
 });
diff --git a/src/pages/Route/Agency/composables/getAgencies.js b/src/pages/Route/Agency/composables/getAgencies.js
index 850f87456..180ac943e 100644
--- a/src/pages/Route/Agency/composables/getAgencies.js
+++ b/src/pages/Route/Agency/composables/getAgencies.js
@@ -1,14 +1,14 @@
 import axios from 'axios';
-import agency from 'src/router/modules/agency';
 
 export async function getAgencies(formData, client, _filter = {}) {
     if (!formData.warehouseId || !formData.addressId || !formData.landed) return;
-    
+
     const filter = {
-        ..._filter
+        ..._filter,
+        order: ['name ASC'],
     };
 
-    let defaultAgency = null;
+    let agency = null;
     let params = {
         filter: JSON.stringify(filter),
         warehouseFk: formData.warehouseId,
@@ -16,11 +16,15 @@ export async function getAgencies(formData, client, _filter = {}) {
         landed: formData.landed,
     };
 
-    const { data } = await axios.get('Agencies/getAgenciesWithWarehouse', { params });
+    const { data: options } = await axios.get('Agencies/getAgenciesWithWarehouse', {
+        params,
+    });
 
-    if(data && client) {
-        defaultAgency = data.find((agency) => agency.agencyModeFk === client.defaultAddress.agencyModeFk );
-    };
-    
-    return {options: data, agency: defaultAgency}
+    if (options && client) {
+        agency = options.find(
+            ({ agencyModeFk }) => agencyModeFk === client.defaultAddress.agencyModeFk,
+        );
+    }
+
+    return { options, agency };
 }
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/Route/Vehicle/Card/VehicleSummary.vue b/src/pages/Route/Vehicle/Card/VehicleSummary.vue
index 981870cb2..e4b0a9497 100644
--- a/src/pages/Route/Vehicle/Card/VehicleSummary.vue
+++ b/src/pages/Route/Vehicle/Card/VehicleSummary.vue
@@ -22,7 +22,12 @@ const links = {
 };
 </script>
 <template>
-    <CardSummary data-key="Vehicle" :url="`Vehicles/${entityId}`" :filter="VehicleFilter">
+    <CardSummary
+        data-key="Vehicle"
+        :url="`Vehicles/${entityId}`"
+        module-name="Vehicle"
+        :filter="VehicleFilter"
+    >
         <template #header="{ entity }">
             <div>{{ entity.id }} - {{ entity.numberPlate }}</div>
         </template>
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/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 f8084ff2f..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');
@@ -105,6 +104,9 @@ const columns = computed(() => [
         name: 'created',
         align: 'left',
         cardVisible: true,
+        columnFilter: {
+            component: 'date',
+        },
         format: (row) => toDateTimeFormat(row.created),
     },
     {
@@ -201,7 +203,7 @@ const getExpeditionState = async (expedition) => {
 
 const openGrafana = (expeditionFk) => {
     useOpenURL(
-        `https://grafana.verdnatura.es/d/de1njb6p5answd/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}`
+        `https://grafana.verdnatura.es/d/de1njb6p5answd/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}`,
     );
 };
 
@@ -287,7 +289,7 @@ onMounted(async () => {
                         openConfirmationModal(
                             '',
                             t('expedition.removeExpeditionSubtitle'),
-                            deleteExpedition
+                            deleteExpedition,
                         )
                     "
                 >
@@ -302,7 +304,6 @@ onMounted(async () => {
         url="Expeditions/filter"
         search-url="expeditions"
         :columns="columns"
-        :filter="expeditionsFilter"
         v-model:selected="selectedRows"
         :table="{
             'row-key': 'id',
@@ -316,11 +317,14 @@ onMounted(async () => {
                         return { id: value };
                     case 'packageItemName':
                         return { packagingItemFk: value };
+                    case 'created':
+                        return { 'e.created': { gte: value } };
                 }
             }
         "
         :redirect="false"
         order="created DESC"
+        :filter="expeditionsFilter"
     >
         <template #column-freightItemName="{ row }">
             <span class="link" @click.stop>
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 6ce69a6aa..1bd1548a4 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -121,6 +121,50 @@ async function handleSave() {
         isSaving.value = false;
     }
 }
+function validateFields(item) {
+    // Only validate fields that are being updated
+    const shouldExist = (field) => !isUpdate || field in item;
+
+    if (!shouldExist('ticketServiceTypeFk') && !item.ticketServiceTypeFk) {
+        notify('Description is required', 'negative');
+        return false;
+    }
+
+    if (!shouldExist('quantity') && (!item.quantity || item.quantity <= 0)) {
+        notify('Quantity must be greater than 0', 'negative');
+        return false;
+    }
+
+    if (!shouldExist('price') && (!item.price || item.price < 0)) {
+        notify('Price must be valid', 'negative');
+        return false;
+    }
+
+    return true;
+}
+
+function beforeSave(data) {
+    const { creates = [], updates = [] } = data;
+    const validData = { creates: [], updates: [] };
+
+    // Validate creates
+    if (creates.length) {
+        for (const create of creates) {
+            create.ticketFk = route.params.id;
+            if (validateFields(create)) {
+                validData.creates.push(create);
+            }
+        }
+    }
+
+    // Validate updates
+    if (updates.length) {
+        for (const update of updates) {
+            validData.updates.push(update);
+        }
+    }
+    return validData;
+}
 </script>
 
 <template>
@@ -141,6 +185,7 @@ async function handleSave() {
         v-model:selected="selected"
         :order="['description ASC']"
         :default-remove="false"
+        :beforeSaveFn="beforeSave"
     >
         <template #moreBeforeActions>
             <QBtn
@@ -170,6 +215,7 @@ async function handleSave() {
                             option-value="id"
                             hide-selected
                             sort-by="name ASC"
+                            :required="true"
                         >
                             <template #form>
                                 <TicketCreateServiceType
@@ -185,6 +231,7 @@ async function handleSave() {
                             :label="col.label"
                             v-model.number="row.quantity"
                             type="number"
+                            :required="true"
                             min="0"
                             :info="t('service.quantityInfo')"
                         />
@@ -196,6 +243,7 @@ async function handleSave() {
                             :label="col.label"
                             v-model.number="row.price"
                             type="number"
+                            :required="true"
                             min="0"
                             @keyup.enter="handleSave"
                         />
diff --git a/src/pages/Ticket/Card/TicketTransferProxy.vue b/src/pages/Ticket/Card/TicketTransferProxy.vue
index 3f3f018df..7d5d82f85 100644
--- a/src/pages/Ticket/Card/TicketTransferProxy.vue
+++ b/src/pages/Ticket/Card/TicketTransferProxy.vue
@@ -42,7 +42,7 @@ const transferRef = ref(null);
             />
         </div>
 
-        <div v-else>
+        <div style="display: flex; flex-direction: row" v-else>
             <TicketTransfer
                 ref="transferRef"
                 :ticket="$props.ticket"
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index 71b16f878..db78094cf 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -142,7 +142,7 @@ onMounted(() => (stateStore.rightDrawer = true));
         <template #column-concept="{ row }">
             <span>{{ row.item.name }}</span>
             <span class="color-vn-label q-pl-md">{{ row.item.subName }}</span>
-            <FetchedTags :item="row.item" />
+            <FetchedTags :item="row.item" :columns="6" />
         </template>
         <template #column-volume="{ rowIndex }">
             <span>{{ packingTypeVolume?.[rowIndex]?.volume }}</span>
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 05bd14075..94b4623aa 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -456,6 +456,7 @@ watch(
             :pagination="{ rowsPerPage: 0 }"
             :no-data-label="t('globals.noResults')"
             :right-search="false"
+            :order="['futureTotalWithVat ASC']"            
             auto-load
             :disable-option="{ card: true }"
         >
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index c82c0067f..bdf75c826 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -46,7 +46,12 @@ const getGroupedStates = (data) => {
         "
         auto-load
     />
-    <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
+    <FetchData
+        url="AgencyModes"
+        :filter="{ fields: ['id', 'name'], order: ['name ASC'] }"
+        @on-fetch="(data) => (agencies = data)"
+        auto-load
+    />
     <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
@@ -74,10 +79,20 @@ const getGroupedStates = (data) => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInputDate v-model="params.from" :label="t('From')" is-outlined />
+                    <VnInputDate
+                        v-model="params.from"
+                        :label="t('From')"
+                        is-outlined
+                        data-cy="From_date"
+                    />
                 </QItemSection>
                 <QItemSection>
-                    <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
+                    <VnInputDate
+                        v-model="params.to"
+                        :label="t('To')"
+                        is-outlined
+                        data-cy="To_date"
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -241,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/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 33b841d2d..c2d8f39f3 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, onBeforeMount } from 'vue';
+import { computed, ref, onBeforeMount, watch } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
@@ -69,6 +69,8 @@ const companiesOptions = ref([]);
 const accountingOptions = ref([]);
 const amountToReturn = ref();
 const dataKey = 'TicketList';
+const filterPanelRef = ref(null);
+const formInitialData = ref({});
 
 const columns = computed(() => [
     {
@@ -119,12 +121,16 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'shipped',
+        component: 'time',
+        columnFilter: false,
         label: t('ticketList.hour'),
         format: (row) => toTimeFormat(row.shipped),
     },
     {
         align: 'left',
         name: 'zoneLanding',
+        component: 'time',
+        columnFilter: false,
         label: t('ticketList.closure'),
         format: (row, dashIfEmpty) => dashIfEmpty(toTimeFormat(row.zoneLanding)),
     },
@@ -144,9 +150,16 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'province',
+        name: 'provinceFk',
         label: t('ticketList.province'),
-        columnClass: 'expand',
+        component: 'select',
+        attrs: {
+            url: 'Provinces',
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.province),
     },
     {
         align: 'left',
@@ -180,9 +193,19 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'warehouse',
-        label: t('ticketList.warehouse'),
-        columnClass: 'expand',
+        name: 'warehouseFk',
+        label: t('globals.warehouse'),
+        component: 'select',
+        attrs: {
+            url: 'warehouses',
+            fields: ['id', 'name'],
+        },
+        format: (row) => row.warehouse,
+        columnField: {
+            component: null,
+        },
+        cardVisible: false,
+        create: false,
     },
     {
         align: 'left',
@@ -422,6 +445,22 @@ function setReference(data) {
 
     dialogData.value.value.description = newDescription;
 }
+
+watch(
+    () => route.query.table,
+    (newValue) => {
+        if (newValue) {
+            const clientId = +JSON.parse(newValue)?.clientFk;
+            if (!clientId) return;
+            formInitialData.value = {
+                clientId,
+            };
+            if (tableRef.value) tableRef.value.create.formInitialData = { clientId };
+            onClientSelected({ clientId });
+        }
+    },
+    { immediate: true },
+);
 </script>
 
 <template>
@@ -456,7 +495,7 @@ function setReference(data) {
                     urlCreate: 'Tickets/new',
                     title: t('ticketList.createTicket'),
                     onDataSaved: ({ id }) => tableRef.redirect(id),
-                    formInitialData: { clientId: null },
+                    formInitialData,
                 }"
                 default-mode="table"
                 :columns="columns"
@@ -538,11 +577,9 @@ function setReference(data) {
                             :label="t('ticketList.client')"
                             v-model="data.clientId"
                             :options="clientsOptions"
-                            option-value="id"
-                            option-label="name"
                             hide-selected
                             required
-                            @update:model-value="(client) => onClientSelected(data)"
+                            @update:model-value="() => onClientSelected(data)"
                             :sort-by="'id ASC'"
                         >
                             <template #option="scope">
@@ -564,7 +601,6 @@ function setReference(data) {
                             :label="t('basicData.address')"
                             v-model="data.addressId"
                             :options="addressesOptions"
-                            option-value="id"
                             option-label="nickname"
                             hide-selected
                             map-options
@@ -610,6 +646,9 @@ function setReference(data) {
                                                 {{ scope.opt?.city }}
                                             </span>
                                         </QItemLabel>
+                                        <QItemLabel caption>
+                                            {{ `#${scope.opt?.id}` }}
+                                        </QItemLabel>
                                     </QItemSection>
                                 </QItem>
                             </template>
@@ -633,8 +672,6 @@ function setReference(data) {
                                 :label="t('globals.warehouse')"
                                 v-model="data.warehouseId"
                                 :options="warehousesOptions"
-                                option-value="id"
-                                option-label="name"
                                 hide-selected
                                 required
                                 @update:model-value="() => fetchAvailableAgencies(data)"
@@ -694,7 +731,6 @@ function setReference(data) {
                         :label="t('ticketList.company')"
                         v-model="dialogData.companyFk"
                         :options="companiesOptions"
-                        option-value="id"
                         option-label="code"
                         hide-selected
                     >
@@ -705,7 +741,6 @@ function setReference(data) {
                         :label="t('ticketList.bank')"
                         v-model="dialogData.bankFk"
                         :options="accountingOptions"
-                        option-value="id"
                         option-label="bank"
                         hide-selected
                         @update:model-value="setReference"
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/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index 56a9548c6..a78983e5c 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import FetchData from 'components/FetchData.vue';
diff --git a/src/pages/Worker/Card/WorkerCalendarItem.vue b/src/pages/Worker/Card/WorkerCalendarItem.vue
index 893a81c6d..86d227ad3 100644
--- a/src/pages/Worker/Card/WorkerCalendarItem.vue
+++ b/src/pages/Worker/Card/WorkerCalendarItem.vue
@@ -79,7 +79,7 @@ const editEvent = async (event) => {
     };
     const { data } = await axios.patch(
         `Workers/${route.params.id}/updateAbsence`,
-        params
+        params,
     );
 
     if (data) emit('refresh');
@@ -108,14 +108,14 @@ const handleDateSelected = (date) => {
     if (!event) createEvent(_date);
 };
 
-const handleEventSelected = (event, { year, month, day }) => {
+const handleEventSelected = async (event, { year, month, day }) => {
     if (!props.absenceType) {
         notify(t('Choose an absence type from the right menu'), 'warning');
         return;
     }
 
     const date = new Date(year, month - 1, day);
-    if (!event?.absenceId) createEvent(date);
+    if (!event?.absenceId) await createEvent(date);
     else if (event.type == props.absenceType.code) deleteEvent(event, date);
     else editEvent(event);
 };
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/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/stores/useStateStore.js b/src/stores/useStateStore.js
index e48b67279..ca447bc11 100644
--- a/src/stores/useStateStore.js
+++ b/src/stores/useStateStore.js
@@ -7,7 +7,11 @@ export const useStateStore = defineStore('stateStore', () => {
     const rightDrawer = ref(false);
     const rightAdvancedDrawer = ref(false);
     const subToolbar = ref(false);
+    const cardDescriptor = ref(null);
 
+    function cardDescriptorChangeValue(descriptor) {
+        cardDescriptor.value = descriptor;
+    }
     function toggleLeftDrawer() {
         leftDrawer.value = !leftDrawer.value;
     }
@@ -49,6 +53,8 @@ export const useStateStore = defineStore('stateStore', () => {
     }
 
     return {
+        cardDescriptor,
+        cardDescriptorChangeValue,
         leftDrawer,
         rightDrawer,
         rightAdvancedDrawer,
diff --git a/test/cypress/integration/client/clientAddress.spec.js b/test/cypress/integration/client/clientAddress.spec.js
index 8673c9083..5d82aa4bc 100644
--- a/test/cypress/integration/client/clientAddress.spec.js
+++ b/test/cypress/integration/client/clientAddress.spec.js
@@ -17,7 +17,7 @@ describe('Client consignee', () => {
             const addressName = 'test';
             cy.dataCy('Consignee_input').type(addressName);
             cy.dataCy('Location_select').click();
-            cy.get('[role="listbox"] .q-item:nth-child(1)').click();
+            cy.getOption();
             cy.dataCy('Street address_input').type('TEST ADDRESS');
             cy.get('.q-btn-group > .q-btn--standard').click();
             cy.location('href').should('contain', '#/customer/1107/address');
diff --git a/test/cypress/integration/entry/entryList.spec.js b/test/cypress/integration/entry/entryList.spec.js
index 578d8b0cf..4c4c4f004 100644
--- a/test/cypress/integration/entry/entryList.spec.js
+++ b/test/cypress/integration/entry/entryList.spec.js
@@ -1,4 +1,4 @@
-describe.skip('Entry', () => {
+describe('Entry', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('buyer');
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
index b282a19a5..91e0d507e 100644
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -16,9 +16,9 @@ describe('EntryStockBought', () => {
         cy.get('input[aria-label="Reserve"]').type('1');
         cy.get('input[aria-label="Date"]').eq(1).clear();
         cy.get('input[aria-label="Date"]').eq(1).type('01-01');
-        cy.get('input[aria-label="Buyer"]').type('buyerBossNick');
+        cy.get('input[aria-label="Buyer"]').type('itNick');
         cy.get('div[role="listbox"] > div > div[role="option"]')
-            .eq(0)
+            .eq(1)
             .should('be.visible')
             .click();
 
diff --git a/test/cypress/integration/route/vehicle/vehicleList.spec.js b/test/cypress/integration/route/vehicle/vehicleList.spec.js
new file mode 100644
index 000000000..2b3c9cdbc
--- /dev/null
+++ b/test/cypress/integration/route/vehicle/vehicleList.spec.js
@@ -0,0 +1,59 @@
+describe('Vehicle list', () => {
+    const selectors = {
+        saveFormBtn: 'FormModelPopup_save',
+        summaryPopupBtn: 'tr:last-child > .q-table--col-auto-width > .q-btn',
+        summaryGoToSummaryBtn: '.header > .q-icon',
+        summaryHeader: '.summaryHeader > div',
+        numberPlate: 'tr:last-child > [data-col-field="numberPlate"] > .no-padding',
+    };
+
+    const data = {
+        'Nº Plate': { val: '9465-LPA' },
+        'Trade Mark': { val: 'WAYNE INDUSTRIES' },
+        Model: { val: 'BATREMOLQUE' },
+        Type: { val: 'remolque', type: 'select' },
+        Warehouse: { val: 'Warehouse One', type: 'select' },
+        Country: { val: 'Portugal', type: 'select' },
+        Description: { val: 'Exclusive for batpod transport' },
+    };
+
+    const expected = data['Nº Plate'].val;
+    const summaryUrl = '/summary';
+
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/route/vehicle/list`);
+        cy.typeSearchbar('{enter}');
+    });
+
+    it('should list vehicles', () => {
+        cy.get('.q-table')
+            .children()
+            .should('be.visible')
+            .should('have.length.greaterThan', 0);
+    });
+
+    it('Should add new vehicle', () => {
+        cy.addBtnClick();
+        cy.fillInForm(data);
+        cy.dataCy(selectors.saveFormBtn).should('be.visible').click();
+
+        cy.checkNotification('Data created');
+        cy.get(selectors.summaryHeader).should('contain', expected);
+        cy.url().should('include', summaryUrl);
+    });
+
+    it('should open summary by clicking a vehicle', () => {
+        cy.get(selectors.numberPlate).click();
+        cy.get(selectors.summaryHeader).should('contain', expected);
+        cy.url().should('include', summaryUrl);
+    });
+
+    it('should redirect to vehicle summary when click summary icon on summary pop-up', () => {
+        cy.get(selectors.summaryPopupBtn).click();
+        cy.get(selectors.summaryHeader).should('contain', expected);
+        cy.get(selectors.summaryGoToSummaryBtn).click();
+        cy.url().should('include', summaryUrl);
+    });
+});
diff --git a/test/cypress/integration/ticket/ticketFilter.spec.js b/test/cypress/integration/ticket/ticketFilter.spec.js
new file mode 100644
index 000000000..2e5a3f3ce
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketFilter.spec.js
@@ -0,0 +1,15 @@
+/// <reference types="cypress" />
+describe('TicketFilter', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/list');
+    });
+
+    it('use search button', function () {
+        cy.waitForElement('.q-page');
+        cy.get('[data-cy="Customer ID_input"]').type('1105');
+        cy.searchBtnFilterPanel();
+        cy.location('href').should('contain', '#/ticket/15/summary');
+    });
+});
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index b96f44a0c..ef17eda7b 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
-describe.skip('TicketList', () => {
-    const firstRow = 'tbody > :nth-child(1)';
+describe('TicketList', () => {
+    const firstRow = 'tbody.q-virtual-scroll__content tr:nth-child(1)';
 
     beforeEach(() => {
         cy.login('developer');
@@ -9,15 +9,14 @@ describe.skip('TicketList', () => {
     });
 
     const searchResults = (search) => {
-        cy.dataCy('vn-searchbar').find('input').focus();
-        if (search) cy.dataCy('vn-searchbar').find('input').type(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();
     });
@@ -27,7 +26,7 @@ describe.skip('TicketList', () => {
         cy.window().then((win) => {
             cy.stub(win, 'open').as('windowOpen');
         });
-        cy.get(firstRow).find('.q-btn:first').click();
+        cy.get(firstRow).should('be.visible').find('.q-btn:first').click();
         cy.get('@windowOpen').should('be.calledWithMatch', /\/ticket\/\d+\/sale/);
     });
 
@@ -38,6 +37,21 @@ describe.skip('TicketList', () => {
         cy.get('.summaryBody').should('exist');
     });
 
+    it('filter client and create ticket', () => {
+        cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketSearchbar');
+        searchResults();
+
+        cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketFilter');
+        cy.dataCy('Customer ID_input').clear('1');
+        cy.dataCy('Customer ID_input').type('1101{enter}');
+
+        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();
+
+        cy.getOption().click();
+        cy.dataCy('Address_select').should('have.value', 'Bruce Wayne');
+    });
     it('Client list create new client', () => {
         cy.dataCy('vnTableCreateBtn').should('exist');
         cy.dataCy('vnTableCreateBtn').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/UserPanel.spec.js b/test/cypress/integration/vnComponent/UserPanel.spec.js
index e83d07954..25724e873 100644
--- a/test/cypress/integration/vnComponent/UserPanel.spec.js
+++ b/test/cypress/integration/vnComponent/UserPanel.spec.js
@@ -18,7 +18,7 @@ describe('UserPanel', () => {
         cy.get(userWarehouse).should('have.value', 'VNL').click();
 
         // Actualizo la opción
-        getOption(3);
+        cy.getOption(3);
 
         //Compruebo la notificación
         cy.get('.q-notification').should('be.visible');
@@ -26,7 +26,7 @@ describe('UserPanel', () => {
 
         //Restauro el valor
         cy.get(userWarehouse).click();
-        getOption(2);
+        cy.getOption(2);
     });
     it('should notify when update user company', () => {
         const userCompany =
@@ -39,7 +39,7 @@ describe('UserPanel', () => {
         cy.get(userCompany).should('have.value', 'Warehouse One').click();
 
         //Actualizo la opción
-        getOption(2);
+        cy.getOption(2);
 
         //Compruebo la notificación
         cy.get('.q-notification').should('be.visible');
@@ -47,12 +47,6 @@ describe('UserPanel', () => {
 
         //Restauro el valor
         cy.get(userCompany).click();
-        getOption(1);
+        cy.getOption(1);
     });
 });
-
-function getOption(index) {
-    cy.waitForElement('[role="listbox"]');
-    const option = `[role="listbox"] .q-item:nth-child(${index})`;
-    cy.get(option).click();
-}
diff --git a/test/cypress/integration/vnComponent/VnLocation.spec.js b/test/cypress/integration/vnComponent/VnLocation.spec.js
index 986cbcaaf..ee49d6065 100644
--- a/test/cypress/integration/vnComponent/VnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/VnLocation.spec.js
@@ -88,7 +88,7 @@ describe('VnLocation', () => {
             cy.get(
                 firstOption.concat(' > .q-item__section > .q-item__label--caption'),
             ).should('have.text', postCodeLabel);
-            cy.get(firstOption).click();
+            cy.getOption();
             cy.get('.q-btn-group > .q-btn--standard > .q-btn__content > .q-icon').click();
             cy.reload();
             cy.waitForElement('.q-form');
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 0e366053c..8437112e0 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -399,6 +399,22 @@ Cypress.Commands.add('clickButtonWithIcon', (iconClass) => {
             cy.wrap($btn).click();
         });
 });
+
 Cypress.Commands.add('clickButtonWithText', (buttonText) => {
     cy.get('.q-btn').contains(buttonText).click();
 });
+
+Cypress.Commands.add('getOption', (index = 1) => {
+    cy.waitForElement('[role="listbox"]');
+    cy.get(`[role="listbox"] .q-item:nth-child(${index})`).click();
+});
+
+Cypress.Commands.add('searchBtnFilterPanel', () => {
+    cy.get(
+        '.q-scrollarea__content > .q-btn--standard > .q-btn__content > .q-icon',
+    ).click();
+});
+
+Cypress.Commands.add('waitRequest', (alias, cb) => {
+    cy.wait(alias).then(cb);
+});