diff --git a/cypress.config.js b/cypress.config.js
index a9e27fcfd..26b7725a5 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -34,6 +34,17 @@ export default defineConfig({
             const plugin = await import('cypress-mochawesome-reporter/plugin');
             plugin.default(on);
 
+            const fs = await import('fs');
+            on('task', {
+                deleteFile(filePath) {
+                    if (fs.existsSync(filePath)) {
+                        fs.unlinkSync(filePath);
+                        return true;
+                    }
+                    return false;
+                },
+            });
+
             return config;
         },
         viewportWidth: 1280,
diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js
index cb31391b3..182c51e47 100644
--- a/src/boot/qformMixin.js
+++ b/src/boot/qformMixin.js
@@ -30,22 +30,5 @@ export default {
         } catch (error) {
             console.error(error);
         }
-        form.addEventListener('keyup', function (evt) {
-            if (evt.key === 'Enter' && !that.$attrs['prevent-submit']) {
-                const input = evt.target;
-                if (input.type == 'textarea' && evt.shiftKey) {
-                    evt.preventDefault();
-                    let { selectionStart, selectionEnd } = input;
-                    input.value =
-                        input.value.substring(0, selectionStart) +
-                        '\n' +
-                        input.value.substring(selectionEnd);
-                    selectionStart = selectionEnd = selectionStart + 1;
-                    return;
-                }
-                evt.preventDefault();
-                that.onSubmit();
-            }
-        });
     },
 };
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 633f1254d..04ef13d45 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { onMounted, onUnmounted, computed, ref, watch, nextTick } from 'vue';
+import { onMounted, onUnmounted, computed, ref, watch, nextTick, useAttrs } from 'vue';
 import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -22,6 +22,7 @@ const { validate } = useValidator();
 const { notify } = useNotify();
 const route = useRoute();
 const myForm = ref(null);
+const attrs = useAttrs();
 const $props = defineProps({
     url: {
         type: String,
@@ -113,7 +114,7 @@ const defaultButtons = computed(() => ({
         color: 'primary',
         icon: 'save',
         label: 'globals.save',
-        click: () => myForm.value.onSubmit(false),
+        click: async () => await save(),
         type: 'submit',
     },
     reset: {
@@ -208,8 +209,7 @@ async function fetch() {
     }
 }
 
-async function save(prevent = false) {
-    if (prevent) return;
+async function save() {
     if ($props.observeFormChanges && !hasChanges.value)
         return notify('globals.noChanges', 'negative');
 
@@ -247,6 +247,7 @@ async function saveAndGo() {
 }
 
 function reset() {
+    formData.value = JSON.parse(JSON.stringify(originalData.value));
     updateAndEmit('onFetch', { val: originalData.value });
     if ($props.observeFormChanges) {
         hasChanges.value = false;
@@ -284,6 +285,22 @@ function trimData(data) {
     return data;
 }
 
+async function onKeyup(evt) {
+    if (evt.key === 'Enter' && !('prevent-submit' in attrs)) {
+        const input = evt.target;
+        if (input.type == 'textarea' && evt.shiftKey) {
+            let { selectionStart, selectionEnd } = input;
+            input.value =
+                input.value.substring(0, selectionStart) +
+                '\n' +
+                input.value.substring(selectionEnd);
+            selectionStart = selectionEnd = selectionStart + 1;
+            return;
+        }
+        await save();
+    }
+}
+
 defineExpose({
     save,
     isLoading,
@@ -298,12 +315,12 @@ defineExpose({
         <QForm
             ref="myForm"
             v-if="formData"
-            @submit="save(!!$event)"
+            @submit.prevent
+            @keyup.prevent="onKeyup"
             @reset="reset"
             class="q-pa-md"
             :style="maxWidth ? 'max-width: ' + maxWidth : ''"
             id="formModel"
-            :prevent-submit="$attrs['prevent-submit']"
         >
             <QCard>
                 <slot
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index 98b611743..672eeff7a 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -27,10 +27,15 @@ const formModelRef = ref(null);
 const closeButton = ref(null);
 const isSaveAndContinue = ref(false);
 const onDataSaved = (formData, requestResponse) => {
-    if (closeButton.value && isSaveAndContinue) closeButton.value.click();
+    if (closeButton.value && !isSaveAndContinue.value) closeButton.value.click();
     emit('onDataSaved', formData, requestResponse);
 };
 
+const onClick = async (saveAndContinue) => {
+    isSaveAndContinue.value = saveAndContinue;
+    await formModelRef.value.save();
+};
+
 const isLoading = computed(() => formModelRef.value?.isLoading);
 const reset = computed(() => formModelRef.value?.reset);
 
@@ -78,10 +83,7 @@ defineExpose({
                     :flat="showSaveAndContinueBtn"
                     :label="t('globals.save')"
                     :title="t('globals.save')"
-                    @click="
-                        formModelRef.save();
-                        isSaveAndContinue = false;
-                    "
+                    @click="onClick(false)"
                     color="primary"
                     class="q-ml-sm"
                     :disabled="isLoading"
@@ -99,10 +101,7 @@ defineExpose({
                     :loading="isLoading"
                     data-cy="FormModelPopup_isSaveAndContinue"
                     z-max
-                    @click="
-                        isSaveAndContinue = true;
-                        formModelRef.save();
-                    "
+                    @click="onClick(true)"
                 />
             </div>
         </template>
diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index 44364cca1..d0e245388 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { markRaw, computed } from 'vue';
-import { QIcon, QCheckbox, QToggle } from 'quasar';
+import { QIcon, QToggle } from 'quasar';
 import { dashIfEmpty } from 'src/filters';
 
 import VnSelect from 'components/common/VnSelect.vue';
diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index 2dad8fe52..0de3834ea 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -152,7 +152,7 @@ const onTabPressed = async () => {
 };
 </script>
 <template>
-    <div v-if="showFilter" class="full-width flex-center" style="overflow: hidden">
+    <div v-if="showFilter" class="full-width" style="overflow: hidden">
         <VnColumn
             :column="$props.column"
             default="input"
diff --git a/src/components/VnTable/VnOrder.vue b/src/components/VnTable/VnOrder.vue
index e3795cc4b..47ed9acf4 100644
--- a/src/components/VnTable/VnOrder.vue
+++ b/src/components/VnTable/VnOrder.vue
@@ -23,6 +23,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    align: {
+        type: String,
+        default: 'end',
+    },
 });
 const hover = ref();
 const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
@@ -46,16 +50,27 @@ async function orderBy(name, direction) {
 }
 
 defineExpose({ orderBy });
+
+function textAlignToFlex(textAlign) {
+    return `justify-content: ${
+        {
+            'text-center': 'center',
+            'text-left': 'start',
+            'text-right': 'end',
+        }[textAlign] || 'start'
+    };`;
+}
 </script>
 <template>
     <div
         @mouseenter="hover = true"
         @mouseleave="hover = false"
         @click="orderBy(name, model?.direction)"
-        class="row items-center no-wrap cursor-pointer title"
+        class="items-center no-wrap cursor-pointer title"
+        :style="textAlignToFlex(align)"
     >
         <span :title="label">{{ label }}</span>
-        <sup v-if="name && model?.index">
+        <div v-if="name && model?.index">
             <QChip
                 :label="!vertical ? model?.index : ''"
                 :icon="
@@ -92,20 +107,16 @@ defineExpose({ orderBy });
                     />
                 </div>
             </QChip>
-        </sup>
+        </div>
     </div>
 </template>
 <style lang="scss" scoped>
 .title {
     display: flex;
-    justify-content: center;
     align-items: center;
     height: 30px;
     width: 100%;
     color: var(--vn-label-color);
-}
-sup {
-    vertical-align: super; /* Valor predeterminado */
-    /* También puedes usar otros valores como "baseline", "top", "text-top", etc. */
+    white-space: nowrap;
 }
 </style>
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index e11db4c0b..fe4806193 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -10,14 +10,15 @@ import {
     render,
     inject,
     useAttrs,
+    nextTick,
 } from 'vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-import { useQuasar } from 'quasar';
+import { useQuasar, date } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
 import { useFilterParams } from 'src/composables/useFilterParams';
-import { dashIfEmpty } from 'src/filters';
+import { dashIfEmpty, toDate } from 'src/filters';
 
 import CrudModel from 'src/components/CrudModel.vue';
 import FormModelPopup from 'components/FormModelPopup.vue';
@@ -164,7 +165,6 @@ const app = inject('app');
 const editingRow = ref(null);
 const editingField = ref(null);
 const isTableMode = computed(() => mode.value == TABLE_MODE);
-const showRightIcon = computed(() => $props.rightSearch || $props.rightSearchIcon);
 const selectRegex = /select/;
 const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
 const tableModes = [
@@ -345,7 +345,7 @@ const clickHandler = async (event) => {
     if (isDateElement || isTimeElement || isQselectDropDown) return;
 
     if (clickedElement === null) {
-        destroyInput(editingRow.value, editingField.value);
+        await destroyInput(editingRow.value, editingField.value);
         return;
     }
     const rowIndex = clickedElement.getAttribute('data-row-index');
@@ -355,7 +355,7 @@ const clickHandler = async (event) => {
     if (editingRow.value !== null && editingField.value !== null) {
         if (editingRow.value == rowIndex && editingField.value == colField) return;
 
-        destroyInput(editingRow.value, editingField.value);
+        await destroyInput(editingRow.value, editingField.value);
     }
 
     if (isEditableColumn(column)) {
@@ -365,7 +365,7 @@ const clickHandler = async (event) => {
 
 async function handleTabKey(event, rowIndex, colField) {
     if (editingRow.value == rowIndex && editingField.value == colField)
-        destroyInput(editingRow.value, editingField.value);
+        await destroyInput(editingRow.value, editingField.value);
 
     const direction = event.shiftKey ? -1 : 1;
     const { nextRowIndex, nextColumnName } = await handleTabNavigation(
@@ -425,7 +425,8 @@ async function renderInput(rowId, field, clickedElement) {
                 await column?.cellEvent?.['update:modelValue']?.(value, oldValue, row);
             },
             keyup: async (event) => {
-                if (event.key === 'Enter') handleBlur(rowId, field, clickedElement);
+                if (event.key === 'Enter')
+                    await destroyInput(rowIndex, field, clickedElement);
             },
             keydown: async (event) => {
                 switch (event.key) {
@@ -434,7 +435,7 @@ async function renderInput(rowId, field, clickedElement) {
                         event.stopPropagation();
                         break;
                     case 'Escape':
-                        destroyInput(rowId, field, clickedElement);
+                        await destroyInput(rowId, field, clickedElement);
                         break;
                     default:
                         break;
@@ -456,12 +457,13 @@ async function renderInput(rowId, field, clickedElement) {
         node.el?.querySelector('span > div > div').focus();
 }
 
-function destroyInput(rowIndex, field, clickedElement) {
+async function destroyInput(rowIndex, field, clickedElement) {
     if (!clickedElement)
         clickedElement = document.querySelector(
             `[data-row-index="${rowIndex}"][data-col-field="${field}"]`,
         );
     if (clickedElement) {
+        await nextTick();
         render(null, clickedElement);
         Array.from(clickedElement.childNodes).forEach((child) => {
             child.style.visibility = 'visible';
@@ -473,10 +475,6 @@ function destroyInput(rowIndex, field, clickedElement) {
     editingField.value = null;
 }
 
-function handleBlur(rowIndex, field, clickedElement) {
-    destroyInput(rowIndex, field, clickedElement);
-}
-
 async function handleTabNavigation(rowIndex, colName, direction) {
     const columns = $props.columns;
     const totalColumns = columns.length;
@@ -521,17 +519,41 @@ function getToggleIcon(value) {
 }
 
 function formatColumnValue(col, row, dashIfEmpty) {
-    if (col?.format) {
+    if (col?.format || row[col?.name + 'TextValue']) {
         if (selectRegex.test(col?.component) && row[col?.name + 'TextValue']) {
             return dashIfEmpty(row[col?.name + 'TextValue']);
         } else {
             return col.format(row, dashIfEmpty);
         }
-    } else {
-        return dashIfEmpty(row[col?.name]);
     }
+
+    if (col?.component === 'date') return dashIfEmpty(toDate(row[col?.name]));
+
+    if (col?.component === 'time')
+        return row[col?.name] >= 5
+            ? dashIfEmpty(date.formatDate(new Date(row[col?.name]), 'HH:mm'))
+            : row[col?.name];
+
+    if (selectRegex.test(col?.component) && $props.isEditable) {
+        const { find, url } = col.attrs;
+        const urlRelation = url?.charAt(0)?.toLocaleLowerCase() + url?.slice(1, -1);
+
+        if (col?.attrs.options) {
+            const find = col?.attrs.options.find((option) => option.id === row[col.name]);
+            if (!col.attrs?.optionLabel || !find) return dashIfEmpty(row[col?.name]);
+            return dashIfEmpty(find[col.attrs?.optionLabel ?? 'name']);
+        }
+
+        if (typeof row[urlRelation] == 'object') {
+            if (typeof find == 'object')
+                return dashIfEmpty(row[urlRelation][find?.label ?? 'name']);
+
+            return dashIfEmpty(row[urlRelation][col?.attrs.optionLabel ?? 'name']);
+        }
+        if (typeof row[urlRelation] == 'string') return dashIfEmpty(row[urlRelation]);
+    }
+    return dashIfEmpty(row[col?.name]);
 }
-const checkbox = ref(null);
 function cardClick(_, row) {
     if ($props.redirect) router.push({ path: `/${$props.redirect}/${row.id}` });
 }
@@ -618,14 +640,6 @@ function cardClick(_, row) {
                         dense
                         :options="tableModes.filter((mode) => !mode.disable)"
                     />
-
-                    <QBtn
-                        v-if="showRightIcon"
-                        icon="filter_alt"
-                        class="bg-vn-section-color q-ml-sm"
-                        dense
-                        @click="stateStore.toggleRightDrawer()"
-                    />
                 </template>
                 <template #header-cell="{ col }">
                     <QTh
@@ -633,15 +647,14 @@ function cardClick(_, row) {
                         v-bind:class="col.headerClass"
                         class="body-cell"
                         :style="col?.width ? `max-width: ${col?.width}` : ''"
-                        style="padding: inherit"
                     >
                         <div
                             class="no-padding"
-                            :style="
-                                withFilters && $props.columnSearch ? 'height: 75px' : ''
-                            "
+                            :style="[
+                                withFilters && $props.columnSearch ? 'height: 75px' : '',
+                            ]"
                         >
-                            <div class="text-center" style="height: 30px">
+                            <div style="height: 30px">
                                 <QTooltip v-if="col.toolTip">{{ col.toolTip }}</QTooltip>
                                 <VnTableOrder
                                     v-model="orders[col.orderBy ?? col.name]"
@@ -649,6 +662,7 @@ function cardClick(_, row) {
                                     :label="col?.labelAbbreviation ?? col?.label"
                                     :data-key="$attrs['data-key']"
                                     :search-url="searchUrl"
+                                    :align="getColAlign(col)"
                                 />
                             </div>
                             <VnFilter
@@ -730,7 +744,11 @@ function cardClick(_, row) {
                                 <span
                                     v-else
                                     :class="hasEditableFormat(col)"
-                                    :style="col?.style ? col.style(row) : null"
+                                    :style="
+                                        typeof col?.style == 'function'
+                                            ? col.style(row)
+                                            : col?.style
+                                    "
                                     style="bottom: 0"
                                 >
                                     {{ formatColumnValue(col, row, dashIfEmpty) }}
@@ -783,7 +801,7 @@ function cardClick(_, row) {
                             <QCardSection
                                 vertical
                                 class="no-margin no-padding"
-                                :class="colsMap.tableActions ? '' : 'fit'"
+                                :class="colsMap.tableActions ? 'w-80' : 'fit'"
                             >
                                 <!-- Chips -->
                                 <QCardSection
@@ -1026,8 +1044,8 @@ es:
 }
 
 .body-cell {
-    padding-left: 2px !important;
-    padding-right: 2px !important;
+    padding-left: 4px !important;
+    padding-right: 4px !important;
     position: relative;
 }
 .bg-chip-secondary {
diff --git a/src/components/common/VnComponent.vue b/src/components/common/VnComponent.vue
index d9d1ea26b..a9e1c8cff 100644
--- a/src/components/common/VnComponent.vue
+++ b/src/components/common/VnComponent.vue
@@ -48,7 +48,8 @@ function toValueAttrs(attrs) {
     <span
         v-for="toComponent of componentArray"
         :key="toComponent.name"
-        class="column flex-center fit"
+        class="column fit"
+        :class="toComponent?.component == 'checkbox' ? 'flex-center' : ''"
     >
         <component
             v-if="toComponent?.component"
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 73c825e1e..1f4705faa 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -107,6 +107,7 @@ const manageDate = (date) => {
             @click="isPopupOpen = !isPopupOpen"
             @keydown="isPopupOpen = false"
             hide-bottom-space
+            :data-cy="$attrs.dataCy ?? $attrs.label + '_inputDate'"
         >
             <template #append>
                 <QIcon
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index e6e7e6fa0..6f122ecd2 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -193,22 +193,24 @@ const toModule = computed(() =>
                         </div>
                     </QItemLabel>
                     <QItem>
-                        <QItemLabel class="subtitle" caption>
+                        <QItemLabel class="subtitle">
                             #{{ getValueFromPath(subtitle) ?? entity.id }}
-                            <QBtn
-                                round
-                                flat
-                                dense
-                                size="sm"
-                                icon="content_copy"
-                                color="primary"
-                                @click.stop="copyIdText(entity.id)"
-                            >
-                                <QTooltip>
-                                    {{ t('globals.copyId') }}
-                                </QTooltip>
-                            </QBtn>
                         </QItemLabel>
+
+                        <QBtn
+                            round
+                            flat
+                            dense
+                            size="sm"
+                            icon="content_copy"
+                            color="primary"
+                            @click.stop="copyIdText(entity.id)"
+                        >
+                            <QTooltip>
+                                {{ t('globals.copyId') }}
+                            </QTooltip>
+                        </QBtn>
+                        <!-- </QItemLabel> -->
                     </QItem>
                 </QList>
                 <div class="list-box q-mt-xs">
diff --git a/src/composables/getColAlign.js b/src/composables/getColAlign.js
index c0338a984..a930fd7d8 100644
--- a/src/composables/getColAlign.js
+++ b/src/composables/getColAlign.js
@@ -1,13 +1,14 @@
 export function getColAlign(col) {
     let align;
     switch (col.component) {
+        case 'time':
+        case 'date':
         case 'select':
             align = 'left';
             break;
         case 'number':
             align = 'right';
             break;
-        case 'date':
         case 'checkbox':
             align = 'center';
             break;
diff --git a/src/css/app.scss b/src/css/app.scss
index 0c5dc97fa..994ae7ff1 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -335,3 +335,7 @@ input::-webkit-inner-spin-button {
     border: 1px solid;
     box-shadow: 0 4px 6px #00000000;
 }
+
+.containerShrinked {
+    width: 80%;
+}
diff --git a/src/filters/toDate.js b/src/filters/toDate.js
index 8fe8f3836..002797af5 100644
--- a/src/filters/toDate.js
+++ b/src/filters/toDate.js
@@ -3,6 +3,8 @@ import { useI18n } from 'vue-i18n';
 export default function (value, options = {}) {
     if (!value) return;
 
+    if (!isValidDate(value)) return null;
+
     if (!options.dateStyle && !options.timeStyle) {
         options.day = '2-digit';
         options.month = '2-digit';
@@ -10,7 +12,12 @@ export default function (value, options = {}) {
     }
 
     const { locale } = useI18n();
-    const date = new Date(value);
+    const newDate = new Date(value);
 
-    return new Intl.DateTimeFormat(locale.value, options).format(date);
+    return new Intl.DateTimeFormat(locale.value, options).format(newDate);
+}
+// handle 0000-00-00
+function isValidDate(date) {
+    const parsedDate = new Date(date);
+    return parsedDate instanceof Date && !isNaN(parsedDate.getTime());
 }
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index acfdefb67..9a60e9da1 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -49,6 +49,7 @@ globals:
     rowRemoved: Row removed
     pleaseWait: Please wait...
     noPinnedModules: You don't have any pinned modules
+    enterToConfirm: Press Enter to confirm
     summary:
         basicData: Basic data
     daysOnward: Days onward
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 6bf3affc0..846c442ea 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -51,6 +51,7 @@ globals:
     pleaseWait: Por favor espera...
     noPinnedModules: No has fijado ningún módulo
     split: Split
+    enterToConfirm: Pulsa Enter para confirmar
     summary:
         basicData: Datos básicos
     daysOnward: Días adelante
diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
index 7f45cd7db..8f61bac89 100644
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -114,7 +114,7 @@ function onBeforeSave(data) {
     if (isCash.value && shouldSendEmail.value && !data.email)
         return notify(t('There is no assigned email for this client'), 'negative');
 
-    data.bankFk = data.bankFk.id;
+    data.bankFk = data.bankFk?.id;
     return data;
 }
 
@@ -189,7 +189,7 @@ async function getAmountPaid() {
             :url-create="urlCreate"
             :mapper="onBeforeSave"
             @on-data-saved="onDataSaved"
-            :prevent-submit="true"
+            prevent-submit
         >
             <template #form="{ data, validate }">
                 <span ref="closeButton" class="row justify-end close-icon" v-close-popup>
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index f3b73cb04..81578c609 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -16,7 +16,6 @@ import ItemDescriptor from 'src/pages/Item/Card/ItemDescriptor.vue';
 import axios from 'axios';
 import VnSelectEnum from 'src/components/common/VnSelectEnum.vue';
 import { checkEntryLock } from 'src/composables/checkEntryLock';
-import SkeletonDescriptor from 'src/components/ui/SkeletonDescriptor.vue';
 
 const $props = defineProps({
     id: {
@@ -103,7 +102,7 @@ const columns = [
         name: 'itemFk',
         component: 'number',
         isEditable: false,
-        width: '40px',
+        width: '35px',
     },
     {
         labelAbbreviation: '',
@@ -111,7 +110,7 @@ const columns = [
         name: 'hex',
         columnSearch: false,
         isEditable: false,
-        width: '5px',
+        width: '9px',
         component: 'select',
         attrs: {
             url: 'Inks',
@@ -181,6 +180,7 @@ const columns = [
             url: 'packagings',
             fields: ['id'],
             optionLabel: 'id',
+            optionValue: 'id',
         },
         create: true,
         width: '40px',
@@ -192,7 +192,7 @@ const columns = [
         component: 'number',
         create: true,
         width: '35px',
-        format: (row, dashIfEmpty) => parseFloat(row['weight']).toFixed(1),
+        format: (row) => parseFloat(row['weight']).toFixed(1),
     },
     {
         labelAbbreviation: 'P',
@@ -330,6 +330,25 @@ const columns = [
         create: true,
         format: (row) => parseFloat(row['price3']).toFixed(2),
     },
+    {
+        align: 'center',
+        labelAbbreviation: 'CM',
+        label: t('Check min price'),
+        toolTip: t('Check min price'),
+        name: 'hasMinPrice',
+        attrs: {
+            toggleIndeterminate: false,
+        },
+        component: 'checkbox',
+        cellEvent: {
+            'update:modelValue': async (value, oldValue, row) => {
+                await axios.patch(`Items/${row['itemFk']}`, {
+                    hasMinPrice: value,
+                });
+            },
+        },
+        width: '25px',
+    },
     {
         align: 'center',
         labelAbbreviation: 'Min.',
@@ -350,25 +369,6 @@ const columns = [
         },
         format: (row) => parseFloat(row['minPrice']).toFixed(2),
     },
-    {
-        align: 'center',
-        labelAbbreviation: 'CM',
-        label: t('Check min price'),
-        toolTip: t('Check min price'),
-        name: 'hasMinPrice',
-        attrs: {
-            toggleIndeterminate: false,
-        },
-        component: 'checkbox',
-        cellEvent: {
-            'update:modelValue': async (value, oldValue, row) => {
-                await axios.patch(`Items/${row['itemFk']}`, {
-                    hasMinPrice: value,
-                });
-            },
-        },
-        width: '25px',
-    },
     {
         align: 'center',
         labelAbbreviation: t('P.Sen'),
@@ -378,6 +378,9 @@ const columns = [
         component: 'number',
         isEditable: false,
         width: '40px',
+        style: () => {
+            return { color: 'var(--vn-label-color)' };
+        },
     },
     {
         align: 'center',
@@ -417,6 +420,9 @@ const columns = [
         component: 'input',
         isEditable: false,
         width: '35px',
+        style: () => {
+            return { color: 'var(--vn-label-color)' };
+        },
     },
 ];
 
@@ -644,8 +650,8 @@ onMounted(() => {
         :is-editable="editableMode"
         :without-header="!editableMode"
         :with-filters="editableMode"
-        :right-search="false"
-        :right-search-icon="false"
+        :right-search="true"
+        :right-search-icon="true"
         :row-click="false"
         :columns="columns"
         :beforeSaveFn="beforeSave"
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index d50f6b219..3c96a2302 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -199,7 +199,6 @@ const columns = computed(() => [
             optionValue: 'code',
             optionLabel: 'description',
         },
-        cardVisible: true,
         width: '65px',
         format: (row, dashIfEmpty) => dashIfEmpty(row.entryTypeDescription),
     },
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index da8557828..4bd0fe640 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -57,7 +57,7 @@ const columns = computed(() => [
         create: true,
         component: 'number',
         summation: true,
-        width: '60px',
+        width: '50px',
     },
     {
         align: 'center',
@@ -286,7 +286,7 @@ function round(value) {
     justify-content: center;
 }
 .column {
-    min-width: 30%;
+    min-width: 40%;
     margin-top: 5%;
     display: flex;
     flex-direction: column;
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 9d382f23a..1a37994d9 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -101,7 +101,8 @@ const columns = [
 </template>
 <style lang="css" scoped>
 .container {
-    max-width: 50vw;
+    max-width: 100%;
+    width: 50%;
     overflow: auto;
     justify-content: center;
     align-items: center;
@@ -109,9 +110,6 @@ const columns = [
     background-color: var(--vn-section-color);
     padding: 2%;
 }
-.container > div > div > .q-table__top.relative-position.row.items-center {
-    background-color: red !important;
-}
 </style>
 <i18n>
     es:
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index eb72563e1..8be928134 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -103,7 +103,7 @@ const refundInvoice = async (withWarehouse) => {
         t('refundInvoiceSuccessMessage', {
             refundTicket: data[0].id,
         }),
-        'positive'
+        'positive',
     );
 };
 
@@ -124,6 +124,13 @@ const showRefundInvoiceForm = () => {
         },
     });
 };
+
+const showExportationLetter = () => {
+    openReport(`InvoiceOuts/${$props.invoiceOutData.ref}/exportation-pdf`, {
+        recipientId: $props.invoiceOutData.client.id,
+        refFk: $props.invoiceOutData.ref,
+    });
+};
 </script>
 
 <template>
@@ -156,10 +163,14 @@ const showRefundInvoiceForm = () => {
         <QMenu anchor="top end" self="top start">
             <QList>
                 <QItem v-ripple clickable @click="showSendInvoiceDialog('pdf')">
-                    <QItemSection>{{ t('Send PDF') }}</QItemSection>
+                    <QItemSection data-cy="InvoiceOutDescriptorMenuSendPdfOption">
+                        {{ t('Send PDF') }}
+                    </QItemSection>
                 </QItem>
                 <QItem v-ripple clickable @click="showSendInvoiceDialog('csv')">
-                    <QItemSection>{{ t('Send CSV') }}</QItemSection>
+                    <QItemSection data-cy="InvoiceOutDescriptorMenuSendCsvOption">
+                        {{ t('Send CSV') }}
+                    </QItemSection>
                 </QItem>
             </QList>
         </QMenu>
@@ -172,7 +183,7 @@ const showRefundInvoiceForm = () => {
                 t('Confirm deletion'),
                 t('Are you sure you want to delete this invoice?'),
                 deleteInvoice,
-                redirectToInvoiceOutList
+                redirectToInvoiceOutList,
             )
         "
     >
@@ -185,7 +196,7 @@ const showRefundInvoiceForm = () => {
             openConfirmationModal(
                 '',
                 t('Are you sure you want to book this invoice?'),
-                bookInvoice
+                bookInvoice,
             )
         "
     >
@@ -198,7 +209,7 @@ const showRefundInvoiceForm = () => {
             openConfirmationModal(
                 t('Generate PDF invoice document'),
                 t('Are you sure you want to generate/regenerate the PDF invoice?'),
-                generateInvoicePdf
+                generateInvoicePdf,
             )
         "
     >
@@ -226,6 +237,14 @@ const showRefundInvoiceForm = () => {
             {{ t('Create a single ticket with all the content of the current invoice') }}
         </QTooltip>
     </QItem>
+    <QItem
+        v-if="$props.invoiceOutData.serial === 'E'"
+        v-ripple
+        clickable
+        @click="showExportationLetter()"
+    >
+        <QItemSection>{{ t('Show CITES letter') }}</QItemSection>
+    </QItem>
 </template>
 
 <i18n>
@@ -255,7 +274,7 @@ es:
     Create a single ticket with all the content of the current invoice: Crear un ticket único con todo el contenido de la factura actual
     refundInvoiceSuccessMessage: Se ha creado el siguiente ticket de abono {refundTicket}
     The email can't be empty: El email no puede estar vacío
-
+    Show CITES letter: Ver carta CITES
 en:
     refundInvoiceSuccessMessage: The following refund ticket have been created {refundTicket}
 </i18n>
diff --git a/src/pages/InvoiceOut/InvoiceOutFilter.vue b/src/pages/InvoiceOut/InvoiceOutFilter.vue
index cdc9f037a..648b8e4e6 100644
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@@ -22,7 +22,7 @@ const states = ref();
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <strong>{{ t(`invoiceOut.params.${tag.label}`) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
@@ -84,15 +84,6 @@ const states = ref();
                     />
                 </QItemSection>
             </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        v-model="params.issued"
-                        :label="t('Issued')"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInputDate
@@ -110,37 +101,3 @@ const states = ref();
         </template>
     </VnFilterPanel>
 </template>
-
-<i18n>
-en:
-    params:
-        search: Contains
-        clientFk: Customer
-        fi: FI
-        amount: Amount
-        min: Min
-        max: Max
-        hasPdf: Has PDF
-        issued: Issued
-        created: Created
-        dued: Dued
-es:
-    params:
-        search: Contiene
-        clientFk: Cliente
-        fi: CIF
-        amount: Importe
-        min: Min
-        max: Max
-        hasPdf: Tiene PDF
-        issued: Emitida
-        created: Creada
-        dued: Vencida
-    Customer ID: ID cliente
-    FI: CIF
-    Amount: Importe
-    Has PDF: Tiene PDF
-    Issued: Fecha emisión
-    Created: Fecha creación
-    Dued: Fecha vencimiento
-</i18n>
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index c7d7ba9f4..873ab030f 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -71,14 +71,6 @@ const columns = computed(() => [
             inWhere: true,
         },
     },
-    {
-        align: 'left',
-        name: 'issued',
-        label: t('invoiceOut.summary.issued'),
-        component: 'date',
-        format: (row) => toDate(row.issued),
-        columnField: { component: null },
-    },
     {
         align: 'left',
         name: 'clientFk',
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 135eb9aca..b062678a0 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -10,6 +10,8 @@ import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vu
 import TicketDescriptorProxy from '../Ticket/Card/TicketDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import InvoiceOutNegativeBasesFilter from './InvoiceOutNegativeBasesFilter.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -97,16 +99,19 @@ const columns = computed(() => [
         align: 'left',
         name: 'isActive',
         label: t('invoiceOut.negativeBases.active'),
+        component: 'checkbox',
     },
     {
         align: 'left',
         name: 'hasToInvoice',
         label: t('invoiceOut.negativeBases.hasToInvoice'),
+        component: 'checkbox',
     },
     {
         align: 'left',
-        name: 'hasVerifiedData',
+        name: 'isTaxDataChecked',
         label: t('invoiceOut.negativeBases.verifiedData'),
+        component: 'checkbox',
     },
     {
         align: 'left',
@@ -142,7 +147,7 @@ const downloadCSV = async () => {
     await invoiceOutGlobalStore.getNegativeBasesCsv(
         userParams.from,
         userParams.to,
-        filterParams
+        filterParams,
     );
 };
 </script>
@@ -154,6 +159,11 @@ const downloadCSV = async () => {
             </QBtn>
         </template>
     </VnSubToolbar>
+    <RightMenu>
+        <template #right-panel>
+            <InvoiceOutNegativeBasesFilter data-key="negativeFilter" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="negativeFilter"
@@ -174,6 +184,7 @@ const downloadCSV = async () => {
         auto-load
         :is-editable="false"
         :use-model="true"
+        :right-search="false"
     >
         <template #column-clientId="{ row }">
             <span class="link" @click.stop>
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
index 6ceec61e4..cd9836bb7 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
@@ -2,9 +2,10 @@
 import { useI18n } from 'vue-i18n';
 
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -24,11 +25,11 @@ const props = defineProps({
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <strong>{{ t(`invoiceOut.params.${tag.label}`) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params }">
+        <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
                     <VnInputDate
@@ -49,38 +50,70 @@ const props = defineProps({
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        v-model="params.company"
+                    <VnSelect
+                        url="Companies"
                         :label="t('globals.company')"
-                        is-outlined
-                    />
+                        v-model="params.company"
+                        option-label="code"
+                        option-value="code"
+                        dense
+                        outlined
+                        rounded
+                        @update:model-value="searchFn()"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt?.code }}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
+                    <VnSelect
+                        url="Countries"
+                        :label="t('globals.params.countryFk')"
                         v-model="params.country"
-                        :label="t('globals.country')"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        v-model="params.clientId"
-                        :label="t('invoiceOut.negativeBases.clientId')"
-                        is-outlined
-                    />
+                        option-label="name"
+                        option-value="name"
+                        outlined
+                        dense
+                        rounded
+                        @update:model-value="searchFn()"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt?.name }}
+                                    </QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ `#${scope.opt?.id}` }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        v-model="params.clientSocialName"
+                    <VnSelect
+                        url="Clients"
                         :label="t('globals.client')"
-                        is-outlined
+                        v-model="params.clientId"
+                        outlined
+                        dense
+                        rounded
+                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
             </QItem>
@@ -90,15 +123,18 @@ const props = defineProps({
                         v-model="params.amount"
                         :label="t('globals.amount')"
                         is-outlined
+                        :positive="false"
                     />
                 </QItemSection>
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        v-model="params.comercialName"
+                    <VnSelectWorker
                         :label="t('invoiceOut.negativeBases.comercial')"
+                        v-model="params.workerName"
+                        option-value="name"
                         is-outlined
+                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/InvoiceOut/locale/en.yml b/src/pages/InvoiceOut/locale/en.yml
index ee6ba57e6..f1baef432 100644
--- a/src/pages/InvoiceOut/locale/en.yml
+++ b/src/pages/InvoiceOut/locale/en.yml
@@ -4,7 +4,7 @@ invoiceOut:
     params:
         company: Company
         country: Country
-        clientId: Client ID
+        clientId: Client
         clientSocialName: Client
         taxableBase: Base
         ticketFk: Ticket
@@ -12,6 +12,19 @@ invoiceOut:
         hasToInvoice: Has to invoice
         hasVerifiedData: Verified data
         workerName: Worker
+        isTaxDataChecked: Verified data
+        amount: Amount
+        clientFk: Client
+        companyFk: Company
+        created: Created
+        dued: Dued
+        customsAgentFk: Custom Agent
+        ref: Reference
+        fi: FI
+        min: Min
+        max: Max
+        hasPdf: Has PDF
+        search: Contains
     card:
         issued: Issued
         customerCard: Customer card
@@ -53,7 +66,7 @@ invoiceOut:
         active: Active
         hasToInvoice: Has to Invoice
         verifiedData: Verified Data
-        comercial: Commercial
+        comercial: Sales person
         errors:
             downloadCsvFailed: CSV download failed
 invoiceOutModule:
diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml
index a059ce18d..afca27871 100644
--- a/src/pages/InvoiceOut/locale/es.yml
+++ b/src/pages/InvoiceOut/locale/es.yml
@@ -4,7 +4,7 @@ invoiceOut:
     params:
         company: Empresa
         country: País
-        clientId: ID del cliente
+        clientId: Cliente
         clientSocialName: Cliente
         taxableBase: Base
         ticketFk: Ticket
@@ -12,6 +12,19 @@ invoiceOut:
         hasToInvoice: Debe facturar
         hasVerifiedData: Datos verificados
         workerName: Comercial
+        isTaxDataChecked: Datos comprobados
+        amount: Importe
+        clientFk: Cliente
+        companyFk: Empresa
+        created: Creada
+        dued: Vencida
+        customsAgentFk: Agente aduanas
+        ref: Referencia
+        fi: CIF
+        min: Min
+        max: Max
+        hasPdf: Tiene PDF
+        search: Contiene
     card:
         issued: Fecha emisión
         customerCard: Ficha del cliente
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index af48f7f5c..c2a63ddd9 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -8,6 +8,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -52,7 +53,7 @@ onMounted(async () => {
                 name: key,
                 value,
                 selectedField: { name: key, label: t(`params.${key}`) },
-            })
+            }),
         );
     }
     exprBuilder('state', arrayData.store?.userParams?.state);
@@ -157,6 +158,32 @@ onMounted(async () => {
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.from"
+                        :label="t('params.from')"
+                        is-outlined
+                    />
+                </QItemSection>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.to"
+                        :label="t('params.to')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.daysOnward')"
+                        v-model="params.daysOnward"
+                        lazy-rules
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
@@ -175,11 +202,10 @@ onMounted(async () => {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        :label="t('params.daysOnward')"
-                        v-model="params.daysOnward"
-                        lazy-rules
-                        is-outlined
+                    <QCheckbox
+                        :label="t('params.mine')"
+                        v-model="params.mine"
+                        :toggle-indeterminate="false"
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/Route/RouteExtendedList.vue b/src/pages/Route/RouteExtendedList.vue
index 46bc1a690..a8d847711 100644
--- a/src/pages/Route/RouteExtendedList.vue
+++ b/src/pages/Route/RouteExtendedList.vue
@@ -280,7 +280,7 @@ const openTicketsDialog = (id) => {
             </QCardSection>
             <QCardSection class="q-pt-none">
                 <VnInputDate
-                    :label="t('route.Stating date')"
+                    :label="t('route.Starting date')"
                     v-model="startingDate"
                     autofocus
                 />
@@ -335,6 +335,7 @@ const openTicketsDialog = (id) => {
                 <QBtn
                     icon="vn:clone"
                     color="primary"
+                    flat
                     class="q-mr-sm"
                     :disable="!selectedRows?.length"
                     @click="confirmationDialog = true"
@@ -344,6 +345,7 @@ const openTicketsDialog = (id) => {
                 <QBtn
                     icon="cloud_download"
                     color="primary"
+                    flat
                     class="q-mr-sm"
                     :disable="!selectedRows?.length"
                     @click="showRouteReport"
@@ -353,6 +355,7 @@ const openTicketsDialog = (id) => {
                 <QBtn
                     icon="check"
                     color="primary"
+                    flat
                     class="q-mr-sm"
                     :disable="!selectedRows?.length"
                     @click="markAsServed()"
diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue
index a55658a07..14eec9db9 100644
--- a/src/pages/Ticket/Card/TicketEditMana.vue
+++ b/src/pages/Ticket/Card/TicketEditMana.vue
@@ -21,6 +21,10 @@ const $props = defineProps({
         type: String,
         default: 'mana',
     },
+    sale: {
+        type: Object,
+        default: null,
+    },
 });
 
 const emit = defineEmits(['save', 'cancel']);
@@ -29,8 +33,8 @@ const { t } = useI18n();
 const QPopupProxyRef = ref(null);
 const manaCode = ref($props.manaCode);
 
-const save = () => {
-    emit('save');
+const save = (sale = $props.sale) => {
+    emit('save', sale);
     QPopupProxyRef.value.hide();
 };
 
@@ -38,10 +42,11 @@ const cancel = () => {
     emit('cancel');
     QPopupProxyRef.value.hide();
 };
+defineExpose({ save });
 </script>
 
 <template>
-    <QPopupProxy ref="QPopupProxyRef">
+    <QPopupProxy ref="QPopupProxyRef" data-cy="ticketEditManaProxy">
         <div class="container">
             <QSpinner v-if="!mana" color="primary" size="md" />
             <div v-else>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 118761b23..e680fb290 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -22,7 +22,6 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import VnTable from 'src/components/VnTable/VnTable.vue';
-import VnUsesMana from 'src/components/ui/VnUsesMana.vue';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import TicketProblems from 'src/components/TicketProblems.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
@@ -33,6 +32,7 @@ const { t } = useI18n();
 const { notify } = useNotify();
 const { openConfirmationModal } = useVnConfirm();
 const editPriceProxyRef = ref(null);
+const editManaProxyRef = ref(null);
 const stateBtnDropdownRef = ref(null);
 const quasar = useQuasar();
 const arrayData = useArrayData('Ticket');
@@ -53,7 +53,6 @@ const transfer = ref({
     sales: [],
 });
 const tableRef = ref([]);
-const canProceed = ref();
 
 watch(
     () => route.params.id,
@@ -133,7 +132,6 @@ const columns = computed(() => [
         align: 'left',
         label: t('globals.amount'),
         name: 'amount',
-        format: (row) => toCurrency(getSaleTotal(row)),
     },
     {
         align: 'left',
@@ -183,8 +181,6 @@ const resetChanges = async () => {
 };
 const rowToUpdate = ref(null);
 const changeQuantity = async (sale) => {
-    canProceed.value = await isSalePrepared(sale);
-    if (!canProceed.value) return;
     if (
         !sale.itemFk ||
         sale.quantity == null ||
@@ -193,11 +189,21 @@ const changeQuantity = async (sale) => {
         return;
     if (!sale.id) return addSale(sale);
 
+    if (await isSalePrepared(sale)) {
+        await confirmUpdate(() => updateQuantity(sale));
+    } else await updateQuantity(sale);
+};
+
+const updateQuantity = async (sale) => {
     try {
+        let { quantity, id } = sale;
         if (!rowToUpdate.value) return;
         rowToUpdate.value = null;
         sale.isNew = false;
-        await updateQuantity(sale);
+        const params = { quantity: quantity };
+        await axios.post(`Sales/${id}/updateQuantity`, params);
+        notify('globals.dataSaved', 'positive');
+        tableRef.value.reload();
     } catch (e) {
         const { quantity } = tableRef.value.CrudModelRef.originalData.find(
             (s) => s.id === sale.id,
@@ -207,12 +213,6 @@ const changeQuantity = async (sale) => {
     }
 };
 
-const updateQuantity = async ({ quantity, id }) => {
-    const params = { quantity: quantity };
-    await axios.post(`Sales/${id}/updateQuantity`, params);
-    notify('globals.dataSaved', 'positive');
-};
-
 const addSale = async (sale) => {
     const params = {
         barcode: sale.itemFk,
@@ -237,13 +237,17 @@ const addSale = async (sale) => {
     sale.isNew = false;
     arrayData.fetch({});
 };
+const changeConcept = async (sale) => {
+    if (await isSalePrepared(sale)) {
+        await confirmUpdate(() => updateConcept(sale));
+    } else await updateConcept(sale);
+};
 
 const updateConcept = async (sale) => {
-    canProceed.value = await isSalePrepared(sale);
-    if (!canProceed.value) return;
     const data = { newConcept: sale.concept };
     await axios.post(`Sales/${sale.id}/updateConcept`, data);
     notify('globals.dataSaved', 'positive');
+    tableRef.value.reload();
 };
 
 const DEFAULT_EDIT = {
@@ -295,33 +299,43 @@ const onOpenEditDiscountPopover = async (sale) => {
         };
     }
 };
-
-const updatePrice = async (sale) => {
-    canProceed.value = await isSalePrepared(sale);
-    if (!canProceed.value) return;
+const changePrice = async (sale) => {
     const newPrice = edit.value.price;
     if (newPrice != null && newPrice != sale.price) {
-        await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
-        sale.price = newPrice;
-        edit.value = { ...DEFAULT_EDIT };
-        notify('globals.dataSaved', 'positive');
+        if (await isSalePrepared(sale)) {
+            await confirmUpdate(() => updatePrice(sale, newPrice));
+        } else updatePrice(sale, newPrice);
     }
-
     await getMana();
 };
+const updatePrice = async (sale, newPrice) => {
+    await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
+    sale.price = newPrice;
+    edit.value = { ...DEFAULT_EDIT };
+    notify('globals.dataSaved', 'positive');
+    tableRef.value.reload();
+};
 
 const changeDiscount = async (sale) => {
-    canProceed.value = await isSalePrepared(sale);
-    if (!canProceed.value) return;
     const newDiscount = edit.value.discount;
-    if (newDiscount != null && newDiscount != sale.discount) updateDiscount([sale]);
+    if (newDiscount != null && newDiscount != sale.discount) {
+        if (await isSalePrepared(sale))
+            await confirmUpdate(() => updateDiscount([sale], newDiscount));
+        else await updateDiscount([sale], newDiscount);
+    }
+};
+
+const updateDiscounts = async (sales, newDiscount = null) => {
+    const salesTracking = await fetchSalesTracking();
+
+    const someSaleIsPrepared = salesTracking.some((sale) =>
+        matchSale(salesTracking, sale),
+    );
+    if (someSaleIsPrepared) await confirmUpdate(() => updateDiscount(sales, newDiscount));
+    else updateDiscount(sales, newDiscount);
 };
 
 const updateDiscount = async (sales, newDiscount = null) => {
-    for (const sale of sales) {
-        const canProceed = await isSalePrepared(sale);
-        if (!canProceed) return;
-    }
     const saleIds = sales.map((sale) => sale.id);
     const _newDiscount = newDiscount || edit.value.discount;
     const params = {
@@ -424,9 +438,13 @@ onMounted(async () => {
 const items = ref([]);
 const newRow = ref({});
 
+const changeItem = async (sale) => {
+    if (await isSalePrepared(sale)) {
+        await confirmUpdate(() => updateItem(sale));
+    } else await updateItem(sale);
+};
+
 const updateItem = async (row) => {
-    canProceed.value = await isSalePrepared(row);
-    if (!canProceed.value) return;
     const selectedItem = items.value.find((item) => item.id === row.itemFk);
     if (selectedItem) {
         row.item = selectedItem;
@@ -470,7 +488,18 @@ const endNewRow = (row) => {
     }
 };
 
-async function isSalePrepared(item) {
+async function confirmUpdate(cb) {
+    await quasar
+        .dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('Item prepared'),
+                message: t('This item is already prepared. Do you want to continue?'),
+            },
+        })
+        .onOk(cb);
+}
+async function fetchSalesTracking() {
     const filter = {
         params: {
             where: { ticketFk: route.params.id },
@@ -482,48 +511,37 @@ async function isSalePrepared(item) {
             filter: JSON.stringify(filter),
         },
     });
-
-    const matchingSale = data.find((sale) => sale.itemFk === item.itemFk);
-    if (!matchingSale) {
-        return true;
-    }
-
-    if (
-        matchingSale.hasSaleGroupDetail ||
-        matchingSale.isControled ||
-        matchingSale.isPrepared ||
-        matchingSale.isPrevious ||
-        matchingSale.isPreviousSelected
-    ) {
-        try {
-            await new Promise((resolve, reject) => {
-                quasar
-                    .dialog({
-                        component: VnConfirm,
-                        componentProps: {
-                            title: t('Item prepared'),
-                            message: t(
-                                'This item is already prepared. Do you want to continue?',
-                            ),
-                            data: item,
-                        },
-                    })
-                    .onOk(() => resolve(true))
-                    .onCancel(() => reject(new Error('cancelled')));
-            });
-        } catch (error) {
-            tableRef.value.reload();
-            return false;
-        }
-    }
-    return true;
+    return data;
 }
 
+async function isSalePrepared(sale) {
+    const data = await fetchSalesTracking();
+    return matchSale(data, sale);
+}
+function matchSale(data, sale) {
+    const matchingSale = data.find(({ itemFk }) => itemFk === sale.itemFk);
+
+    if (!matchingSale) {
+        return false;
+    }
+
+    return isPrepared(matchingSale);
+}
+function isPrepared(sale) {
+    const flagsToCheck = [
+        'hasSaleGroupDetail',
+        'isControled',
+        'isPrepared',
+        'isPrevious',
+        'isPreviousSelected',
+    ];
+    return flagsToCheck.some((flag) => sale[flag] === 1);
+}
 watch(
     () => newRow.value.itemFk,
     (newItemFk) => {
         if (newItemFk) {
-            updateItem(newRow.value);
+            changeItem(newRow.value);
         }
     },
 );
@@ -584,7 +602,7 @@ watch(
                     :mana="mana"
                     :ticket-config="ticketConfig"
                     @get-mana="getMana()"
-                    @update-discounts="updateDiscount"
+                    @update-discounts="updateDiscounts"
                     @refresh-table="resetChanges"
                 />
                 <QBtn
@@ -715,7 +733,7 @@ watch(
                 option-value="id"
                 v-model="row.itemFk"
                 :use-like="false"
-                @update:model-value="updateItem(row)"
+                @update:model-value="changeItem(row)"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
@@ -741,16 +759,21 @@ watch(
             </div>
             <FetchedTags :item="row" :max-length="6" />
             <QPopupProxy v-if="row.id && isTicketEditable">
-                <VnInput v-model="row.concept" @change="updateConcept(row)" />
+                <VnInput
+                    v-model="row.concept"
+                    @keyup.enter.stop="changeConcept(row)"
+                    :hint="t('globals.enterToConfirm')"
+                />
             </QPopupProxy>
         </template>
         <template #column-quantity="{ row }">
             <VnInput
+                data-cy="ticketSaleQuantityInput"
                 v-if="row.isNew || isTicketEditable"
                 type="number"
                 v-model.number="row.quantity"
                 @blur="changeQuantity(row)"
-                @keyup.enter="changeQuantity(row)"
+                @keyup.enter.stop="changeQuantity(row)"
                 @update:model-value="() => (rowToUpdate = row)"
                 @focus="edit.oldQuantity = row.quantity"
             />
@@ -764,10 +787,12 @@ watch(
                 <TicketEditManaProxy
                     ref="editPriceProxyRef"
                     :mana="mana"
+                    :sale="row"
                     :new-price="getNewPrice"
-                    @save="updatePrice(row)"
+                    @save="changePrice"
                 >
                     <VnInput
+                        @keyup.enter.stop="() => editManaProxyRef.save(row)"
                         v-model.number="edit.price"
                         :label="t('basicData.price')"
                         type="number"
@@ -781,31 +806,30 @@ watch(
                 <QBtn flat class="link" dense @click="onOpenEditDiscountPopover(row)">
                     {{ toPercentage(row.discount / 100) }}
                 </QBtn>
+
                 <TicketEditManaProxy
+                    ref="editManaProxyRef"
                     :mana="mana"
+                    :sale="row"
                     :new-price="getNewPrice"
                     :uses-mana="usesMana"
                     :mana-code="manaCode"
-                    @save="changeDiscount(row)"
+                    @save="changeDiscount"
                 >
-                    <template #default="{ popup }">
-                        <VnInput
-                            autofocus
-                            @keyup.enter="
-                                () => {
-                                    changeDiscount(row);
-                                    popup.hide();
-                                }
-                            "
-                            v-model.number="edit.discount"
-                            :label="t('ticketSale.discount')"
-                            type="number"
-                        />
-                    </template>
+                    <VnInput
+                        autofocus
+                        @keyup.enter.stop="() => editManaProxyRef.save(row)"
+                        v-model.number="edit.discount"
+                        :label="t('ticketSale.discount')"
+                        type="number"
+                    />
                 </TicketEditManaProxy>
             </template>
             <span v-else>{{ toPercentage(row.discount / 100) }}</span>
         </template>
+        <template #column-amount="{ row }">
+            {{ toCurrency(getSaleTotal(row)) }}
+        </template>
     </VnTable>
 
     <QPageSticky :offset="[20, 20]" style="z-index: 2">
diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 7aec32972..446e5d506 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -209,7 +209,7 @@ const onThermographCreated = async (data) => {
                         }"
                         sort-by="thermographFk ASC"
                         option-label="thermographFk"
-                        option-filter-value="id"
+                        option-filter-value="thermographFk"
                         :disable="viewAction === 'edit'"
                         :tooltip="t('New thermograph')"
                         :roles-allowed-to-create="['logistic']"
diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index e05eca7f8..e8680f7dd 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -119,7 +119,7 @@ const columns = computed(() => [
         :url="`Workers/${entityId}/trainingCourse`"
         :url-create="`Workers/${entityId}/trainingCourse`"
         save-url="TrainingCourses/crud"
-        :filter="courseFilter"
+        :user-filter="courseFilter"
         :create="{
             urlCreate: 'trainingCourses',
             title: t('Create training course'),
diff --git a/src/pages/Worker/Card/WorkerMedical.vue b/src/pages/Worker/Card/WorkerMedical.vue
index c220df76a..c04f6496b 100644
--- a/src/pages/Worker/Card/WorkerMedical.vue
+++ b/src/pages/Worker/Card/WorkerMedical.vue
@@ -3,11 +3,23 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import VnTable from 'components/VnTable/VnTable.vue';
+import { dashIfEmpty } from 'src/filters';
 const tableRef = ref();
 const { t } = useI18n();
 const route = useRoute();
 const entityId = computed(() => route.params.id);
 
+const centerFilter = {
+    include: [
+        {
+            relation: 'center',
+            scope: {
+                fields: ['id', 'name'],
+            },
+        },
+    ],
+};
+
 const columns = [
     {
         align: 'left',
@@ -36,6 +48,9 @@ const columns = [
             url: 'medicalCenters',
             fields: ['id', 'name'],
         },
+        format: (row, dashIfEmpty) => {
+            return dashIfEmpty(row.center?.name);
+        },
     },
     {
         align: 'left',
@@ -84,6 +99,7 @@ const columns = [
         ref="tableRef"
         data-key="WorkerMedical"
         :url="`Workers/${entityId}/medicalReview`"
+        :user-filter="centerFilter"
         save-url="MedicalReviews/crud"
         :create="{
             urlCreate: 'medicalReviews',
diff --git a/src/pages/Worker/Card/WorkerPit.vue b/src/pages/Worker/Card/WorkerPit.vue
index 40e814452..3de60d6a0 100644
--- a/src/pages/Worker/Card/WorkerPit.vue
+++ b/src/pages/Worker/Card/WorkerPit.vue
@@ -176,6 +176,7 @@ const deleteRelative = async (id) => {
                                 :label="t('isDescendant')"
                                 v-model="row.isDescendant"
                                 class="q-gutter-xs q-mb-xs"
+                                data-cy="Descendant/Ascendant"
                             />
                             <VnSelect
                                 :label="t('disabilityGrades')"
diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index b38d2749b..03013f011 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -25,7 +25,7 @@ const setFilteredAddresses = (data) => {
         @on-fetch="(data) => (validAddresses = data)"
     />
     <FetchData url="Addresses" auto-load @on-fetch="setFilteredAddresses" />
-    <FormModel auto-load model="zone">
+    <FormModel auto-load model="Zone">
         <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
@@ -33,6 +33,7 @@ const setFilteredAddresses = (data) => {
                     :label="t('Name')"
                     clearable
                     v-model="data.name"
+                    :required="true"
                 />
             </VnRow>
             <VnRow>
@@ -83,7 +84,7 @@ const setFilteredAddresses = (data) => {
                     type="number"
                     min="0"
                 />
-                <VnInputTime v-model="data.hour" :label="t('Closing')" />
+                <VnInputTime v-model="data.hour" :label="t('Closing')" :required="true" />
             </VnRow>
 
             <VnRow>
@@ -92,7 +93,7 @@ const setFilteredAddresses = (data) => {
                     :label="t('Price')"
                     type="number"
                     min="0"
-                    required="true"
+                    :required="true"
                     clearable
                 />
                 <VnInput
@@ -100,7 +101,7 @@ const setFilteredAddresses = (data) => {
                     :label="t('Price optimum')"
                     type="number"
                     min="0"
-                    required="true"
+                    :required="true"
                     clearable
                 />
             </VnRow>
diff --git a/src/pages/Zone/Card/ZoneCalendar.vue b/src/pages/Zone/Card/ZoneCalendar.vue
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index 3a35527ab..bbe12189a 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -38,7 +38,12 @@ const agencies = ref([]);
         <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
-                    <VnInput :label="t('list.name')" v-model="params.name" is-outlined />
+                    <VnInput
+                        :label="t('list.name')"
+                        v-model="params.name"
+                        is-outlined
+                        data-cy="zoneFilterPanelNameInput"
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -53,6 +58,7 @@ const agencies = ref([]);
                         dense
                         outlined
                         rounded
+                        data-cy="zoneFilterPanelAgencySelect"
                     >
                     </VnSelect>
                 </QItemSection>
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 1fa539c91..a82bbb285 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -65,7 +65,6 @@ const tableFilter = {
 
 const columns = computed(() => [
     {
-        align: 'left',
         name: 'id',
         label: t('list.id'),
         chip: {
@@ -75,6 +74,8 @@ const columns = computed(() => [
         columnFilter: {
             inWhere: true,
         },
+        columnClass: 'shrink-column',
+        component: 'number',
     },
     {
         align: 'left',
@@ -106,7 +107,6 @@ const columns = computed(() => [
         format: (row, dashIfEmpty) => dashIfEmpty(row?.agencyMode?.name),
     },
     {
-        align: 'left',
         name: 'price',
         label: t('list.price'),
         cardVisible: true,
@@ -114,9 +114,11 @@ const columns = computed(() => [
         columnFilter: {
             inWhere: true,
         },
+        columnClass: 'shrink-column',
+        component: 'number',
     },
     {
-        align: 'left',
+        align: 'center',
         name: 'hour',
         label: t('list.close'),
         cardVisible: true,
@@ -129,6 +131,7 @@ const columns = computed(() => [
         label: t('list.addressFk'),
         cardVisible: true,
         columnFilter: false,
+        columnClass: 'expand',
     },
     {
         align: 'right',
@@ -177,67 +180,73 @@ function formatRow(row) {
             <ZoneFilterPanel data-key="ZonesList" />
         </template>
     </RightMenu>
-    <VnTable
-        ref="tableRef"
-        data-key="ZonesList"
-        url="Zones"
-        :create="{
-            urlCreate: 'Zones',
-            title: t('list.createZone'),
-            onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
-            formInitialData: {},
-        }"
-        :user-filter="tableFilter"
-        :columns="columns"
-        redirect="zone"
-        :right-search="false"
-    >
-        <template #column-addressFk="{ row }">
-            {{ dashIfEmpty(formatRow(row)) }}
-        </template>
-        <template #more-create-dialog="{ data }">
-            <VnSelect
-                url="AgencyModes"
-                v-model="data.agencyModeFk"
-                option-value="id"
-                option-label="name"
-                :label="t('list.agency')"
-            />
-            <VnInput
-                v-model="data.price"
-                :label="t('list.price')"
-                min="0"
-                type="number"
-                required="true"
-            />
-            <VnInput
-                v-model="data.bonus"
-                :label="t('zone.bonus')"
-                min="0"
-                type="number"
-            />
-            <VnInput
-                v-model="data.travelingDays"
-                :label="t('zone.travelingDays')"
-                type="number"
-                min="0"
-            />
-            <VnInputTime v-model="data.hour" :label="t('list.close')" />
-            <VnSelect
-                url="Warehouses"
-                v-model="data.warehouseFK"
-                option-value="id"
-                option-label="name"
-                :label="t('list.warehouse')"
-                :options="warehouseOptions"
-            />
-            <QCheckbox
-                v-model="data.isVolumetric"
-                :label="t('list.isVolumetric')"
-                :toggle-indeterminate="false"
-            />
-        </template>
-    </VnTable>
+    <div class="table-container">
+        <div class="column items-center">
+            <VnTable
+                ref="tableRef"
+                data-key="ZonesList"
+                url="Zones"
+                :create="{
+                    urlCreate: 'Zones',
+                    title: t('list.createZone'),
+                    onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
+                    formInitialData: {},
+                }"
+                :user-filter="tableFilter"
+                :columns="columns"
+                redirect="zone"
+                :right-search="false"
+                table-height="85vh"
+                order="id ASC"
+            >
+                <template #column-addressFk="{ row }">
+                    {{ dashIfEmpty(formatRow(row)) }}
+                </template>
+                <template #more-create-dialog="{ data }">
+                    <VnSelect
+                        url="AgencyModes"
+                        v-model="data.agencyModeFk"
+                        option-value="id"
+                        option-label="name"
+                        :label="t('list.agency')"
+                    />
+                    <VnInput
+                        v-model="data.price"
+                        :label="t('list.price')"
+                        min="0"
+                        type="number"
+                        required="true"
+                    />
+                    <VnInput
+                        v-model="data.bonus"
+                        :label="t('zone.bonus')"
+                        min="0"
+                        type="number"
+                    />
+                    <VnInput
+                        v-model="data.travelingDays"
+                        :label="t('zone.travelingDays')"
+                        type="number"
+                        min="0"
+                    />
+                    <VnInputTime v-model="data.hour" :label="t('list.close')" />
+                    <VnSelect
+                        url="Warehouses"
+                        v-model="data.warehouseFK"
+                        option-value="id"
+                        option-label="name"
+                        :label="t('list.warehouse')"
+                        :options="warehouseOptions"
+                    />
+                    <QCheckbox
+                        v-model="data.isVolumetric"
+                        :label="t('list.isVolumetric')"
+                        :toggle-indeterminate="false"
+                    />
+                </template>
+            </VnTable>
+        </div>
+    </div>
 </template>
 
 <i18n>
@@ -245,3 +254,20 @@ es:
     Search zone: Buscar zona
     You can search zones by id or name: Puedes buscar zonas por id o nombre
 </i18n>
+
+<style lang="scss" scoped>
+.table-container {
+    display: flex;
+    justify-content: center;
+}
+.column {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    min-width: 70%;
+}
+
+:deep(.shrink-column) {
+    width: 8%;
+}
+</style>
diff --git a/src/pages/Zone/ZoneUpcoming.vue b/src/pages/Zone/ZoneUpcoming.vue
index c74ae6078..adcdfbc04 100644
--- a/src/pages/Zone/ZoneUpcoming.vue
+++ b/src/pages/Zone/ZoneUpcoming.vue
@@ -56,7 +56,7 @@ onMounted(() => weekdayStore.initStore());
     <ZoneSearchbar />
     <VnSubToolbar />
     <QPage class="column items-center q-pa-md">
-        <QCard class="full-width q-pa-md">
+        <QCard class="containerShrinked q-pa-md">
             <div
                 v-for="(detail, index) in details"
                 :key="index"
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index 5fd1a3ea7..e53e7b560 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -44,6 +44,8 @@ summary:
 filterPanel:
     name: Name
     agencyModeFk: Agency
+    id: ID
+    price: Price
 deliveryPanel:
     pickup: Pick up
     delivery: Delivery
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index 575b12f7a..bc31e74a9 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -45,6 +45,8 @@ summary:
 filterPanel:
     name: Nombre
     agencyModeFk: Agencia
+    id: ID
+    price: Precio
 deliveryPanel:
     pickup: Recogida
     delivery: Entrega
diff --git a/test/cypress/integration/invoiceOut/invoiceOutList.spec.js b/test/cypress/integration/invoiceOut/invoiceOutList.spec.js
index 82f0fa3b6..d3a84d226 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutList.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutList.spec.js
@@ -1,6 +1,16 @@
 /// <reference types="cypress" />
 describe('InvoiceOut list', () => {
     const serial = 'Española rapida';
+    const columnCheckbox =
+        '.bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner';
+    const firstRowDescriptor =
+        'tbody > :nth-child(1) > [data-col-field="clientFk"] > .no-padding > .link';
+    const firstRowCheckbox =
+        'tbody > :nth-child(1) > :nth-child(1) > .q-checkbox > .q-checkbox__inner ';
+    const summaryPopupIcon = '.header > :nth-child(2) > .q-btn__content > .q-icon';
+    const filterBtn = '.q-scrollarea__content > .q-btn--standard > .q-btn__content';
+    const firstSummaryIcon =
+        ':nth-child(1) > .text-right > [data-cy="tableAction-0"] > .q-btn__content > .q-icon';
 
     beforeEach(() => {
         cy.viewport(1920, 1080);
@@ -9,18 +19,32 @@ describe('InvoiceOut list', () => {
         cy.typeSearchbar('{enter}');
     });
 
-    it('should search and filter an invoice and enter to the summary', () => {
-        cy.typeSearchbar('1{enter}');
-        cy.get('.q-virtual-scroll__content > :nth-child(2) > :nth-child(7)').click();
-        cy.get('.header > a.q-btn > .q-btn__content').click();
-        cy.typeSearchbar('{enter}');
-        cy.dataCy('InvoiceOutFilterAmountBtn').find('input').type('8.88{enter}');
+    it('should download one pdf from the subtoolbar button', () => {
+        cy.get(firstRowCheckbox).click();
+        cy.dataCy('InvoiceOutDownloadPdfBtn').click();
     });
 
     it('should download all pdfs', () => {
-        cy.get('.bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner').click();
+        cy.get(columnCheckbox).click();
         cy.dataCy('InvoiceOutDownloadPdfBtn').click();
-        cy.get('.bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner').click();
+    });
+
+    it('should open the invoice descriptor from table icon', () => {
+        cy.get(firstSummaryIcon).click();
+        cy.get('.cardSummary').should('be.visible');
+        cy.get('.summaryHeader > div').should('include.text', 'A1111111');
+    });
+
+    it('should open the client descriptor', () => {
+        cy.get(firstRowDescriptor).click();
+        cy.get(summaryPopupIcon).click();
+    });
+
+    it('should filter the results by client ID, then check the first result is correct', () => {
+        cy.dataCy('Customer ID_input').type('1103');
+        cy.get(filterBtn).click();
+        cy.get(firstRowDescriptor).click();
+        cy.get('.q-item > .q-item__label').should('include.text', '1103');
     });
 
     it('should give an error when manual invoicing a ticket that is already invoiced', () => {
@@ -31,11 +55,14 @@ describe('InvoiceOut list', () => {
         cy.checkNotification('This ticket is already invoiced');
     });
 
-    it('should create a manual invoice and enter to its summary', () => {
+    it('should create a manual invoice and enter to its summary, then delete that invoice', () => {
         cy.dataCy('vnTableCreateBtn').click();
-        cy.dataCy('InvoiceOutCreateTicketinput').type(8);
+        cy.dataCy('InvoiceOutCreateTicketinput').type(9);
         cy.selectOption('[data-cy="InvoiceOutCreateSerialSelect"]', serial);
         cy.dataCy('FormModelPopup_save').click();
         cy.checkNotification('Data created');
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get('.q-menu > .q-list > :nth-child(4)').click();
+        cy.dataCy('VnConfirm_confirm').click();
     });
 });
diff --git a/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js b/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js
index 02b7fbb43..4d530de05 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutNegativeBases.spec.js
@@ -1,11 +1,26 @@
 /// <reference types="cypress" />
 describe('InvoiceOut negative bases', () => {
+    const getDescriptors = (opt) =>
+        `:nth-child(1) > [data-col-field="${opt}"] > .no-padding > .link`;
+
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/invoice-out/negative-bases`);
     });
 
+    it('should open the posible descriptors', () => {
+        cy.get(getDescriptors('clientId')).click();
+        cy.get('.descriptor').should('be.visible');
+        cy.get('.q-item > .q-item__label').should('include.text', '1101');
+        cy.get(getDescriptors('ticketFk')).click();
+        cy.get('.descriptor').should('be.visible');
+        cy.get('.q-item > .q-item__label').should('include.text', '23');
+        cy.get(getDescriptors('workerName')).click();
+        cy.get('.descriptor').should('be.visible');
+        cy.get('.q-item > .q-item__label').should('include.text', '18');
+    });
+
     it('should filter and download as CSV', () => {
         cy.get('input[name="ticketFk"]').type('23{enter}');
         cy.get('#subToolbar > .q-btn').click();
diff --git a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
index 44b0a9961..333f7e2c4 100644
--- a/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
+++ b/test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js
@@ -5,40 +5,91 @@ describe('InvoiceOut summary', () => {
         Type: { val: 'Error in customer data', type: 'select' },
     };
 
+    const firstRowDescriptors = (opt) =>
+        `tbody > :nth-child(1) > :nth-child(${opt}) > .q-btn`;
+    const toCustomerSummary = '[href="#/customer/1101"]';
+    const toTicketList = '[href="#/ticket/list?table={%22refFk%22:%22T1111111%22}"]';
+    const selectMenuOption = (opt) => `.q-menu > .q-list > :nth-child(${opt})`;
+    const confirmSend = '.q-btn--unelevated';
+
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
-        cy.visit(`/#/invoice-out/list`);
+        cy.visit(`/#/invoice-out/1/summary`);
     });
 
-    it('should generate the invoice PDF', () => {
-        cy.typeSearchbar('T1111111{enter}');
-        cy.dataCy('descriptor-more-opts').click();
-        cy.get('.q-menu > .q-list > :nth-child(6)').click();
-        cy.dataCy('VnConfirm_confirm').click();
-        cy.checkNotification('The invoice PDF document has been regenerated');
+    it('open the descriptors', () => {
+        cy.get(firstRowDescriptors(1)).click();
+        cy.get('.descriptor').should('be.visible');
+        cy.get('.q-item > .q-item__label').should('include.text', '1');
+        cy.get(firstRowDescriptors(2)).click();
+        cy.get('.descriptor').should('be.visible');
+        cy.get('.q-item > .q-item__label').should('include.text', '1101');
     });
-    it('should refund the invoice ', () => {
+
+    it('should open the client summary and the ticket list', () => {
+        cy.get(toCustomerSummary).click();
+        cy.get('.descriptor').should('be.visible');
+        cy.get('.q-item > .q-item__label').should('include.text', '1101');
+    });
+
+    it('should open the ticket list', () => {
+        cy.get(toTicketList).click();
+        cy.get('.descriptor').should('be.visible');
+        cy.dataCy('vnFilterPanelChip').should('include.text', 'T1111111');
+    });
+
+    it('should transfer the invoice ', () => {
         cy.typeSearchbar('T1111111{enter}');
         cy.dataCy('descriptor-more-opts').click();
-        cy.get('.q-menu > .q-list > :nth-child(7)').click();
-        cy.get('#q-portal--menu--3 > .q-menu > .q-list > :nth-child(2)').click();
-        cy.checkNotification('The following refund ticket have been created');
+        cy.get(selectMenuOption(1)).click();
+        cy.fillInForm(transferInvoice);
+        cy.get('.q-mt-lg > .q-btn').click();
+        cy.checkNotification('Transferred invoice');
+    });
+
+    it('should send the invoice as PDF', () => {
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get(selectMenuOption(3)).click();
+        cy.dataCy('InvoiceOutDescriptorMenuSendPdfOption').click();
+        cy.get(confirmSend).click();
+        cy.checkNotification('Notification sent');
+    });
+
+    it('should send the invoice as CSV', () => {
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get(selectMenuOption(3)).click();
+        cy.dataCy('InvoiceOutDescriptorMenuSendCsvOption').click();
+        cy.get(confirmSend).click();
+        cy.checkNotification('Notification sent');
     });
 
     it('should delete an invoice ', () => {
         cy.typeSearchbar('T2222222{enter}');
         cy.dataCy('descriptor-more-opts').click();
-        cy.get('.q-menu > .q-list > :nth-child(4)').click();
+        cy.get(selectMenuOption(4)).click();
         cy.dataCy('VnConfirm_confirm').click();
         cy.checkNotification('InvoiceOut deleted');
     });
-    it('should transfer the invoice ', () => {
-        cy.typeSearchbar('T1111111{enter}');
+
+    it('should book the invoice', () => {
         cy.dataCy('descriptor-more-opts').click();
-        cy.get('.q-menu > .q-list > :nth-child(1)').click();
-        cy.fillInForm(transferInvoice);
-        cy.get('.q-mt-lg > .q-btn').click();
-        cy.checkNotification('Transferred invoice');
+        cy.get(selectMenuOption(5)).click();
+        cy.dataCy('VnConfirm_confirm').click();
+        cy.checkNotification('InvoiceOut booked');
+    });
+
+    it('should generate the invoice PDF', () => {
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get(selectMenuOption(6)).click();
+        cy.dataCy('VnConfirm_confirm').click();
+        cy.checkNotification('The invoice PDF document has been regenerated');
+    });
+
+    it('should refund the invoice ', () => {
+        cy.dataCy('descriptor-more-opts').click();
+        cy.get(selectMenuOption(7)).click();
+        cy.get('#q-portal--menu--3 > .q-menu > .q-list > :nth-child(2)').click();
+        cy.checkNotification('The following refund ticket have been created');
     });
 });
diff --git a/test/cypress/integration/route/routeExtendedList.spec.js b/test/cypress/integration/route/routeExtendedList.spec.js
new file mode 100644
index 000000000..34d3d3a29
--- /dev/null
+++ b/test/cypress/integration/route/routeExtendedList.spec.js
@@ -0,0 +1,205 @@
+describe('Route extended list', () => {
+    const getSelector = (colField) => `tr:last-child > [data-col-field="${colField}"]`;
+
+    const selectors = {
+        worker: getSelector('workerFk'),
+        agency: getSelector('agencyModeFk'),
+        vehicle: getSelector('vehicleFk'),
+        date: getSelector('dated'),
+        description: getSelector('description'),
+        served: getSelector('isOk'),
+        lastRowSelectCheckBox: 'tbody > tr:last-child > :nth-child(1) .q-checkbox__inner',
+        removeBtn: '[title="Remove"]',
+        resetBtn: '[title="Reset"]',
+        confirmBtn: 'VnConfirm_confirm',
+        saveBtn: 'crudModelDefaultSaveBtn',
+        saveFormBtn: 'FormModelPopup_save',
+        cloneBtn: '#st-actions > .q-btn-group > :nth-child(1)',
+        downloadBtn: '#st-actions > .q-btn-group > :nth-child(2)',
+        markServedBtn: '#st-actions > .q-btn-group > :nth-child(3)',
+        searchbar: 'searchbar',
+        firstTicketsRowSelectCheckBox:
+            '.q-card > :nth-child(2) > .q-table__container > .q-table__middle > .q-table > tbody > :nth-child(1) > .q-table--col-auto-width > .q-checkbox > .q-checkbox__inner > .q-checkbox__bg > .q-checkbox__svg',
+    };
+
+    const checkboxState = {
+        check: 'check',
+        uncheck: 'close',
+    };
+    const url = '/#/route/extended-list';
+    const dataCreated = 'Data created';
+    const dataSaved = 'Data saved';
+
+    const originalFields = [
+        { selector: selectors.worker, type: 'select', value: 'logistic' },
+        { selector: selectors.agency, type: 'select', value: 'Super-Man delivery' },
+        { selector: selectors.vehicle, type: 'select', value: '3333-IMK' },
+        { selector: selectors.date, type: 'date', value: '01/02/2024' },
+        { selector: selectors.description, type: 'input', value: 'Test route' },
+        { selector: selectors.served, type: 'checkbox', value: checkboxState.uncheck },
+    ];
+
+    const updateFields = [
+        { selector: selectors.worker, type: 'select', value: 'salesperson' },
+        { selector: selectors.agency, type: 'select', value: 'inhouse pickup' },
+        { selector: selectors.vehicle, type: 'select', value: '1111-IMK' },
+        { selector: selectors.date, type: 'date', value: '01/01/2001' },
+        { selector: selectors.description, type: 'input', value: 'Description updated' },
+        { selector: selectors.served, type: 'checkbox', value: checkboxState.check },
+    ];
+
+    function fillField(selector, type, value) {
+        switch (type) {
+            case 'select':
+                cy.get(selector).should('be.visible').click();
+                cy.dataCy('null_select').clear().type(value);
+                cy.get('.q-item').contains(value).click();
+                break;
+            case 'input':
+                cy.get(selector).should('be.visible').click();
+                cy.dataCy('null_input').clear().type(`${value}{enter}`);
+                break;
+            case 'date':
+                cy.get(selector).should('be.visible').click();
+                cy.dataCy('null_inputDate').clear().type(`${value}{enter}`);
+                break;
+            case 'checkbox':
+                cy.get(selector).should('be.visible').click().click();
+                break;
+        }
+    }
+
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(url);
+        cy.typeSearchbar('{enter}');
+    });
+
+    after(() => {
+        cy.visit(url);
+        cy.typeSearchbar('{enter}');
+        cy.get(selectors.lastRowSelectCheckBox).click();
+
+        cy.get(selectors.removeBtn).click();
+        cy.dataCy(selectors.confirmBtn).click();
+    });
+
+    it('Should list routes', () => {
+        cy.get('.q-table')
+            .children()
+            .should('be.visible')
+            .should('have.length.greaterThan', 0);
+    });
+
+    it('Should create new route', () => {
+        cy.addBtnClick();
+
+        const data = {
+            Worker: { val: 'logistic', type: 'select' },
+            Agency: { val: 'Super-Man delivery', type: 'select' },
+            Vehicle: { val: '3333-IMK', type: 'select' },
+            Date: { val: '02-01-2024', type: 'date' },
+            From: { val: '01-01-2024', type: 'date' },
+            To: { val: '10-01-2024', type: 'date' },
+            'Km start': { val: 1000 },
+            'Km end': { val: 1200 },
+            Description: { val: 'Test route' },
+        };
+
+        cy.fillInForm(data);
+
+        cy.dataCy(selectors.saveFormBtn).click();
+        cy.checkNotification(dataCreated);
+        cy.url().should('include', '/summary');
+    });
+
+    it('Should reset changed values when click reset button', () => {
+        updateFields.forEach(({ selector, type, value }) => {
+            fillField(selector, type, value);
+        });
+
+        cy.get('[title="Reset"]').click();
+
+        originalFields.forEach(({ selector, value }) => {
+            cy.validateContent(selector, value);
+        });
+    });
+
+    it('Should clone selected route', () => {
+        cy.get(selectors.lastRowSelectCheckBox).click();
+        cy.get(selectors.cloneBtn).click();
+        cy.dataCy('route.Starting date_inputDate').type('10-05-2001{enter}');
+        cy.get('.q-card__actions > .q-btn--standard > .q-btn__content').click();
+        cy.validateContent(selectors.date, '05/10/2001');
+    });
+
+    it('Should download selected route', () => {
+        const downloadsFolder = Cypress.config('downloadsFolder');
+        cy.get(selectors.lastRowSelectCheckBox).click();
+        cy.get(selectors.downloadBtn).click();
+        cy.wait(5000);
+
+        const fileName = 'download.zip';
+        cy.readFile(`${downloadsFolder}/${fileName}`).should('exist');
+
+        cy.task('deleteFile', `${downloadsFolder}/${fileName}`).then((deleted) => {
+            expect(deleted).to.be.true;
+        });
+    });
+
+    it('Should mark as served the selected route', () => {
+        cy.get(selectors.lastRowSelectCheckBox).click();
+        cy.get(selectors.markServedBtn).click();
+
+        cy.typeSearchbar('{enter}');
+        cy.validateContent(selectors.served, checkboxState.check);
+    });
+
+    it('Should delete the selected route', () => {
+        cy.get(selectors.lastRowSelectCheckBox).click();
+
+        cy.get(selectors.removeBtn).click();
+        cy.dataCy(selectors.confirmBtn).click();
+
+        cy.checkNotification(dataSaved);
+    });
+
+    it('Should save changes in route', () => {
+        updateFields.forEach(({ selector, type, value }) => {
+            fillField(selector, type, value);
+        });
+
+        cy.dataCy(selectors.saveBtn).should('not.be.disabled').click();
+        cy.checkNotification(dataSaved);
+
+        cy.typeSearchbar('{enter}');
+
+        updateFields.forEach(({ selector, value }) => {
+            cy.validateContent(selector, value);
+        });
+    });
+
+    it('Should add ticket to route', () => {
+        cy.dataCy('tableAction-0').last().click();
+        cy.get(selectors.firstTicketsRowSelectCheckBox).click();
+        cy.get('.q-card__actions > .q-btn--standard > .q-btn__content').click();
+        cy.checkNotification(dataSaved);
+    });
+
+    it('Should open summary pop-up when click summuary icon', () => {
+        cy.dataCy('tableAction-1').last().click();
+        cy.get('.summaryHeader > :nth-child(2').should('contain', updateFields[4].value);
+    });
+
+    it('Should redirect to the summary from the route summary pop-up', () => {
+        cy.dataCy('tableAction-1').last().click();
+        cy.get('.header > .q-icon').should('be.visible').click();
+        cy.url().should('include', '/summary');
+    });
+
+    it('Should redirect to the summary when click go to summary icon', () => {
+        cy.dataCy('tableAction-2').last().click();
+        cy.url().should('include', '/summary');
+    });
+});
diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js
index aed8dc85a..63562bd26 100644
--- a/test/cypress/integration/ticket/ticketSale.spec.js
+++ b/test/cypress/integration/ticket/ticketSale.spec.js
@@ -1,122 +1,208 @@
 /// <reference types="cypress" />
 
 describe('TicketSale', () => {
-    beforeEach(() => {
-        cy.login('developer');
-        cy.viewport(1920, 1080);
-        cy.visit('/#/ticket/31/sale');
-    });
-
-    const firstRow = 'tbody > :nth-child(1)';
-
-    const selectFirstRow = () => {
-        cy.waitForElement(firstRow);
-        cy.get(firstRow).find('.q-checkbox__inner').click();
-    };
-
-    it('it should add item to basket', () => {
-        cy.window().then((win) => {
-            cy.stub(win, 'open').as('windowOpen');
+    describe('Free ticket #31', () => {
+        beforeEach(() => {
+            cy.login('developer');
+            cy.viewport(1920, 1080);
+            cy.visit('/#/ticket/31/sale');
         });
-        cy.dataCy('ticketSaleAddToBasketBtn').should('exist');
-        cy.dataCy('ticketSaleAddToBasketBtn').click();
-        cy.get('@windowOpen').should('be.calledWithMatch', /\/order\/\d+\/catalog/);
-    });
 
-    it('should send SMS', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-cy="sendShortageSMSItem"]');
-        cy.dataCy('sendShortageSMSItem').should('exist');
-        cy.dataCy('sendShortageSMSItem').click();
-        cy.dataCy('vnSmsDialog').should('exist');
-        cy.dataCy('sendSmsBtn').click();
-        cy.checkNotification('SMS sent');
-    });
+        const firstRow = 'tbody > :nth-child(1)';
 
-    it('should recalculate price when "Recalculate price" is clicked', () => {
-        cy.intercept('POST', '**/recalculatePrice').as('recalculatePrice');
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-cy="recalculatePriceItem"]');
-        cy.dataCy('recalculatePriceItem').should('exist');
-        cy.dataCy('recalculatePriceItem').click();
-        cy.wait('@recalculatePrice').its('response.statusCode').should('eq', 200);
-        cy.checkNotification('Data saved');
-    });
+        const selectFirstRow = () => {
+            cy.waitForElement(firstRow);
+            cy.get(firstRow).find('.q-checkbox__inner').click();
+        };
 
-    it('should update discount when "Update discount" is clicked', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-cy="updateDiscountItem"]');
-        cy.dataCy('updateDiscountItem').should('exist');
-        cy.dataCy('updateDiscountItem').click();
-        cy.waitForElement('[data-cy="ticketSaleDiscountInput"]');
-        cy.dataCy('ticketSaleDiscountInput').find('input').focus();
-        cy.dataCy('ticketSaleDiscountInput').find('input').type('10');
-        cy.dataCy('saveManaBtn').click();
-        cy.waitForElement('.q-notification__message');
-        cy.checkNotification('Data saved');
-    });
+        it('it should add item to basket', () => {
+            cy.window().then((win) => {
+                cy.stub(win, 'open').as('windowOpen');
+            });
+            cy.dataCy('ticketSaleAddToBasketBtn').should('exist');
+            cy.dataCy('ticketSaleAddToBasketBtn').click();
+            cy.get('@windowOpen').should('be.calledWithMatch', /\/order\/\d+\/catalog/);
+        });
 
-    it('adds claim', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.dataCy('createClaimItem').click();
-        cy.dataCy('VnConfirm_confirm').click();
-        cy.url().should('contain', 'claim/');
-        // Delete created claim to avoid cluttering the database
-        cy.dataCy('descriptor-more-opts').click();
-        cy.dataCy('deleteClaim').click();
-        cy.dataCy('VnConfirm_confirm').click();
-        cy.checkNotification('Data deleted');
-    });
+        it('should send SMS', () => {
+            selectFirstRow();
+            cy.dataCy('ticketSaleMoreActionsDropdown').click();
+            cy.waitForElement('[data-cy="sendShortageSMSItem"]');
+            cy.dataCy('sendShortageSMSItem').should('exist');
+            cy.dataCy('sendShortageSMSItem').click();
+            cy.dataCy('vnSmsDialog').should('exist');
+            cy.dataCy('sendSmsBtn').click();
+            cy.checkNotification('SMS sent');
+        });
 
-    it('marks row as reserved', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-cy="markAsReservedItem"]');
-        cy.dataCy('markAsReservedItem').click();
-        cy.dataCy('ticketSaleReservedIcon').should('exist');
-    });
+        it('should recalculate price when "Recalculate price" is clicked', () => {
+            cy.intercept('POST', '**/recalculatePrice').as('recalculatePrice');
+            selectFirstRow();
+            cy.dataCy('ticketSaleMoreActionsDropdown').click();
+            cy.waitForElement('[data-cy="recalculatePriceItem"]');
+            cy.dataCy('recalculatePriceItem').should('exist');
+            cy.dataCy('recalculatePriceItem').click();
+            cy.wait('@recalculatePrice').its('response.statusCode').should('eq', 200);
+            cy.checkNotification('Data saved');
+        });
 
-    it('unmarks row as reserved', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-cy="unmarkAsReservedItem"]');
-        cy.dataCy('unmarkAsReservedItem').click();
-        cy.dataCy('ticketSaleReservedIcon').should('not.exist');
-    });
+        it('should update discount when "Update discount" is clicked', () => {
+            selectFirstRow();
+            cy.dataCy('ticketSaleMoreActionsDropdown').click();
+            cy.waitForElement('[data-cy="updateDiscountItem"]');
+            cy.dataCy('updateDiscountItem').should('exist');
+            cy.dataCy('updateDiscountItem').click();
+            cy.waitForElement('[data-cy="ticketSaleDiscountInput"]');
+            cy.dataCy('ticketSaleDiscountInput').find('input').focus();
+            cy.dataCy('ticketSaleDiscountInput').find('input').type('10');
+            cy.dataCy('saveManaBtn').click();
+            cy.waitForElement('.q-notification__message');
+            cy.checkNotification('Data saved');
+        });
 
-    it('refunds row with warehouse', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.dataCy('ticketSaleRefundItem').click();
-        cy.dataCy('ticketSaleRefundWithWarehouse').click();
-        cy.checkNotification('The following refund ticket have been created');
-    });
+        it('adds claim', () => {
+            selectFirstRow();
+            cy.dataCy('ticketSaleMoreActionsDropdown').click();
+            cy.dataCy('createClaimItem').click();
+            cy.dataCy('VnConfirm_confirm').click();
+            cy.url().should('contain', 'claim/');
+            // Delete created claim to avoid cluttering the database
+            cy.dataCy('descriptor-more-opts').click();
+            cy.dataCy('deleteClaim').click();
+            cy.dataCy('VnConfirm_confirm').click();
+            cy.checkNotification('Data deleted');
+        });
 
-    it('refunds row without warehouse', () => {
-        selectFirstRow();
-        cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.dataCy('ticketSaleRefundItem').click();
-        cy.dataCy('ticketSaleRefundWithoutWarehouse').click();
-        cy.checkNotification('The following refund ticket have been created');
-    });
+        it('marks row as reserved', () => {
+            selectFirstRow();
+            cy.dataCy('ticketSaleMoreActionsDropdown').click();
+            cy.waitForElement('[data-cy="markAsReservedItem"]');
+            cy.dataCy('markAsReservedItem').click();
+            cy.dataCy('ticketSaleReservedIcon').should('exist');
+        });
 
-    it('transfer sale to a new ticket', () => {
-        cy.visit('/#/ticket/32/sale');
-        cy.get('.q-item > .q-item__label').should('have.text', ' #32');
-        selectFirstRow();
-        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');
-    });
+        it('unmarks row as reserved', () => {
+            selectFirstRow();
+            cy.dataCy('ticketSaleMoreActionsDropdown').click();
+            cy.waitForElement('[data-cy="unmarkAsReservedItem"]');
+            cy.dataCy('unmarkAsReservedItem').click();
+            cy.dataCy('ticketSaleReservedIcon').should('not.exist');
+        });
 
-    it('should redirect to ticket logs', () => {
-        cy.get(firstRow).find('.q-btn:last').click();
-        cy.url().should('match', /\/ticket\/31\/log/);
+        it('refunds row with warehouse', () => {
+            selectFirstRow();
+            cy.dataCy('ticketSaleMoreActionsDropdown').click();
+            cy.dataCy('ticketSaleRefundItem').click();
+            cy.dataCy('ticketSaleRefundWithWarehouse').click();
+            cy.checkNotification('The following refund ticket have been created');
+        });
+
+        it('refunds row without warehouse', () => {
+            selectFirstRow();
+            cy.dataCy('ticketSaleMoreActionsDropdown').click();
+            cy.dataCy('ticketSaleRefundItem').click();
+            cy.dataCy('ticketSaleRefundWithoutWarehouse').click();
+            cy.checkNotification('The following refund ticket have been created');
+        });
+
+        it('transfer sale to a new ticket', () => {
+            cy.visit('/#/ticket/32/sale');
+            cy.get('.q-item > .q-item__label').should('have.text', ' #32');
+            selectFirstRow();
+            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');
+        });
+
+        it('should redirect to ticket logs', () => {
+            cy.get(firstRow).find('.q-btn:last').click();
+            cy.url().should('match', /\/ticket\/31\/log/);
+        });
+    });
+    describe('Ticket prepared #23', () => {
+        beforeEach(() => {
+            cy.login('developer');
+            cy.viewport(1920, 1080);
+            cy.visit('/#/ticket/23/sale');
+        });
+
+        const firstRow = 'tbody > :nth-child(1)';
+
+        const selectFirstRow = () => {
+            cy.waitForElement(firstRow);
+            cy.get(firstRow).find('.q-checkbox__inner').click();
+        };
+
+        it('update price', () => {
+            const price = Number((Math.random() * 99 + 1).toFixed(2));
+            cy.waitForElement(firstRow);
+            cy.get(':nth-child(10) > .q-btn').click();
+            cy.waitForElement('[data-cy="ticketEditManaProxy"]');
+            cy.dataCy('ticketEditManaProxy').should('exist');
+            cy.waitForElement('[data-cy="Price_input"]');
+            cy.dataCy('Price_input').clear();
+            cy.dataCy('Price_input').type(price);
+            cy.dataCy('saveManaBtn').click();
+            handleVnConfirm();
+
+            cy.get(':nth-child(10) > .q-btn > .q-btn__content').should(
+                'have.text',
+                `€${price}`,
+            );
+        });
+        it('update dicount', () => {
+            const discount = Math.floor(Math.random() * 100) + 1;
+            selectFirstRow();
+            cy.get(':nth-child(11) > .q-btn').click();
+            cy.waitForElement('[data-cy="ticketEditManaProxy"]');
+            cy.dataCy('ticketEditManaProxy').should('exist');
+            cy.waitForElement('[data-cy="Disc_input"]');
+            cy.dataCy('Disc_input').clear();
+            cy.dataCy('Disc_input').type(discount);
+            cy.dataCy('saveManaBtn').click();
+            handleVnConfirm();
+
+            cy.get(':nth-child(11) > .q-btn > .q-btn__content').should(
+                'have.text',
+                `${discount}.00%`,
+            );
+        });
+
+        it('change concept', () => {
+            const quantity = 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)
+                .type('{enter}');
+            handleVnConfirm();
+
+            cy.get(':nth-child(8) >.row').should('contain.text', `${quantity}`);
+        });
+        it('changequantity ', () => {
+            const quantity = Math.floor(Math.random() * 100) + 1;
+            cy.waitForElement(firstRow);
+            cy.dataCy('ticketSaleQuantityInput').clear();
+            cy.dataCy('ticketSaleQuantityInput').type(quantity).trigger('tab');
+            cy.get('.q-page > :nth-child(6)').click();
+
+            handleVnConfirm();
+
+            cy.get('[data-cy="ticketSaleQuantityInput"]')
+                .find('[data-cy="undefined_input"]')
+                .should('have.value', `${quantity}`);
+        });
     });
 });
+
+function handleVnConfirm() {
+    cy.get('[data-cy="VnConfirm_confirm"] > .q-btn__content > .block').click();
+    cy.waitForElement('.q-notification__message');
+
+    cy.get('.q-notification__message').should('be.visible');
+    cy.checkNotification('Data saved');
+}
diff --git a/test/cypress/integration/wagon/wagonType/wagonTypeCreate.spec.js b/test/cypress/integration/wagon/wagonType/wagonTypeCreate.spec.js
index 2cd43984a..49d7d9f01 100644
--- a/test/cypress/integration/wagon/wagonType/wagonTypeCreate.spec.js
+++ b/test/cypress/integration/wagon/wagonType/wagonTypeCreate.spec.js
@@ -8,7 +8,7 @@ describe('WagonTypeCreate', () => {
 
     it('should create a new wagon type and then delete it', () => {
         cy.get('.q-page-sticky > div > .q-btn').click();
-        cy.get('input').first().type('Example for testing');
+        cy.dataCy('Name_input').type('Example for testing');
         cy.get('[data-cy="FormModelPopup_save"]').click();
         cy.get('[title="Remove"] > .q-btn__content > .q-icon').first().click();
     });
diff --git a/test/cypress/integration/worker/workerCreate.spec.js b/test/cypress/integration/worker/workerCreate.spec.js
index 7f2810395..71fd6b347 100644
--- a/test/cypress/integration/worker/workerCreate.spec.js
+++ b/test/cypress/integration/worker/workerCreate.spec.js
@@ -2,9 +2,24 @@ describe('WorkerCreate', () => {
     const externalRadio = '.q-radio:nth-child(2)';
     const developerBossId = 120;
     const payMethodCross =
-        '.grid-create .full-width > :nth-child(9) .q-select .q-field__append:not(.q-anchor--skip)';
+        ':nth-child(9) > .q-select > .q-field__inner > .q-field__control > :nth-child(2)';
     const saveBtn = '.q-mt-lg > .q-btn--standard';
 
+    const internalWithOutPay = {
+        Fi: { val: '78457139E' },
+        'Web user': { val: 'manolo' },
+        Name: { val: 'Manolo' },
+        'Last name': { val: 'Hurtado' },
+        'Personal email': { val: 'manolo@mydomain.com' },
+        Company: { val: 'VNL', type: 'select' },
+        Street: { val: 'S/ DEFAULTWORKERSTREET' },
+        Location: { val: 1, type: 'select' },
+        Phone: { val: '123456789' },
+        'Worker code': { val: 'DWW' },
+        Boss: { val: developerBossId, type: 'select' },
+        Birth: { val: '11-12-2022', type: 'date' },
+    };
+
     const internal = {
         Fi: { val: '78457139E' },
         'Web user': { val: 'manolo' },
@@ -14,6 +29,7 @@ describe('WorkerCreate', () => {
         Company: { val: 'VNL', type: 'select' },
         Street: { val: 'S/ DEFAULTWORKERSTREET' },
         Location: { val: 1, type: 'select' },
+        'Pay method': { val: 1, type: 'select' },
         Phone: { val: '123456789' },
         'Worker code': { val: 'DWW' },
         Boss: { val: developerBossId, type: 'select' },
@@ -37,17 +53,14 @@ describe('WorkerCreate', () => {
     });
 
     it('should throw an error if a pay method has not been selected', () => {
-        cy.fillInForm(internal);
+        cy.fillInForm(internalWithOutPay);
         cy.get(payMethodCross).click();
         cy.get(saveBtn).click();
         cy.checkNotification('Payment method is required');
     });
 
     it('should create an internal', () => {
-        cy.fillInForm({
-            ...internal,
-            'Pay method': { val: 'PayMethod one', type: 'select' },
-        });
+        cy.fillInForm(internal);
         cy.get(saveBtn).click();
         cy.checkNotification('Data created');
     });
diff --git a/test/cypress/integration/worker/workerNotificationsManager.spec.js b/test/cypress/integration/worker/workerNotificationsManager.spec.js
index f121b3894..ad48d8a6c 100644
--- a/test/cypress/integration/worker/workerNotificationsManager.spec.js
+++ b/test/cypress/integration/worker/workerNotificationsManager.spec.js
@@ -18,7 +18,7 @@ describe('WorkerNotificationsManager', () => {
         cy.visit(`/#/worker/${salesPersonId}/notifications`);
         cy.get(firstAvailableNotification).click();
         cy.checkNotification(
-            'The notification subscription of this worker cant be modified'
+            'The notification subscription of this worker cant be modified',
         );
     });
 
diff --git a/test/cypress/integration/worker/workerPit.spec.js b/test/cypress/integration/worker/workerPit.spec.js
index cc3a87637..19cbebc20 100644
--- a/test/cypress/integration/worker/workerPit.spec.js
+++ b/test/cypress/integration/worker/workerPit.spec.js
@@ -8,7 +8,8 @@ describe('WorkerPit', () => {
     const spousePensionInput = '[data-cy="Spouse Pension_input"]';
     const spousePension = '120';
     const addRelative = '[data-cy="addRelative"]';
-    const isDescendantSelect = '[data-cy="Descendant/Ascendant_select"]';
+    const isDescendantSelect = '[data-cy="Descendant/Ascendant"]';
+    const Descendant = 'Descendiente';
     const birthedInput = '[data-cy="Birth Year_input"]';
     const birthed = '2002';
     const adoptionYearInput = '[data-cy="Adoption Year_input"]';
@@ -28,11 +29,8 @@ describe('WorkerPit', () => {
         cy.get(spouseNifInput).type(spouseNif);
         cy.get(spousePensionInput).type(spousePension);
         cy.get(savePIT).click();
-    });
-
-    it('complete relative', () => {
         cy.get(addRelative).click();
-        cy.get(isDescendantSelect).type('{downArrow}{downArrow}{enter}');
+        cy.get(isDescendantSelect).type(Descendant);
         cy.get(birthedInput).type(birthed);
         cy.get(adoptionYearInput).type(adoptionYear);
         cy.get(saveRelative).click();
diff --git a/test/cypress/integration/zone/zoneList.spec.js b/test/cypress/integration/zone/zoneList.spec.js
index 8d01d4e4e..68e924635 100644
--- a/test/cypress/integration/zone/zoneList.spec.js
+++ b/test/cypress/integration/zone/zoneList.spec.js
@@ -1,4 +1,5 @@
 describe('ZoneList', () => {
+    const agency = 'inhouse pickup';
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
@@ -6,11 +7,15 @@ describe('ZoneList', () => {
     });
 
     it('should filter by agency', () => {
-        cy.get('input[aria-label="Agency"]').type('{downArrow}{enter}');
+        cy.dataCy('zoneFilterPanelNameInput').type('{downArrow}{enter}');
     });
 
     it('should open the zone summary', () => {
-        cy.get('input[aria-label="Name"]').type('zone refund');
-        cy.get('.q-scrollarea__content > .q-btn--standard > .q-btn__content').click();
+        cy.dataCy('zoneFilterPanelAgencySelect').type(agency);
+        cy.get('.q-menu .q-item').contains(agency).click();
+        cy.get(':nth-child(1) > [data-col-field="agencyModeFk"]').should(
+            'include.text',
+            agency,
+        );
     });
 });