diff --git a/Jenkinsfile b/Jenkinsfile
index a9db9d369..59bf09e22 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -125,7 +125,7 @@ pipeline {
                             sh "docker-compose ${env.COMPOSE_PARAMS} pull db"
                             sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
 
-                            def modules = sh(script: 'node test/cypress/docker/find/find.js', returnStdout: true).trim()
+                            def modules = sh(script: "node test/cypress/docker/find/find.js ${env.COMPOSE_TAG}", returnStdout: true).trim()
                             echo "E2E MODULES: ${modules}"
                             image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
                                 sh "sh test/cypress/docker/cypressParallel.sh 1 '${modules}'"
diff --git a/src/components/EntityCalendar.vue b/src/components/EntityCalendar.vue
new file mode 100644
index 000000000..e6e54a832
--- /dev/null
+++ b/src/components/EntityCalendar.vue
@@ -0,0 +1,152 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { date } from 'quasar';
+import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
+import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
+import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import useWeekdaysOrder from 'src/composables/getWeekdays';
+
+const formatDate = (dateToFormat, format = 'YYYY-MM-DD') => (
+  date.formatDate(dateToFormat, format)
+);
+
+
+const props = defineProps({
+    year: {
+        type: Number,
+        required: true,
+    },
+    month: {
+        type: Number,
+        required: true,
+    },
+    monthDate: {
+        type: Object,
+        default: null,
+    },
+    daysMap: {
+        type: Object,
+        default: null,
+    },
+});
+
+const emit = defineEmits(['onDateSelected']);
+
+const { locale } = useI18n();
+const weekdayStore = useWeekdayStore();
+const weekDays = useWeekdaysOrder();
+const calendarRef = ref(null);
+const today = ref(formatDate(Date.vnNew()));
+const todayTimestamp = computed(() => {
+    const date = Date.vnNew();
+    date.setHours(0, 0, 0, 0);
+    return date.getTime();
+});
+const _monthDate = computed(() => formatDate(props.monthDate));
+
+const calendarHeaderTitle = computed(() => {
+    return `${weekdayStore.getLocaleMonths[props.month - 1].locale} ${props.year}`;
+});
+
+const isToday = (timestamp) => {
+    const { year, month, day } = timestamp;
+    return todayTimestamp.value === new Date(year, month - 1, day).getTime();
+};
+
+const getEventByTimestamp = ({ year, month, day }) => {
+    const stamp = new Date(year, month - 1, day).getTime();
+    return props.daysMap?.[stamp] || null;
+};
+
+const handleDateClick = (timestamp) => {
+    const event = getEventByTimestamp(timestamp);
+    const { year, month, day } = timestamp;
+    const date = new Date(year, month - 1, day);
+    emit('onDateSelected', { 
+        date, 
+        isNewMode: !event,
+        event: event?.[0] || null 
+    });
+};
+
+const getEventAttrs = (timestamp) => {
+    return {
+        class: '--event',
+        label: timestamp.day,
+    };
+};
+
+defineExpose({ getEventByTimestamp, handleDateClick });
+</script>
+
+<template>
+    <QCalendarMonthWrapper
+        style="height: 290px; width: 290px"
+        transparent-background
+        view-customization="workerCalendar"
+    >
+        <template #header>
+            <span class="full-width text-center text-body1 q-py-sm">{{
+                calendarHeaderTitle
+            }}</span>
+        </template>
+        <template #calendar>
+            <QCalendarMonth
+                ref="calendarRef"
+                :model-value="_monthDate"
+                show-work-weeks
+                no-outside-days
+                no-active-date
+                :weekdays="weekDays"
+                short-weekday-label
+                :locale="locale"
+                :now="today"
+                @click-date="handleDateClick($event.scope.timestamp)"
+                mini-mode
+            >
+                <template #day="{ scope: { timestamp } }">
+                    <slot name="day" :timestamp="timestamp" :getEventAttrs="getEventAttrs">
+                        <QBtn
+                            v-if="getEventByTimestamp(timestamp)"
+                            v-bind="{ ...getEventAttrs(timestamp) }"
+                            @click="handleDateClick(timestamp)"
+                            rounded
+                            dense
+                            flat
+                            class="calendar-event"
+                            :class="{ '--today': isToday(timestamp) }"
+                        />
+                    </slot>
+                </template>
+            </QCalendarMonth>
+        </template>
+    </QCalendarMonthWrapper>
+</template>
+
+<style lang="scss">
+.calendar-event {
+    display: flex;
+    justify-content: center;
+    width: 32px;
+    height: 32px;
+    font-size: 13px;
+    line-height: 1.715em;
+    cursor: pointer;
+    color: white;
+
+    &.--today {
+        border: 2px solid $info;
+    }
+
+    &.--event {
+        background-color: $positive;
+        color: black;
+    }
+
+    &:hover {
+        opacity: 0.8;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/EntityCalendarGrid.vue b/src/components/EntityCalendarGrid.vue
new file mode 100644
index 000000000..09ccaad07
--- /dev/null
+++ b/src/components/EntityCalendarGrid.vue
@@ -0,0 +1,126 @@
+<script setup>
+import { computed, onMounted, ref, onUnmounted, nextTick } from 'vue';
+import { useStateStore } from 'stores/useStateStore';
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import { useArrayData } from 'src/composables/useArrayData';
+
+const props = defineProps({
+  dataKey: {
+    type: String,
+    required: true,
+  },
+  calendarComponent: {
+    type: Object,
+    required: true,
+  },
+  additionalProps: {
+    type: Object,
+    default: () => ({}),
+  }
+});
+
+const stateStore = useStateStore();
+const weekdayStore = useWeekdayStore();
+const nMonths = ref(4);
+const _date = ref(Date.vnNew());
+const firstDay = ref(Date.vnNew());
+const lastDay = ref(Date.vnNew());
+const months = ref([]);
+const arrayData = useArrayData(props.dataKey);
+onMounted(async () => {
+  const initialDate = Date.vnNew();
+  initialDate.setDate(1);
+  initialDate.setHours(0, 0, 0, 0);
+  date.value = initialDate;
+  await nextTick();
+  stateStore.rightDrawer = true;
+});
+
+onUnmounted(() => arrayData.destroy());
+
+const emit = defineEmits([
+  'update:firstDay',
+  'update:lastDay',
+  'update:events',
+  'onDateSelected',
+]);
+
+const date = computed({
+  get: () => _date.value,
+  set: (value) => {
+    if (!(value instanceof Date)) return;
+    _date.value = value;
+    const stamp = value.getTime();
+
+    firstDay.value = new Date(stamp);
+    firstDay.value.setDate(1);
+
+    lastDay.value = new Date(stamp);
+    lastDay.value.setMonth(lastDay.value.getMonth() + nMonths.value);
+    lastDay.value.setDate(0);
+
+    months.value = [];
+    for (let i = 0; i < nMonths.value; i++) {
+      const monthDate = new Date(stamp);
+      monthDate.setMonth(value.getMonth() + i);
+      months.value.push(monthDate);
+    }
+
+    emit('update:firstDay', firstDay.value);
+    emit('update:lastDay', lastDay.value);
+    emit('refresh-events');
+  },
+});
+
+const headerTitle = computed(() => {
+  if (!months.value?.length) return '';
+  const getMonthName = date => 
+    `${weekdayStore.getLocaleMonths[date.getMonth()].locale} ${date.getFullYear()}`;
+  return `${getMonthName(months.value[0])} - ${getMonthName(months.value[months.value.length - 1])}`;
+});
+
+const step = (direction) => {
+  const newDate = new Date(date.value);
+  newDate.setMonth(newDate.getMonth() + nMonths.value * direction);
+  date.value = newDate;
+};
+
+defineExpose({
+    firstDay,
+    lastDay
+});
+</script>
+
+<template>
+  <QCard style="height: max-content">
+    <div class="calendars-header">
+      <QBtn
+        icon="arrow_left"
+        size="sm"
+        flat
+        class="full-height"
+        @click="step(-1)"
+      />
+      <span>{{ headerTitle }}</span>
+      <QBtn
+        icon="arrow_right"
+        size="sm"
+        flat
+        class="full-height"
+        @click="step(1)"
+      />
+    </div>
+    <div class="calendars-container">
+      <component
+        :is="calendarComponent"
+        v-for="(month, index) in months"
+        :key="index"
+        :month="month.getMonth() + 1"
+        :year="month.getFullYear()"
+        :month-date="month"
+        v-bind="additionalProps"
+        @on-date-selected="data => emit('onDateSelected', data)"
+      />
+    </div>
+  </QCard>
+</template>
\ No newline at end of file
diff --git a/src/components/FilterTravelForm.vue b/src/components/FilterTravelForm.vue
index 4aad327b2..f2a7a09eb 100644
--- a/src/components/FilterTravelForm.vue
+++ b/src/components/FilterTravelForm.vue
@@ -156,6 +156,9 @@ const selectTravel = ({ id }) => {
                     option-label="name"
                     option-value="id"
                     v-model="travelFilterParams.warehouseOutFk"
+                    :where="{
+                        isOrigin: true,
+                    }"
                 />
                 <VnSelect
                     :label="t('globals.warehouseIn')"
@@ -164,6 +167,9 @@ const selectTravel = ({ id }) => {
                     option-label="name"
                     option-value="id"
                     v-model="travelFilterParams.warehouseInFk"
+                    :where="{
+                        isDestiny: true,
+                    }"
                 />
                 <VnInputDate
                     :label="t('globals.shipped')"
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 2d8b2fe8f..43a792845 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -100,7 +100,7 @@ const $props = defineProps({
     },
     preventSubmit: {
         type: Boolean,
-        default: true,
+        default: false,
     },
 });
 const emit = defineEmits(['onFetch', 'onDataSaved', 'submit']);
diff --git a/src/components/RegularizeStockForm.vue b/src/components/RegularizeStockForm.vue
index 91a2e5d39..340a18f9d 100644
--- a/src/components/RegularizeStockForm.vue
+++ b/src/components/RegularizeStockForm.vue
@@ -40,6 +40,9 @@ const onDataSaved = (data) => {
         url="Warehouses"
         @on-fetch="(data) => (warehousesOptions = data)"
         auto-load
+        :where="{
+            isInventory: true,
+        }"
     />
     <FormModelPopup
         url-create="Items/regularize"
diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index 82d7c772c..bdba421da 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -1,6 +1,6 @@
 <script setup>
-import { markRaw, computed } from 'vue';
-import { QCheckbox, QToggle } from 'quasar';
+import { markRaw, computed, onBeforeMount } from 'vue';
+import { QToggle } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'components/common/VnInput.vue';
@@ -150,6 +150,16 @@ const showFilter = computed(
 const onTabPressed = async () => {
     if (model.value) enterEvent['keyup.enter']();
 };
+
+onBeforeMount(() => {
+    const columnFilter = $props.column?.columnFilter;
+    const component = columnFilter?.component;
+    const defaultComponent = components[component];
+    const events = { update: updateEvent, enter: enterEvent };
+
+    if (!columnFilter || defaultComponent) return;
+    $props.column.columnFilter.event = events[columnFilter.event];
+});
 </script>
 <template>
     <div v-if="showFilter" class="full-width" style="overflow: hidden">
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 7e9ab85cb..8915500fc 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -33,7 +33,8 @@ import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
 import VnTableFilter from './VnTableFilter.vue';
 import { getColAlign } from 'src/composables/getColAlign';
 import RightMenu from '../common/RightMenu.vue';
-import VnScroll from '../common/VnScroll.vue'
+import VnScroll from '../common/VnScroll.vue';
+import VnMultiCheck from '../common/VnMultiCheck.vue';
 
 const arrayData = useArrayData(useAttrs()['data-key']);
 const $props = defineProps({
@@ -113,6 +114,10 @@ const $props = defineProps({
         type: Object,
         default: () => ({}),
     },
+    multiCheck: {
+        type: Object,
+        default: () => ({}),
+    },
     crudModel: {
         type: Object,
         default: () => ({}),
@@ -157,6 +162,7 @@ const CARD_MODE = 'card';
 const TABLE_MODE = 'table';
 const mode = ref(CARD_MODE);
 const selected = ref([]);
+const selectAll = ref(false);
 const hasParams = ref(false);
 const CrudModelRef = ref({});
 const showForm = ref(false);
@@ -195,10 +201,10 @@ const onVirtualScroll = ({ to }) => {
     handleScroll();
     const virtualScrollContainer = tableRef.value?.$el?.querySelector('.q-table__middle');
     if (virtualScrollContainer) {
-      virtualScrollContainer.dispatchEvent(new CustomEvent('scroll'));
-      if (vnScrollRef.value) {
-        vnScrollRef.value.updateScrollContainer(virtualScrollContainer);
-      }
+        virtualScrollContainer.dispatchEvent(new CustomEvent('scroll'));
+        if (vnScrollRef.value) {
+            vnScrollRef.value.updateScrollContainer(virtualScrollContainer);
+        }
     }
 };
 
@@ -341,11 +347,11 @@ function handleOnDataSaved(_) {
     else $props.create.onDataSaved(_);
 }
 function handleScroll() {
-    if ($props.crudModel.disableInfiniteScroll) return;		
-    const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');		
-    const { scrollHeight, scrollTop, clientHeight } = tMiddle;		
-    const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;		
-    if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();		
+    if ($props.crudModel.disableInfiniteScroll) return;
+    const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
+    const { scrollHeight, scrollTop, clientHeight } = tMiddle;
+    const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
+    if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
 }
 function handleSelection({ evt, added, rows: selectedRows }, rows) {
     if (evt?.shiftKey && added) {
@@ -638,6 +644,23 @@ const rowCtrlClickFunction = computed(() => {
         };
     return () => {};
 });
+const handleMultiCheck = (value) => {
+    if (value) {
+        selected.value = tableRef.value.rows;
+    } else {
+        selected.value = [];
+    }
+    emit('update:selected', selected.value);
+};
+
+const handleSelectedAll = (data) => {
+    if (data) {
+        selected.value = data;
+    } else {
+        selected.value = [];
+    }
+    emit('update:selected', selected.value);
+};
 </script>
 <template>
     <RightMenu v-if="$props.rightSearch" :overlay="overlay">
@@ -679,9 +702,9 @@ const rowCtrlClickFunction = computed(() => {
                 ref="tableRef"
                 v-bind="table"
                 :class="[
-                  'vnTable',
-                  table ? 'selection-cell' : '',
-                  $props.footer ? 'last-row-sticky' : '',
+                    'vnTable',
+                    table ? 'selection-cell' : '',
+                    $props.footer ? 'last-row-sticky' : '',
                 ]"
                 wrap-cells
                 :columns="splittedColumns.columns"
@@ -700,6 +723,17 @@ const rowCtrlClickFunction = computed(() => {
                 :hide-selected-banner="true"
                 :data-cy
             >
+                <template #header-selection>
+                    <VnMultiCheck
+                        :searchUrl="searchUrl"
+                        :expand="$props.multiCheck.expand"
+                        v-model="selectAll"
+                        :url="$attrs['url']"
+                        @update:selected="handleMultiCheck"
+                        @select:all="handleSelectedAll"
+                    ></VnMultiCheck>
+                </template>
+
                 <template #top-left v-if="!$props.withoutHeader">
                     <slot name="top-left"> </slot>
                 </template>
@@ -1098,10 +1132,10 @@ const rowCtrlClickFunction = computed(() => {
             </template>
         </FormModelPopup>
     </QDialog>
-    <VnScroll 
-      ref="vnScrollRef"
-      v-if="isTableMode"
-      :scroll-target="tableRef?.$el?.querySelector('.q-table__middle')"
+    <VnScroll
+        ref="vnScrollRef"
+        v-if="isTableMode"
+        :scroll-target="tableRef?.$el?.querySelector('.q-table__middle')"
     />
 </template>
 <i18n>
diff --git a/src/components/common/VnBankDetailsForm.vue b/src/components/common/VnBankDetailsForm.vue
new file mode 100644
index 000000000..4e13a4d86
--- /dev/null
+++ b/src/components/common/VnBankDetailsForm.vue
@@ -0,0 +1,93 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnInput from 'src/components/common/VnInput.vue';
+import FetchData from '../FetchData.vue';
+import VnSelectDialog from './VnSelectDialog.vue';
+
+import CreateBankEntityForm from '../CreateBankEntityForm.vue';
+
+const $props = defineProps({
+    iban: {
+        type: String,
+        default: null,
+    },
+    bankEntityFk: {
+        type: Number,
+        default: null,
+    },
+    disableElement: {
+        type: Boolean,
+        default: false,
+    },
+});
+const filter = {
+    fields: ['id', 'bic', 'name'],
+    order: 'bic ASC',
+};
+const { t } = useI18n();
+const emit = defineEmits(['updateBic']);
+const iban = ref($props.iban);
+const bankEntityFk = ref($props.bankEntityFk);
+const bankEntities = ref([]);
+
+const autofillBic = async (bic) => {
+    if (!bic) return;
+    const bankEntityId = parseInt(bic.substr(4, 4));
+    const ibanCountry = bic.substr(0, 2);
+    if (ibanCountry != 'ES') return;
+
+    const existBank = bankEntities.value.find((b) => b.id === bankEntityId);
+    bankEntityFk.value = existBank ? bankEntityId : null;
+    emit('updateBic', { iban: iban.value, bankEntityFk: bankEntityFk.value });
+};
+
+const getBankEntities = (data) => {
+    bankEntityFk.value = data.id;
+};
+</script>
+<template>
+    <FetchData
+        url="BankEntities"
+        :filter="filter"
+        auto-load
+        @on-fetch="(data) => (bankEntities = data)"
+    />
+    <VnInput
+        :label="t('IBAN')"
+        clearable
+        v-model="iban"
+        @update:model-value="autofillBic($event)"
+        :disable="disableElement"
+    >
+        <template #append>
+            <QIcon name="info" class="cursor-info">
+                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
+            </QIcon>
+        </template>
+    </VnInput>
+    <VnSelectDialog
+        :label="t('Swift / BIC')"
+        :acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
+        :options="bankEntities"
+        hide-selected
+        option-label="name"
+        option-value="id"
+        v-model="bankEntityFk"
+        @update:model-value="$emit('updateBic', { iban, bankEntityFk })"
+        :disable="disableElement"
+    >
+        <template #form>
+            <CreateBankEntityForm @on-data-saved="getBankEntities($event)" />
+        </template>
+        <template #option="scope">
+            <QItem v-bind="scope.itemProps">
+                <QItemSection v-if="scope.opt">
+                    <QItemLabel>{{ scope.opt.bic }} </QItemLabel>
+                    <QItemLabel caption> {{ scope.opt.name }}</QItemLabel>
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnSelectDialog>
+</template>
diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 345870aa4..d175a4167 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { useQuasar, QCheckbox, QBtn, QInput } from 'quasar';
 import axios from 'axios';
+import { usePrintService } from 'composables/usePrintService';
 
 import VnUserLink from '../ui/VnUserLink.vue';
 import { downloadFile } from 'src/composables/downloadFile';
@@ -23,6 +24,7 @@ const rows = ref([]);
 const dmsRef = ref();
 const formDialog = ref({});
 const token = useSession().getTokenMultimedia();
+const { openReport } = usePrintService();
 
 const $props = defineProps({
     model: {
@@ -199,12 +201,7 @@ const columns = computed(() => [
                     color: 'primary',
                 }),
                 click: (prop) =>
-                    downloadFile(
-                        prop.row.id,
-                        $props.downloadModel,
-                        undefined,
-                        prop.row.download,
-                    ),
+                    openReport(`dms/${prop.row.id}/downloadFile`, {}, '_blank'),
             },
             {
                 component: QBtn,
diff --git a/src/components/common/VnInputBic.vue b/src/components/common/VnInputBic.vue
deleted file mode 100644
index b29644912..000000000
--- a/src/components/common/VnInputBic.vue
+++ /dev/null
@@ -1,44 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import axios from 'axios';
-
-import VnInput from 'src/components/common/VnInput.vue';
-
-const { t } = useI18n();
-const model = defineModel({ type: [Number, String] });
-const emit = defineEmits(['updateBic']);
-
-const getIbanCountry = (bank) => {
-    return bank.substr(0, 2);
-};
-
-const autofillBic = async (iban) => {
-    if (!iban) return;
-
-    const bankEntityId = parseInt(iban.substr(4, 4));
-    const ibanCountry = getIbanCountry(iban);
-
-    if (ibanCountry != 'ES') return;
-
-    const filter = { where: { id: bankEntityId } };
-    const params = { filter: JSON.stringify(filter) };
-
-    const { data } = await axios.get(`BankEntities`, { params });
-
-    emit('updateBic', data[0]?.id);
-};
-</script>
-<template>
-    <VnInput
-        :label="t('IBAN')"
-        clearable
-        v-model="model"
-        @update:model-value="autofillBic($event)"
-    >
-        <template #append>
-            <QIcon name="info" class="cursor-info">
-                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
-            </QIcon>
-        </template>
-    </VnInput>
-</template>
diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 7020c8489..6e9128a43 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onUnmounted, watch, computed } from 'vue';
+import { ref, onMounted, onUnmounted, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import axios from 'axios';
diff --git a/src/components/common/VnMultiCheck.vue b/src/components/common/VnMultiCheck.vue
new file mode 100644
index 000000000..19b93ffa9
--- /dev/null
+++ b/src/components/common/VnMultiCheck.vue
@@ -0,0 +1,80 @@
+<script setup>
+import { ref } from 'vue';
+import VnCheckbox from './VnCheckbox.vue';
+import axios from 'axios';
+import { toRaw } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+const route = useRoute();
+const { t } = useI18n();
+const model = defineModel({ type: [Boolean] });
+const props = defineProps({
+    expand: {
+        type: Boolean,
+        default: false,
+    },
+    url: {
+        type: String,
+        default: null,
+        required: true,
+    },
+    searchUrl: {
+        type: [String, Boolean],
+        default: 'table',
+    },
+});
+const value = ref(false);
+const rows = ref(0);
+const onClick = () => {
+    if (value.value) {
+        const { filter } = JSON.parse(route.query[props.searchUrl]);
+        filter.limit = 0;
+        const params = {
+            params: { filter: JSON.stringify(filter) },
+        };
+        axios
+            .get(props.url, params)
+            .then(({ data }) => {
+                rows.value = data;
+            })
+            .catch(console.error);
+    }
+};
+defineEmits(['update:selected', 'select:all']);
+</script>
+
+<template>
+    <div style="display: flex">
+        <VnCheckbox v-model="value" @click="$emit('update:selected', value)" />
+        <QBtn
+            v-if="value && $props.expand"
+            flat
+            dense
+            icon="expand_more"
+            @click="onClick"
+        >
+            <QMenu anchor="bottom right" self="top right">
+                <QList>
+                    <QItem v-ripple clickable @click="$emit('select:all', toRaw(rows))">
+                        {{ t('Select all', { rows: rows.length }) }}
+                    </QItem>
+                    <slot name="more-options"></slot>
+                </QList>
+            </QMenu>
+        </QBtn>
+    </div>
+</template>
+<i18n lang="yml">
+en:
+    Select all: 'Select all ({rows})'
+fr:
+    Select all: 'Sélectionner tout ({rows})'
+es:
+    Select all: 'Seleccionar todo ({rows})'
+de:
+    Select all: 'Alle auswählen ({rows})'
+it:
+    Select all: 'Seleziona tutto ({rows})'
+pt:
+    Select all: 'Selecionar tudo ({rows})'
+</i18n>
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 96e45d3ef..2cb72261f 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -368,7 +368,6 @@ function getCaption(opt) {
         hide-bottom-space
         :input-debounce="useURL ? '300' : '0'"
         :loading="someIsLoading"
-        :disable="someIsLoading"
         @virtual-scroll="onScroll"
         @keydown="handleKeyDown"
         :data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
@@ -376,7 +375,7 @@ function getCaption(opt) {
     >
         <template #append>
             <QIcon
-                v-show="isClearable && value"
+                v-show="isClearable && value != null && value !== ''"
                 name="close"
                 @click="
                     () => {
@@ -391,7 +390,7 @@ function getCaption(opt) {
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
             <div v-if="slotName == 'append'">
                 <QIcon
-                    v-show="isClearable && value"
+                    v-show="isClearable && value != null && value !== ''"
                     name="close"
                     @click.stop="
                         () => {
@@ -416,7 +415,7 @@ function getCaption(opt) {
                     <QItemLabel>
                         {{ opt[optionLabel] }}
                     </QItemLabel>
-                    <QItemLabel caption v-if="getCaption(opt)">
+                    <QItemLabel caption v-if="getCaption(opt) !== false">
                         {{ `#${getCaption(opt)}` }}
                     </QItemLabel>
                 </QItemSection>
diff --git a/src/components/common/__tests__/VnBankDetailsForm.spec.js b/src/components/common/__tests__/VnBankDetailsForm.spec.js
new file mode 100644
index 000000000..9d6ade902
--- /dev/null
+++ b/src/components/common/__tests__/VnBankDetailsForm.spec.js
@@ -0,0 +1,43 @@
+import { createWrapper } from 'app/test/vitest/helper';
+import VnBankDetailsForm from 'components/common/VnBankDetailsForm.vue';
+import { vi, afterEach, expect, it, beforeEach, describe } from 'vitest';
+
+describe('VnBankDetail Component', () => {
+    let vm;
+    let wrapper;
+    const bankEntities = [
+        { id: 2100, bic: 'CAIXESBBXXX', name: 'CaixaBank' },
+        { id: 1234, bic: 'TESTBIC', name: 'Test Bank' },
+    ];
+    const correctIban = 'ES6621000418401234567891';
+
+    beforeAll(() => {
+        wrapper = createWrapper(VnBankDetailsForm, {
+            $props: {
+                iban: null,
+                bankEntityFk: null,
+                disableElement: false,
+            },
+        });
+        vm = wrapper.vm;
+        wrapper = wrapper.wrapper;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should update bankEntityFk when IBAN exists in bankEntities', async () => {
+        vm.bankEntities = bankEntities;
+
+        await vm.autofillBic(correctIban);
+        expect(vm.bankEntityFk).toBe(2100);
+    });
+
+    it('should set bankEntityFk to null when IBAN bank code is not found', async () => {
+        vm.bankEntities = bankEntities;
+
+        await vm.autofillBic('ES1234567891324567891234');
+        expect(vm.bankEntityFk).toBe(null);
+    });
+});
diff --git a/src/components/ui/EntityDescriptor.vue b/src/components/ui/EntityDescriptor.vue
index 751a6bd9c..e4baabe34 100644
--- a/src/components/ui/EntityDescriptor.vue
+++ b/src/components/ui/EntityDescriptor.vue
@@ -1,8 +1,6 @@
 <script setup>
-import { onBeforeMount, watch, computed, ref } from 'vue';
+import { watch, ref, onMounted } from 'vue';
 import { useArrayData } from 'composables/useArrayData';
-import { useState } from 'src/composables/useState';
-import { useRoute } from 'vue-router';
 import VnDescriptor from './VnDescriptor.vue';
 
 const $props = defineProps({
@@ -20,39 +18,50 @@ const $props = defineProps({
     },
 });
 
-const state = useState();
-const route = useRoute();
 let arrayData;
 let store;
-let entity;
+const entity = ref();
 const isLoading = ref(false);
-const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
-defineExpose({ getData });
+const containerRef = ref(null);
 
-onBeforeMount(async () => {
-    arrayData = useArrayData($props.dataKey, {
+onMounted(async () => {
+    let isPopup;
+    let el = containerRef.value.$el;
+    while (el) {
+        if (el.classList?.contains('q-menu')) {
+            isPopup = true;
+            break;
+        }
+        el = el.parentElement;
+    }
+
+    arrayData = useArrayData($props.dataKey + (isPopup ? 'Proxy' : ''), {
         url: $props.url,
         userFilter: $props.filter,
         skip: 0,
         oneRecord: true,
     });
     store = arrayData.store;
-    entity = computed(() => {
-        const data = store.data ?? {};
-        if (data) emit('onFetch', data);
-        return data;
-    });
 
-    // It enables to load data only once if the module is the same as the dataKey
-    if (!isSameDataKey.value || !route.params.id) await getData();
     watch(
         () => [$props.url, $props.filter],
         async () => {
-            if (!isSameDataKey.value) await getData();
+            await getData();
+        },
+        { immediate: true },
+    );
+
+    watch(
+        () => arrayData.store.data,
+        (newValue) => {
+            entity.value = newValue;
         },
     );
 });
 
+defineExpose({ getData });
+const emit = defineEmits(['onFetch']);
+
 async function getData() {
     store.url = $props.url;
     store.filter = $props.filter ?? {};
@@ -60,18 +69,15 @@ async function getData() {
     try {
         await arrayData.fetch({ append: false, updateRouter: false });
         const { data } = store;
-        state.set($props.dataKey, data);
         emit('onFetch', data);
     } finally {
         isLoading.value = false;
     }
 }
-
-const emit = defineEmits(['onFetch']);
 </script>
 
 <template>
-    <VnDescriptor v-model="entity" v-bind="$attrs" :module="dataKey">
+    <VnDescriptor v-model="entity" v-bind="$attrs" :module="dataKey" ref="containerRef">
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
             <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
         </template>
diff --git a/src/components/ui/VnConfirm.vue b/src/components/ui/VnConfirm.vue
index c6f539879..5714db9b2 100644
--- a/src/components/ui/VnConfirm.vue
+++ b/src/components/ui/VnConfirm.vue
@@ -89,24 +89,26 @@ function cancel() {
                 <slot name="customHTML"></slot>
             </QCardSection>
             <QCardActions align="right">
-                <QBtn
-                    :label="t('globals.cancel')"
-                    color="primary"
-                    :disable="isLoading"
-                    flat
-                    @click="cancel()"
-                    data-cy="VnConfirm_cancel"
-                />
-                <QBtn
-                    :label="t('globals.confirm')"
-                    :title="t('globals.confirm')"
-                    color="primary"
-                    :loading="isLoading"
-                    @click="confirm()"
-                    unelevated
-                    autofocus
-                    data-cy="VnConfirm_confirm"
-                />
+                <slot name="actions" :actions="{ confirm, cancel }">
+                    <QBtn
+                        :label="t('globals.cancel')"
+                        color="primary"
+                        :disable="isLoading"
+                        flat
+                        @click="cancel()"
+                        data-cy="VnConfirm_cancel"
+                    />
+                    <QBtn
+                        :label="t('globals.confirm')"
+                        :title="t('globals.confirm')"
+                        color="primary"
+                        :loading="isLoading"
+                        @click="confirm()"
+                        unelevated
+                        autofocus
+                        data-cy="VnConfirm_confirm"
+                    />
+                </slot>
             </QCardActions>
         </QCard>
     </QDialog>
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index b232e6c05..8a3c5a616 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -222,7 +222,7 @@ defineExpose({
 </script>
 
 <template>
-    <div class="full-width" v-bind="attrs">
+    <div class="full-width">
         <div
             v-if="!store.data && !store.data?.length && !isLoading"
             class="info-row q-pa-md text-center"
diff --git a/src/composables/getWeekdays.js b/src/composables/getWeekdays.js
new file mode 100644
index 000000000..d619103da
--- /dev/null
+++ b/src/composables/getWeekdays.js
@@ -0,0 +1,10 @@
+import { ref } from 'vue';
+import moment from 'moment';
+
+export default function useWeekdaysOrder() {
+
+  const firstDay = moment().weekday(1).day();
+  const weekdays = [...Array(7).keys()].map(i => (i + firstDay) % 7);
+
+  return ref(weekdays);
+}
diff --git a/src/css/app.scss b/src/css/app.scss
index dd5dbe247..351eeb599 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -343,3 +343,20 @@ input::-webkit-inner-spin-button {
 .q-item__section--main ~ .q-item__section--side {
     padding-inline: 0;
 }
+
+.calendars-header {
+    height: 45px;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    background-color: $primary;
+    font-weight: bold;
+    font-size: 16px;
+}
+
+.calendars-container {
+    max-width: 800px;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-evenly;
+}
\ No newline at end of file
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 5f21ea15e..3c1c80954 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -346,6 +346,7 @@ globals:
         parking: Parking
         vehicleList: Vehicles
         vehicle: Vehicle
+        entryPreAccount: Pre-account
     unsavedPopup:
         title: Unsaved changes will be lost
         subtitle: Are you sure exit without saving?
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index fcaac9790..518985831 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -349,6 +349,7 @@ globals:
         parking: Parking
         vehicleList: Vehículos
         vehicle: Vehículo
+        entryPreAccount: Precontabilizar
     unsavedPopup:
         title: Los cambios que no haya guardado se perderán
         subtitle: ¿Seguro que quiere salir sin guardar?
diff --git a/src/pages/Account/Card/AccountDescriptorProxy.vue b/src/pages/Account/Card/AccountDescriptorProxy.vue
index 6a4b3e267..b7bbc1ef9 100644
--- a/src/pages/Account/Card/AccountDescriptorProxy.vue
+++ b/src/pages/Account/Card/AccountDescriptorProxy.vue
@@ -4,11 +4,6 @@ import AccountSummary from './AccountSummary.vue';
 </script>
 <template>
     <QPopupProxy style="max-width: 10px">
-        <AccountDescriptor
-            v-if="$attrs.id"
-            v-bind="$attrs"
-            :summary="AccountSummary"
-            :proxy-render="true"
-        />
+        <AccountDescriptor v-if="$attrs.id" v-bind="$attrs" :summary="AccountSummary" />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 3728a18c0..01937a87a 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDateHourMinSec, toPercentage } from 'src/filters';
@@ -9,7 +9,6 @@ import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/Departme
 import EntityDescriptor from 'components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
-import { getUrl } from 'src/composables/getUrl';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import filter from './ClaimFilter.js';
 
@@ -23,7 +22,6 @@ const $props = defineProps({
 
 const route = useRoute();
 const { t } = useI18n();
-const salixUrl = ref();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
@@ -31,10 +29,6 @@ const entityId = computed(() => {
 function stateColor(entity) {
     return entity?.claimState?.classColor;
 }
-
-onMounted(async () => {
-    salixUrl.value = await getUrl('');
-});
 </script>
 
 <template>
@@ -126,7 +120,7 @@ onMounted(async () => {
                     size="md"
                     icon="assignment"
                     color="primary"
-                    :href="salixUrl + 'ticket/' + entity.ticketFk + '/sale-tracking'"
+                    :to="{ name: 'TicketSaleTracking', params: { id: entity.ticketFk } }"
                 >
                     <QTooltip>{{ t('claim.saleTracking') }}</QTooltip>
                 </QBtn>
@@ -134,7 +128,7 @@ onMounted(async () => {
                     size="md"
                     icon="visibility"
                     color="primary"
-                    :href="salixUrl + 'ticket/' + entity.ticketFk + '/tracking/index'"
+                    :to="{ name: 'TicketTracking', params: { id: entity.ticketFk } }"
                 >
                     <QTooltip>{{ t('claim.ticketTracking') }}</QTooltip>
                 </QBtn>
diff --git a/src/pages/Claim/Card/ClaimDescriptorProxy.vue b/src/pages/Claim/Card/ClaimDescriptorProxy.vue
index 78e686745..f4eff0843 100644
--- a/src/pages/Claim/Card/ClaimDescriptorProxy.vue
+++ b/src/pages/Claim/Card/ClaimDescriptorProxy.vue
@@ -4,11 +4,6 @@ import ClaimSummary from './ClaimSummary.vue';
 </script>
 <template>
     <QPopupProxy style="max-width: 10px">
-        <ClaimDescriptor
-            v-if="$attrs.id"
-            v-bind="$attrs.id"
-            :summary="ClaimSummary"
-            :proxy-render="true"
-        />
+        <ClaimDescriptor v-if="$attrs.id" v-bind="$attrs" :summary="ClaimSummary" />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue
index f1799d0cc..418c4ec30 100644
--- a/src/pages/Customer/Card/CustomerAddress.vue
+++ b/src/pages/Customer/Card/CustomerAddress.vue
@@ -77,10 +77,10 @@ const isDefaultAddress = (address) => {
     return client?.value?.defaultAddressFk === address.id ? 1 : 0;
 };
 
-const setDefault = (address) => {
+const setDefault = async (address) => {
     const url = `Clients/${route.params.id}`;
     const payload = { defaultAddressFk: address.id };
-    axios.patch(url, payload).then((res) => {
+    await axios.patch(url, payload).then((res) => {
         if (res.data) {
             client.value.defaultAddressFk = res.data.defaultAddressFk;
             sortAddresses();
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index e4b6f8365..fdcbf75d4 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -1,5 +1,4 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -7,29 +6,15 @@ import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
-import VnInputBic from 'src/components/common/VnInputBic.vue';
+import VnBankDetailsForm from 'src/components/common/VnBankDetailsForm.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-
-const bankEntitiesRef = ref(null);
-
-const filter = {
-    fields: ['id', 'bic', 'name'],
-    order: 'bic ASC',
-};
-
-const getBankEntities = (data, formData) => {
-    bankEntitiesRef.value.fetch();
-    formData.bankEntityFk = Number(data.id);
-};
 </script>
 
 <template>
     <FormModel :url-update="`Clients/${route.params.id}`" auto-load model="Customer">
-        <template #form="{ data, validate }">
+        <template #form="{ data }">
             <VnRow>
                 <VnSelect
                     auto-load
@@ -42,42 +27,19 @@ const getBankEntities = (data, formData) => {
                 />
                 <VnInput :label="t('Due day')" clearable v-model="data.dueDay" />
             </VnRow>
-
             <VnRow>
-                <VnInputBic
-                    :label="t('IBAN')"
-                    v-model="data.iban"
-                    @update-bic="(bankEntityFk) => (data.bankEntityFk = bankEntityFk)"
+                <VnBankDetailsForm
+                    v-model:iban="data.iban"
+                    v-model:bankEntityFk="data.bankEntityFk"
+                    @update-bic="
+                        ({ iban, bankEntityFk }) => {
+                            if (!iban || !bankEntityFk) return;
+                            data.iban = iban;
+                            data.bankEntityFk = bankEntityFk;
+                        }
+                    "
                 />
-                <VnSelectDialog
-                    :label="t('Swift / BIC')"
-                    ref="bankEntitiesRef"
-                    :filter="filter"
-                    auto-load
-                    url="BankEntities"
-                    :acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
-                    :rules="validate('Worker.bankEntity')"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="data.bankEntityFk"
-                >
-                    <template #form>
-                        <CreateBankEntityForm
-                            @on-data-saved="getBankEntities($event, data)"
-                        />
-                    </template>
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection v-if="scope.opt">
-                                <QItemLabel>{{ scope.opt.bic }} </QItemLabel>
-                                <QItemLabel caption> {{ scope.opt.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelectDialog>
             </VnRow>
-
             <VnRow>
                 <QCheckbox :label="t('Received LCR')" v-model="data.hasLcr" />
                 <QCheckbox :label="t('VNL core received')" v-model="data.hasCoreVnl" />
diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index cbbd6d205..02792182c 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -100,6 +100,9 @@ const columns = computed(() => [
             'row-key': 'id',
             selection: 'multiple',
         }"
+        :multi-check="{
+            expand: true,
+        }"
         v-model:selected="selected"
         :right-search="true"
         :columns="columns"
diff --git a/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue b/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
index f637c7e0a..141a02bfc 100644
--- a/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
+++ b/src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue
@@ -98,7 +98,9 @@ onMounted(async () => {
     <QBtn color="primary" icon="show_chart" :disable="!selectedRows">
         <QPopupProxy ref="popupProxyRef">
             <QCard class="column q-pa-md">
-                <span class="text-body1 q-mb-sm">{{ t('Campaign consumption') }}</span>
+                <span class="text-body1 q-mb-sm">{{
+                    t('Campaign consumption', { rows: $props.clients.length })
+                }}</span>
                 <VnRow>
                     <VnSelect
                         :options="moreFields"
@@ -140,12 +142,13 @@ onMounted(async () => {
             valentinesDay: Valentine's Day
             mothersDay: Mother's Day
             allSaints: All Saints' Day
+        Campaign consumption: Campaign consumption ({rows})
     es:
         params:
             valentinesDay: Día de San Valentín
             mothersDay: Día de la Madre
             allSaints: Día de Todos los Santos
-        Campaign consumption: Consumo campaña
+        Campaign consumption: Consumo campaña ({rows})
         Campaign: Campaña
         From: Desde
         To: Hasta
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index 19f4bca86..c4d47bb28 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -162,6 +162,9 @@ const entryFilterPanel = ref();
                         v-model="params.warehouseOutFk"
                         @update:model-value="searchFn()"
                         url="Warehouses"
+                        :where="{
+                            isOrigin: true,
+                        }"
                         :fields="['id', 'name']"
                         sort-by="name ASC"
                         hide-selected
@@ -177,6 +180,9 @@ const entryFilterPanel = ref();
                         v-model="params.warehouseInFk"
                         @update:model-value="searchFn()"
                         url="Warehouses"
+                        :where="{
+                            isDestiny: true,
+                        }"
                         :fields="['id', 'name']"
                         sort-by="name ASC"
                         hide-selected
diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
new file mode 100644
index 000000000..26683b6f4
--- /dev/null
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -0,0 +1,478 @@
+<script setup>
+import { ref, computed, markRaw, useTemplateRef, onBeforeMount, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { toDate, toCurrency } from 'src/filters';
+import { useArrayData } from 'src/composables/useArrayData';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
+import EntryDescriptorProxy from './Card/EntryDescriptorProxy.vue';
+import SupplierDescriptorProxy from '../Supplier/Card/SupplierDescriptorProxy.vue';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify';
+import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import VnDms from 'src/components/common/VnDms.vue';
+import { useState } from 'src/composables/useState';
+import { useQuasar } from 'quasar';
+import InvoiceInDescriptorProxy from '../InvoiceIn/Card/InvoiceInDescriptorProxy.vue';
+import { useStateStore } from 'src/stores/useStateStore';
+import { downloadFile } from 'src/composables/downloadFile';
+
+const { t } = useI18n();
+const quasar = useQuasar();
+const { notify } = useNotify();
+const user = useState().getUser();
+const stateStore = useStateStore();
+const updateDialog = ref();
+const uploadDialog = ref();
+let maxDays;
+let defaultDays;
+const dataKey = 'entryPreaccountingFilter';
+const url = 'Entries/preAccountingFilter';
+const arrayData = useArrayData(dataKey);
+const daysAgo = ref();
+const isBooked = ref();
+const dmsData = ref();
+const table = useTemplateRef('table');
+const companies = ref([]);
+const countries = ref([]);
+const entryTypes = ref([]);
+const supplierFiscalTypes = ref([]);
+const warehouses = ref([]);
+const defaultDmsDescription = ref();
+const dmsTypeId = ref();
+const selectedRows = ref([]);
+const totalAmount = ref();
+const totalSelectedAmount = computed(() => {
+    if (!selectedRows.value.length) return 0;
+    return selectedRows.value.reduce((acc, entry) => acc + entry.amount, 0);
+});
+let supplierRef;
+let dmsFk;
+const columns = computed(() => [
+    {
+        name: 'id',
+        label: t('entry.preAccount.id'),
+        isId: true,
+        chip: {
+            condition: () => true,
+        },
+    },
+    {
+        name: 'invoiceNumber',
+        label: t('entry.preAccount.invoiceNumber'),
+    },
+    {
+        name: 'company',
+        label: t('globals.company'),
+        columnFilter: {
+            component: 'select',
+            name: 'companyFk',
+            optionLabel: 'code',
+            options: companies.value,
+        },
+    },
+    {
+        name: 'warehouse',
+        label: t('globals.warehouse'),
+        columnFilter: {
+            component: 'select',
+            name: 'warehouseInFk',
+            options: warehouses.value,
+        },
+    },
+    {
+        name: 'gestDocFk',
+        label: t('entry.preAccount.gestDocFk'),
+    },
+    {
+        name: 'dmsType',
+        label: t('entry.preAccount.dmsType'),
+        columnFilter: {
+            component: 'select',
+            label: null,
+            name: 'dmsTypeFk',
+            url: 'DmsTypes',
+            fields: ['id', 'name'],
+        },
+    },
+    {
+        name: 'reference',
+        label: t('entry.preAccount.reference'),
+    },
+    {
+        name: 'shipped',
+        label: t('entry.preAccount.shipped'),
+        format: ({ shipped }, dashIfEmpty) => dashIfEmpty(toDate(shipped)),
+        columnFilter: {
+            component: 'date',
+            name: 'shipped',
+        },
+    },
+    {
+        name: 'landed',
+        label: t('entry.preAccount.landed'),
+        format: ({ landed }, dashIfEmpty) => dashIfEmpty(toDate(landed)),
+        columnFilter: {
+            component: 'date',
+            name: 'landed',
+        },
+    },
+    {
+        name: 'invoiceInFk',
+        label: t('entry.preAccount.invoiceInFk'),
+    },
+    {
+        name: 'supplier',
+        label: t('globals.supplier'),
+        format: (row) => row.supplier,
+        columnFilter: {
+            component: markRaw(VnSelectSupplier),
+            label: null,
+            name: 'supplierFk',
+            class: 'fit',
+            event: 'update',
+        },
+    },
+    {
+        name: 'country',
+        label: t('globals.country'),
+        columnFilter: {
+            component: 'select',
+            name: 'countryFk',
+            options: countries.value,
+        },
+    },
+    {
+        name: 'description',
+        label: t('entry.preAccount.entryType'),
+        columnFilter: {
+            component: 'select',
+            label: null,
+            name: 'typeFk',
+            options: entryTypes.value,
+            optionLabel: 'description',
+            optionValue: 'code',
+        },
+    },
+    {
+        name: 'payDem',
+        label: t('entry.preAccount.payDem'),
+        columnFilter: {
+            component: 'number',
+            name: 'payDem',
+        },
+    },
+    {
+        name: 'fiscalCode',
+        label: t('entry.preAccount.fiscalCode'),
+        format: ({ fiscalCode }) => t(fiscalCode),
+        columnFilter: {
+            component: 'select',
+            name: 'fiscalCode',
+            options: supplierFiscalTypes.value,
+            optionLabel: 'locale',
+            optionValue: 'code',
+            sortBy: 'code',
+        },
+    },
+    {
+        name: 'amount',
+        label: t('globals.amount'),
+        format: ({ amount }) => toCurrency(amount),
+        columnFilter: {
+            component: 'number',
+            name: 'amount',
+        },
+    },
+    {
+        name: 'isAgricultural',
+        label: t('entry.preAccount.isAgricultural'),
+        component: 'checkbox',
+        isEditable: false,
+    },
+    {
+        name: 'isBooked',
+        label: t('entry.preAccount.isBooked'),
+        component: 'checkbox',
+    },
+    {
+        name: 'isReceived',
+        label: t('entry.preAccount.isReceived'),
+        component: 'checkbox',
+        isEditable: false,
+    },
+]);
+
+onBeforeMount(async () => {
+    const { data } = await axios.get('EntryConfigs/findOne', {
+        params: { filter: JSON.stringify({ fields: ['maxDays', 'defaultDays'] }) },
+    });
+    maxDays = data.maxDays;
+    defaultDays = data.defaultDays;
+    daysAgo.value = arrayData.store.userParams.daysAgo || defaultDays;
+    isBooked.value = arrayData.store.userParams.isBooked || false;
+    stateStore.leftDrawer = false;
+});
+
+watch(selectedRows, (nVal, oVal) => {
+    const lastRow = nVal.at(-1);
+    if (lastRow?.isBooked) selectedRows.value.pop();
+    if (nVal.length > oVal.length && lastRow.invoiceInFk)
+        quasar.dialog({
+            component: VnConfirm,
+            componentProps: { title: t('entry.preAccount.hasInvoice') },
+        });
+});
+
+function filterByDaysAgo(val) {
+    if (!val) val = defaultDays;
+    else if (val > maxDays) val = maxDays;
+    daysAgo.value = val;
+    arrayData.store.userParams.daysAgo = daysAgo.value;
+    table.value.reload();
+}
+
+async function preAccount() {
+    const entries = selectedRows.value;
+    const { companyFk, isAgricultural, landed } = entries.at(0);
+    try {
+        dmsFk = entries.find(({ gestDocFk }) => gestDocFk)?.gestDocFk;
+        if (isAgricultural) {
+            const year = new Date(landed).getFullYear();
+            supplierRef = (
+                await axios.get('InvoiceIns/getMaxRef', { params: { companyFk, year } })
+            ).data;
+            return createInvoice();
+        } else if (dmsFk) {
+            supplierRef = (
+                await axios.get(`Dms/${dmsFk}`, {
+                    params: { filter: JSON.stringify({ fields: ['reference'] }) },
+                })
+            ).data?.reference;
+            updateDialog.value.show();
+        } else {
+            uploadFile();
+        }
+    } catch (e) {
+        throw e;
+    }
+}
+
+async function updateFile() {
+    await axios.post(`Dms/${dmsFk}/updateFile`, { dmsTypeId: dmsTypeId.value });
+    await createInvoice();
+}
+
+async function uploadFile() {
+    const firstSelectedEntry = selectedRows.value.at(0);
+    const { supplier, companyFk, invoiceNumber } = firstSelectedEntry;
+    dmsData.value = {
+        dmsTypeFk: dmsTypeId.value,
+        warehouseFk: user.value.warehouseFk,
+        companyFk: companyFk,
+        description: supplier + defaultDmsDescription.value + invoiceNumber,
+        hasFile: false,
+    };
+    uploadDialog.value.show();
+}
+
+async function afterUploadFile({ reference }, res) {
+    supplierRef = reference;
+    dmsFk = res.data[0].id;
+    await createInvoice();
+}
+
+async function createInvoice() {
+    try {
+        await axios.post(`Entries/addInvoiceIn`, {
+            ids: selectedRows.value.map((entry) => entry.id),
+            supplierRef,
+            dmsFk,
+        });
+        notify(t('entry.preAccount.success'), 'positive');
+    } catch (e) {
+        throw e;
+    } finally {
+        supplierRef = null;
+        dmsFk = undefined;
+        selectedRows.value.length = 0;
+        table.value.reload();
+    }
+}
+</script>
+<template>
+    <FetchData
+        url="Countries"
+        :filter="{ fields: ['id', 'name'] }"
+        @on-fetch="(data) => (countries = data)"
+        auto-load
+    />
+    <FetchData
+        url="Companies"
+        :filter="{ fields: ['id', 'code'] }"
+        @on-fetch="(data) => (companies = data)"
+        auto-load
+    />
+    <FetchData
+        url="Warehouses"
+        :filter="{ fields: ['id', 'name'] }"
+        @on-fetch="(data) => (warehouses = data)"
+        auto-load
+    />
+    <FetchData
+        url="EntryTypes"
+        :filter="{ fields: ['code', 'description'] }"
+        @on-fetch="(data) => (entryTypes = data)"
+        auto-load
+    />
+    <FetchData
+        url="supplierFiscalTypes"
+        :filter="{ fields: ['code'] }"
+        @on-fetch="
+            (data) =>
+                (supplierFiscalTypes = data.map((x) => ({ locale: t(x.code), ...x })))
+        "
+        auto-load
+    />
+    <FetchData
+        url="InvoiceInConfigs/findOne"
+        :filter="{ fields: ['defaultDmsDescription'] }"
+        @on-fetch="(data) => (defaultDmsDescription = data?.defaultDmsDescription)"
+        auto-load
+    />
+    <FetchData
+        url="DmsTypes/findOne"
+        :filter="{ fields: ['id'] }"
+        :where="{ code: 'invoiceIn' }"
+        @on-fetch="(data) => (dmsTypeId = data?.id)"
+        auto-load
+    />
+    <VnSearchbar
+        :data-key
+        :url
+        :label="t('entry.preAccount.search')"
+        :info="t('entry.preAccount.searchInfo')"
+        :search-remove-params="false"
+    />
+    <VnTable
+        v-model:selected="selectedRows"
+        :data-key
+        :columns
+        :url
+        :search-url="dataKey"
+        ref="table"
+        :disable-option="{ card: true }"
+        redirect="Entry"
+        :order="['landed DESC']"
+        :right-search="false"
+        :user-params="{ daysAgo, isBooked }"
+        :row-click="false"
+        :table="{ selection: 'multiple' }"
+        :limit="0"
+        :footer="true"
+        @on-fetch="
+            (data) => (totalAmount = data?.reduce((acc, entry) => acc + entry.amount, 0))
+        "
+        auto-load
+    >
+        <template #top-left>
+            <QBtn
+                data-cy="preAccount_btn"
+                icon="account_balance"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows.length"
+                @click="preAccount"
+            >
+                <QTooltip>{{ t('entry.preAccount.btn') }}</QTooltip>
+            </QBtn>
+            <VnInputNumber
+                v-model="daysAgo"
+                :label="$t('globals.daysAgo')"
+                dense
+                :step="1"
+                :decimal-places="0"
+                @update:model-value="filterByDaysAgo"
+                debounce="500"
+                :title="t('entry.preAccount.daysAgo')"
+            />
+        </template>
+        <template #column-id="{ row }">
+            <span class="link" @click.stop>
+                {{ row.id }}
+                <EntryDescriptorProxy :id="row.id" />
+            </span>
+        </template>
+        <template #column-company="{ row }">
+            <QBadge :color="row.color ?? 'transparent'" :label="row.company" />
+        </template>
+        <template #column-gestDocFk="{ row }">
+            <span class="link" @click.stop="downloadFile(row.gestDocFk)">
+                {{ row.gestDocFk }}
+            </span>
+        </template>
+        <template #column-supplier="{ row }">
+            <span class="link" @click.stop>
+                {{ row.supplier }}
+                <SupplierDescriptorProxy :id="row.supplierFk" />
+            </span>
+        </template>
+        <template #column-invoiceInFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.invoiceInFk }}
+                <InvoiceInDescriptorProxy :id="row.invoiceInFk" />
+            </span>
+        </template>
+        <template #column-footer-amount>
+            <div v-text="toCurrency(totalSelectedAmount)" />
+            <div v-text="toCurrency(totalAmount)" />
+        </template>
+    </VnTable>
+    <VnConfirm
+        ref="updateDialog"
+        :title="t('entry.preAccount.dialog.title')"
+        :message="t('entry.preAccount.dialog.message')"
+    >
+        <template #actions>
+            <QBtn
+                data-cy="updateFileYes"
+                :label="t('globals.yes')"
+                color="primary"
+                @click="updateFile"
+                autofocus
+                v-close-popup
+            />
+            <QBtn
+                data-cy="updateFileNo"
+                :label="t('globals.no')"
+                color="primary"
+                flat
+                @click="uploadFile"
+                v-close-popup
+            />
+            <QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
+        </template>
+    </VnConfirm>
+    <QDialog ref="uploadDialog">
+        <VnDms
+            model="dms"
+            :form-initial-data="dmsData"
+            url="Dms/uploadFile"
+            @on-data-saved="afterUploadFile"
+        />
+    </QDialog>
+</template>
+<i18n>
+en:
+    IntraCommunity: Intra-community
+    NonCommunity: Non-community
+    CanaryIslands: Canary Islands
+es:
+    IntraCommunity: Intracomunitaria
+    NonCommunity: Extracomunitaria
+    CanaryIslands: Islas Canarias
+    National: Nacional
+</i18n>
diff --git a/src/pages/Entry/__tests__/EntryPreAccount.spec.js b/src/pages/Entry/__tests__/EntryPreAccount.spec.js
new file mode 100644
index 000000000..0140a5f1e
--- /dev/null
+++ b/src/pages/Entry/__tests__/EntryPreAccount.spec.js
@@ -0,0 +1,63 @@
+import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import EntryPreAccount from '../EntryPreAccount.vue';
+import axios from 'axios';
+
+describe('EntryPreAccount', () => {
+    let wrapper;
+    let vm;
+
+    beforeAll(() => {
+        vi.spyOn(axios, 'get').mockImplementation((url) => {
+            if (url == 'EntryConfigs/findOne')
+                return { data: { maxDays: 90, defaultDays: 30 } };
+            return { data: [] };
+        });
+        wrapper = createWrapper(EntryPreAccount);
+        vm = wrapper.vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('filterByDaysAgo()', () => {
+        it('should set daysAgo to defaultDays if no value is provided', () => {
+            vm.filterByDaysAgo();
+            expect(vm.daysAgo).toBe(vm.defaultDays);
+            expect(vm.arrayData.store.userParams.daysAgo).toBe(vm.defaultDays);
+        });
+
+        it('should set daysAgo to maxDays if the value exceeds maxDays', () => {
+            vm.filterByDaysAgo(500);
+            expect(vm.daysAgo).toBe(vm.maxDays);
+            expect(vm.arrayData.store.userParams.daysAgo).toBe(vm.maxDays);
+        });
+
+        it('should set daysAgo to the provided value if it is valid', () => {
+            vm.filterByDaysAgo(30);
+            expect(vm.daysAgo).toBe(30);
+            expect(vm.arrayData.store.userParams.daysAgo).toBe(30);
+        });
+    });
+
+    describe('Dialog behavior when adding a new row', () => {
+        it('should open the dialog if the new row has invoiceInFk', async () => {
+            const dialogSpy = vi.spyOn(vm.quasar, 'dialog');
+            const selectedRows = [{ id: 1, invoiceInFk: 123 }];
+            vm.selectedRows = selectedRows;
+            await vm.$nextTick();
+            expect(dialogSpy).toHaveBeenCalledWith({
+                component: vm.VnConfirm,
+                componentProps: { title: vm.t('entry.preAccount.hasInvoice') },
+            });
+        });
+
+        it('should not open the dialog if the new row does not have invoiceInFk', async () => {
+            const dialogSpy = vi.spyOn(vm.quasar, 'dialog');
+            vm.selectedRows = [{ id: 1, invoiceInFk: null }];
+            await vm.$nextTick();
+            expect(dialogSpy).not.toHaveBeenCalled();
+        });
+    });
+});
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 0bc92a5ea..3c0f078fe 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -118,6 +118,33 @@ entry:
     searchInfo: You can search by entry reference
     descriptorMenu:
         showEntryReport: Show entry report
+    preAccount:
+        gestDocFk: Gestdoc
+        dmsType: Gestdoc type
+        invoiceNumber: Entry ref.
+        reference: Gestdoc ref.
+        shipped: Shipped
+        landed: Landed
+        id: Entry
+        invoiceInFk: Invoice in
+        supplierFk: Supplier
+        country: Country
+        description: Entry type
+        payDem: Payment term
+        isBooked: B
+        isReceived: R
+        entryType: Entry type
+        isAgricultural: Agricultural
+        fiscalCode: Account type
+        daysAgo: Max 365 days
+        search: Search
+        searchInfo: You can search by supplier name or nickname
+        btn: Pre-account
+        hasInvoice: This entry has already an invoice in
+        success: It has been successfully pre-accounted
+        dialog:
+            title: Pre-account entries
+            message: Do you want the invoice to inherit the entry document?
 entryFilter:
     params:
         isExcludedFromAvailable: Excluded from available
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 2c80299bc..0addbca94 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -69,6 +69,33 @@ entry:
         observationType: Tipo de observación
     search: Buscar entradas
     searchInfo: Puedes buscar por referencia de entrada
+    preAccount:
+        gestDocFk: Gestdoc
+        dmsType: Tipo gestdoc
+        invoiceNumber: Ref. Entrada
+        reference: Ref. GestDoc
+        shipped: F. envío
+        landed: F. llegada
+        id: Entrada
+        invoiceInFk: Recibida
+        supplierFk: Proveedor
+        country: País
+        description: Tipo de Entrada
+        payDem: Plazo de pago
+        isBooked: C
+        isReceived: R
+        entryType: Tipo de entrada
+        isAgricultural: Agricultural
+        fiscalCode: Tipo de cuenta
+        daysAgo: Máximo 365 días
+        search: Buscar
+        searchInfo: Puedes buscar por nombre o alias de proveedor
+        btn: Precontabilizar
+        hasInvoice: Esta entrada ya tiene una f. recibida
+        success: Se ha precontabilizado correctamente
+        dialog:
+            title: Precontabilizar entradas
+            message: ¿Desea que la factura herede el documento de la entrada?
     params:
         entryFk: Entrada
         observationTypeFk: Tipo de observación
diff --git a/src/pages/Item/Card/ItemDescriptorProxy.vue b/src/pages/Item/Card/ItemDescriptorProxy.vue
index 6e1f6d71f..237358871 100644
--- a/src/pages/Item/Card/ItemDescriptorProxy.vue
+++ b/src/pages/Item/Card/ItemDescriptorProxy.vue
@@ -30,7 +30,6 @@ const $props = defineProps({
             :dated="dated"
             :sale-fk="saleFk"
             :warehouse-fk="warehouseFk"
-            :proxy-render="true"
         />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 170f73bc0..98e1bda02 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -6,13 +6,18 @@ import { useRoute } from 'vue-router';
 import { useSession } from 'src/composables/useSession';
 import { toDateHourMin } from 'filters/index';
 import { useStateStore } from 'src/stores/useStateStore';
+import { dashIfEmpty } from 'src/filters';
 
+import AgencyDescriptorProxy from '../Agency/Card/AgencyDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import RouteDescriptorProxy from '../Card/RouteDescriptorProxy.vue';
+import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
-import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -30,39 +35,117 @@ const userParams = {
 
 const columns = computed(() => [
     {
-        align: 'left',
+        align: 'right',
         name: 'cmrFk',
-        label: t('route.cmr.params.cmrFk'),
+        label: t('cmr.params.cmrFk'),
         chip: {
             condition: () => true,
         },
         isId: true,
     },
     {
-        align: 'center',
-        name: 'hasCmrDms',
-        label: t('route.cmr.params.hasCmrDms'),
-        component: 'checkbox',
-        cardVisible: true,
-    },
-    {
-        align: 'left',
-        label: t('route.cmr.params.ticketFk'),
+        align: 'right',
+        label: t('cmr.params.ticketFk'),
         name: 'ticketFk',
     },
     {
-        align: 'left',
-        label: t('route.cmr.params.routeFk'),
+        align: 'right',
+        label: t('cmr.params.routeFk'),
         name: 'routeFk',
     },
     {
-        align: 'left',
-        label: t('route.cmr.params.clientFk'),
+        label: t('cmr.params.client'),
         name: 'clientFk',
+        component: 'select',
+        attrs: {
+            url: 'Clients',
+            fields: ['id', 'name'],
+        },
+        columnFilter: {
+            name: 'clientFk',
+            attrs: {
+                url: 'Clients',
+                fields: ['id', 'name'],
+            },
+        },
     },
     {
-        align: 'right',
-        label: t('route.cmr.params.countryFk'),
+        label: t('cmr.params.agency'),
+        name: 'agencyModeFk',
+        component: 'select',
+        attrs: {
+            url: 'Agencies',
+            fields: ['id', 'name'],
+        },
+        columnFilter: {
+            name: 'agencyModeFk',
+            attrs: {
+                url: 'Agencies',
+                fields: ['id', 'name'],
+            },
+        },
+        format: ({ agencyName }) => agencyName,
+    },
+    {
+        label: t('cmr.params.supplier'),
+        name: 'supplierFk',
+        component: 'select',
+        attrs: {
+            url: 'suppliers',
+            fields: ['id', 'name'],
+        },
+        columnFilter: {
+            name: 'supplierFk',
+            attrs: {
+                url: 'suppliers',
+                fields: ['id', 'name'],
+            },
+        },
+    },
+    {
+        label: t('cmr.params.sender'),
+        name: 'addressFromFk',
+        component: 'select',
+        attrs: {
+            url: 'Addresses',
+            fields: ['id', 'nickname'],
+            optionValue: 'id',
+            optionLabel: 'nickname',
+        },
+        columnFilter: {
+            name: 'addressFromFk',
+            attrs: {
+                url: 'Addresses',
+                fields: ['id', 'nickname'],
+                optionValue: 'id',
+                optionLabel: 'nickname',
+            },
+        },
+        format: ({ origin }) => origin,
+    },
+    {
+        label: t('cmr.params.destination'),
+        name: 'addressToFk',
+        component: 'select',
+        attrs: {
+            url: 'addresses',
+            fields: ['id', 'nickname'],
+            optionValue: 'id',
+            optionLabel: 'nickname',
+        },
+        columnFilter: {
+            name: 'addressToFk',
+            attrs: {
+                url: 'addresses',
+                fields: ['id', 'nickname'],
+                optionValue: 'id',
+                optionLabel: 'nickname',
+            },
+        },
+        format: ({ destination }) => destination,
+    },
+    {
+        label: t('cmr.params.country'),
         name: 'countryFk',
         component: 'select',
         attrs: {
@@ -79,16 +162,61 @@ const columns = computed(() => [
         format: ({ countryName }) => countryName,
     },
     {
-        align: 'right',
-        label: t('route.cmr.params.shipped'),
-        name: 'shipped',
-        cardVisible: true,
+        label: t('cmr.params.created'),
+        name: 'created',
         component: 'date',
-        format: ({ shipped }) => toDateHourMin(shipped),
+        format: ({ created }) => dashIfEmpty(toDateHourMin(created)),
     },
     {
-        align: 'right',
-        label: t('route.cmr.params.warehouseFk'),
+        label: t('cmr.params.shipped'),
+        name: 'shipped',
+        component: 'date',
+        format: ({ shipped }) => dashIfEmpty(toDateHourMin(shipped)),
+    },
+    {
+        label: t('cmr.params.etd'),
+        name: 'ead',
+        component: 'date',
+        format: ({ ead }) => dashIfEmpty(toDateHourMin(ead)),
+        toolTip: t('cmr.params.etdTooltip'),
+    },
+    {
+        label: t('globals.landed'),
+        name: 'landed',
+        component: 'date',
+        format: ({ landed }) => dashIfEmpty(toDateHourMin(landed)),
+    },
+    {
+        align: 'left',
+        label: t('cmr.params.packageList'),
+        name: 'packagesList',
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: t('cmr.params.observation'),
+        name: 'observation',
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: t('cmr.params.senderInstructions'),
+        name: 'senderInstruccions',
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: t('cmr.params.paymentInstructions'),
+        name: 'paymentInstruccions',
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: t('cmr.params.vehiclePlate'),
+        name: 'truckPlate',
+    },
+    {
+        label: t('cmr.params.warehouse'),
         name: 'warehouseFk',
         component: 'select',
         attrs: {
@@ -96,7 +224,6 @@ const columns = computed(() => [
             fields: ['id', 'name'],
         },
         columnFilter: {
-            inWhere: true,
             name: 'warehouseFk',
             attrs: {
                 url: 'warehouses',
@@ -105,12 +232,23 @@ const columns = computed(() => [
         },
         format: ({ warehouseName }) => warehouseName,
     },
+    {
+        align: 'left',
+        name: 'specialAgreements',
+        label: t('cmr.params.specialAgreements'),
+        columnFilter: false,
+    },
+    {
+        name: 'hasCmrDms',
+        label: t('cmr.params.hasCmrDms'),
+        component: 'checkbox',
+    },
     {
         align: 'center',
         name: 'tableActions',
         actions: [
             {
-                title: t('route.cmr.params.viewCmr'),
+                title: t('cmr.params.viewCmr'),
                 icon: 'visibility',
                 isPrimary: true,
                 action: (row) => window.open(getCmrUrl(row?.cmrFk), '_blank'),
@@ -151,11 +289,7 @@ function downloadPdfs() {
 }
 </script>
 <template>
-    <VnSearchbar
-        :data-key
-        :label="t('route.cmr.search')"
-        :info="t('route.cmr.searchInfo')"
-    />
+    <VnSearchbar :data-key :label="t('cmr.search')" :info="t('cmr.searchInfo')" />
     <VnSubToolbar>
         <template #st-actions>
             <QBtn
@@ -165,7 +299,7 @@ function downloadPdfs() {
                 :disable="!selectedRows?.length"
                 @click="downloadPdfs"
             >
-                <QTooltip>{{ t('route.cmr.params.downloadCmrs') }}</QTooltip>
+                <QTooltip>{{ t('cmr.params.downloadCmrs') }}</QTooltip>
             </QBtn>
         </template>
     </VnSubToolbar>
@@ -191,11 +325,72 @@ function downloadPdfs() {
                 <TicketDescriptorProxy :id="row.ticketFk" />
             </span>
         </template>
+        <template #column-routeFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.routeFk }}
+                <RouteDescriptorProxy :id="row.routeFk" />
+            </span>
+        </template>
         <template #column-clientFk="{ row }">
             <span class="link" @click.stop>
-                {{ row.clientFk }}
+                {{ row.clientName }}
                 <CustomerDescriptorProxy :id="row.clientFk" />
             </span>
         </template>
+        <template #column-agencyModeFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.agencyName }}
+                <AgencyDescriptorProxy :id="row.agencyModeFk" />
+            </span>
+        </template>
+        <template #column-supplierFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.carrierName }}
+                <SupplierDescriptorProxy :id="row.supplierFk" />
+            </span>
+        </template>
+        <template #column-observation="{ row }">
+            <VnInput
+                v-if="row.observation"
+                type="textarea"
+                v-model="row.observation"
+                readonly
+                dense
+                rows="2"
+                style="overflow: hidden; text-overflow: ellipsis; white-space: nowrap"
+            />
+        </template>
+        <template #column-packagesList="{ row }">
+            <span>
+                {{ row.packagesList }}
+                <QTooltip v-if="row.packagesList" :label="row.packagesList">
+                    {{ row.packagesList }}
+                </QTooltip>
+            </span>
+        </template>
+        <template #column-senderInstruccions="{ row }">
+            <span>
+                {{ row.senderInstruccions }}
+                <QTooltip v-if="row.packagesList" :label="row.packagesList">
+                    {{ row.senderInstruccions }}
+                </QTooltip>
+            </span>
+        </template>
+        <template #column-paymentInstruccions="{ row }">
+            <span>
+                {{ row.paymentInstruccions }}
+                <QTooltip v-if="row.packagesList" :label="row.packagesList">
+                    {{ row.paymentInstruccions }}
+                </QTooltip>
+            </span>
+        </template>
+        <template #column-specialAgreements="{ row }">
+            <span>
+                {{ row.specialAgreements }}
+                <QTooltip v-if="row.packagesList" :label="row.packagesList">
+                    {{ row.specialAgreements }}
+                </QTooltip>
+            </span>
+        </template>
     </VnTable>
 </template>
diff --git a/src/pages/Route/Cmr/locale/en.yml b/src/pages/Route/Cmr/locale/en.yml
new file mode 100644
index 000000000..49b9895f8
--- /dev/null
+++ b/src/pages/Route/Cmr/locale/en.yml
@@ -0,0 +1,31 @@
+cmr:
+  search: Search Cmr
+  searchInfo: You can search Cmr by Id
+  params:
+      agency: Agency
+      client: Client
+      cmrFk: CMR id
+      country: Country
+      created: Created
+      destination: Destination
+      downloadCmrs: Download CMRs
+      etd: ETD
+      etdTooltip: Estimated Time Delivery
+      hasCmrDms: Attached in gestdoc
+      observation: Observation
+      packageList: Package List
+      paymentInstructions: Payment instructions
+      routeFk: Route id
+      results: results
+      search: General search
+      sender: Sender
+      senderInstructions: Sender instructions
+      shipped: Shipped
+      specialAgreements: Special agreements
+      supplier: Carrier
+      ticketFk: Ticket id
+      vehiclePlate: Vehicle plate
+      viewCmr: View CMR
+      warehouse: Warehouse
+      'true': 'Yes'
+      'false': 'No'
\ No newline at end of file
diff --git a/src/pages/Route/Cmr/locale/es.yml b/src/pages/Route/Cmr/locale/es.yml
new file mode 100644
index 000000000..b419a238b
--- /dev/null
+++ b/src/pages/Route/Cmr/locale/es.yml
@@ -0,0 +1,31 @@
+cmr:
+  search: Buscar Cmr
+  searchInfo: Puedes buscar cmr por id
+  params:
+      agency: Agencia
+      client: Cliente
+      cmrFk: Id cmr
+      country: País
+      created: Creado
+      destination: Destinatario
+      downloadCmrs: Descargar CMRs
+      etd: ETD
+      etdTooltip: Fecha estimada de entrega
+      hasCmrDms: Adjunto en gestdoc
+      observation: Observaciones
+      packageList: Listado embalajes
+      paymentInstructions: Instrucciones de pago
+      routeFk: Id ruta
+      results: Resultados
+      search: Busqueda general
+      sender: Remitente
+      senderInstructions: Instrucciones de envío
+      shipped: F. envío
+      specialAgreements: Acuerdos especiales
+      supplier: Transportista
+      ticketFk: Id ticket
+      vehiclePlate: Matrícula
+      viewCmr: Ver CMR
+      warehouse: Almacén
+      'true': 'Si'
+      'false': 'No'
\ No newline at end of file
diff --git a/src/pages/Route/Vehicle/Card/VehicleEventInclusionForm.vue b/src/pages/Route/Vehicle/Card/VehicleEventInclusionForm.vue
new file mode 100644
index 000000000..06141736c
--- /dev/null
+++ b/src/pages/Route/Vehicle/Card/VehicleEventInclusionForm.vue
@@ -0,0 +1,183 @@
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import VnRow from 'components/ui/VnRow.vue';
+import FormPopup from 'components/FormPopup.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useState } from 'src/composables/useState';
+import axios from 'axios';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import useNotify from 'src/composables/useNotify.js';
+
+const props = defineProps({
+    event: {
+        type: Object,
+        default: null,
+    },
+    isNewMode: {
+        type: Boolean,
+        default: true,
+    },
+    eventType: {
+        type: Boolean,
+        default: true,
+    },
+    firstDay: {
+        type: Date,
+        default: null,
+    },
+    lastDay: {
+        type: Date,
+        default: null,
+    },
+});
+
+const emit = defineEmits(['onSubmit', 'closeForm', 'refresh-events']);
+
+const route = useRoute();
+const { t } = useI18n();
+const { notify } = useNotify();
+const { openConfirmationModal } = useVnConfirm();
+const state = useState();
+const user = state.getUser();
+
+const isNew = computed(() => props.isNewMode);
+const vehicleFormData = ref({
+    started: null,
+    finished: null,
+    vehicleStateFk: null,
+    description: '',
+    vehicleFk: null,
+    userFk: null,
+});
+
+const arrayData = useArrayData('VehicleEvents');
+
+onMounted(() => {
+    if (props.event) {
+        vehicleFormData.value = props.event;
+    }
+});
+
+const createVehicleEvent = async () => {
+    vehicleFormData.value.vehicleFk = route.params.id;
+    vehicleFormData.value.userFk = user.value.id;
+    
+    if (isNew.value) {
+        await axios.post(`VehicleEvents`, vehicleFormData.value);
+    } else {
+        await axios.patch(
+            `VehicleEvents/${props.event?.id}`,
+            vehicleFormData.value,
+        );
+    }
+    await refetchEvents();
+
+};
+
+const deleteVehicleEvent = async () => {
+    if (!props.event) return;
+    await axios.delete(`VehicleEvents/${props.event?.id}`);
+    await refetchEvents();
+};
+
+const refetchEvents = async () => {
+    await arrayData.refresh({ 
+        append: false,
+        params: {
+            filter: {
+                where: {
+                    vehicleFk: route.params.id,
+                    and: [
+                        { 
+                            or: [
+                                { started: { lte: props.lastDay?.toISOString() } },
+                                { started: null }
+                            ]
+                        },
+                        { 
+                            or: [
+                                { finished: { gte: props.firstDay?.toISOString() } },
+                                { finished: null }
+                            ]
+                        }
+                    ]
+                }
+            }
+        }
+    });
+    emit('refresh-events');
+    notify(t('globals.dataSaved'), 'positive');
+    emit('closeForm');
+};
+
+
+</script>
+
+<template>
+    <FormPopup
+        :title="isNew ? t('Add vehicle event') : t('Edit vehicle event')"
+        :default-cancel-button="false"
+        :default-submit-button="false"
+    >
+        <template #form-inputs>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInputDate :label="t('Started')" v-model="vehicleFormData.started" />
+                <VnInputDate :label="t('Finished')" v-model="vehicleFormData.finished" />
+                <VnSelect
+                    url="VehicleStates"
+                    v-model="vehicleFormData.vehicleStateFk"
+                    :label="t('globals.state')"
+                    option-label="state"
+                    data-cy="State_input"
+                />
+            </VnRow>
+            <VnInput
+                    v-model="vehicleFormData.description"
+                    :label="t('globals.description')"
+            />
+        </template>
+        <template #custom-buttons>
+            <QBtn
+                :label="t('globals.cancel')"
+                color="primary"
+                flat
+                class="q-mr-sm"
+                v-close-popup
+            />
+            <QBtn
+                v-if="!isNew"
+                :label="t('globals.delete')"
+                color="primary"
+                flat
+                class="q-mr-sm"
+                @click="
+                    openConfirmationModal(
+                        t('vehicle.deleteTitle'),
+                        t('vehicle.deleteSubtitle'),
+                        () => deleteVehicleEvent(),
+                    )
+                "
+            />
+            <QBtn
+                :label="isNew ? t('globals.save') : t('globals.add')"
+                @click="createVehicleEvent"
+                color="primary"
+            />
+        </template>
+    </FormPopup>
+</template>
+
+<i18n>
+    es:
+        Started: Inicio
+        Finished: Fin
+        Add vehicle event: Agregar evento
+        Edit vehicle event: Editar evento
+</i18n>
diff --git a/src/pages/Route/Vehicle/Card/VehicleEvents.vue b/src/pages/Route/Vehicle/Card/VehicleEvents.vue
new file mode 100644
index 000000000..5a90c9586
--- /dev/null
+++ b/src/pages/Route/Vehicle/Card/VehicleEvents.vue
@@ -0,0 +1,86 @@
+<script setup>
+import { ref, reactive, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VehicleEventsPanel from './VehicleEventsPanel.vue';
+import VehicleCalendarGrid from '../VehicleCalendarGrid.vue';
+import VehicleEventInclusionForm from './VehicleEventInclusionForm.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import RightMenu from 'src/components/common/RightMenu.vue';
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+
+const firstDay = ref();
+const lastDay = ref();
+const events = ref([]);
+const vehicleEventsPanelRef = ref(null);
+const showVehicleEventForm = ref(false);
+const vehicleEventsFormProps = reactive({
+    isNewMode: true,
+    date: null,
+    event: null,
+});
+
+const refreshEvents = async () => {
+    await vehicleEventsPanelRef.value.fetchData();    
+};
+
+const openForm = (data) => {
+    const { date = null, isNewMode, event } = data;
+    Object.assign(vehicleEventsFormProps, { date, isNewMode, event });
+
+    showVehicleEventForm.value = true;
+};
+
+const onVehicleEventFormClose = () => {
+    showVehicleEventForm.value = false;
+    vehicleEventsFormProps.value = {};
+};
+
+</script>
+
+<template>
+        <RightMenu>
+            <template #right-panel v-if="stateStore.isHeaderMounted()">
+                <VehicleEventsPanel
+                    ref="vehicleEventsPanelRef"
+                    :first-day="firstDay"
+                    :last-day="lastDay"
+                    :events="events"
+                    @update:events="events = $event"
+                />
+            </template>
+        </RightMenu>
+    <QPage class="q-pa-md flex justify-center">
+        <VehicleCalendarGrid
+            v-model:events="events"
+            v-model:firstDay="firstDay"
+            v-model:lastDay="lastDay"
+            data-key="VehicleEvents"
+            @on-date-selected="openForm"
+        />
+        <QDialog v-model="showVehicleEventForm" @hide="onVehicleEventFormClose()">
+            <VehicleEventInclusionForm
+                v-bind="vehicleEventsFormProps"
+                :first-day="firstDay"
+                :last-day="lastDay"
+                @close-form="onVehicleEventFormClose()"
+                @refresh-events="refreshEvents()"
+            />
+        </QDialog>
+        <QPageSticky :offset="[20, 20]">
+            <QBtn
+                @click="openForm({ isNewMode: true }, true)"
+                color="primary"
+                fab
+                icon="add"
+                v-shortcut="'+'"
+            />
+            <QTooltip class="text-no-wrap">
+                {{ t('eventsInclusionForm.addEvent') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>
diff --git a/src/pages/Route/Vehicle/Card/VehicleEventsPanel.vue b/src/pages/Route/Vehicle/Card/VehicleEventsPanel.vue
new file mode 100644
index 000000000..e3f22e93b
--- /dev/null
+++ b/src/pages/Route/Vehicle/Card/VehicleEventsPanel.vue
@@ -0,0 +1,196 @@
+<script setup>
+import { onMounted, watch, computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import { useArrayData } from 'src/composables/useArrayData';
+import axios from 'axios';
+import { toDateFormat } from 'src/filters/date.js';
+import { dashIfEmpty } from 'src/filters';
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import useNotify from 'src/composables/useNotify.js';
+
+const props = defineProps({
+    firstDay: {
+        type: Date,
+        default: null,
+    },
+    lastDay: {
+        type: Date,
+        default: null,
+    },
+    events: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const emit = defineEmits(['openVehicleForm']);
+const { t } = useI18n();
+const route = useRoute();
+const { notify } = useNotify();
+const weekdayStore = useWeekdayStore();
+const { openConfirmationModal } = useVnConfirm();
+const vehicleStates = ref({});
+const fetchVehicleState = async () => {
+    const vehicles = await axios.get('VehicleStates');
+    vehicleStates.value = vehicles.data;
+};
+
+const getVehicleStateName = (id) => {
+    return vehicleStates.value[id - 1] ?? dashIfEmpty(id - 1);
+};
+
+const params = computed(() => ({
+    vehicleFk: route.params.id,
+    started: props.firstDay,
+    finished: props.lastDay,
+}));
+
+const arrayData = useArrayData('VehicleEvents', {
+    params: params,
+    url: `VehicleEvents`,
+});
+
+const fetchData = async () => {
+    if (!params.value.vehicleFk || !props.firstDay || !props.lastDay) return;
+    
+    try {
+        await arrayData.applyFilter({
+            params: {
+                filter: {
+                    where: {
+                        vehicleFk: route.params.id,
+                        and: [
+                            { or: [
+                                { started: { lte: props.lastDay } },
+                                { started: null }
+                            ]},
+                            { or: [
+                                { finished: { gte: props.firstDay } },
+                                { finished: null }
+                            ]}
+                        ]
+                    }
+                }
+            }
+        });
+        emit('update:events', arrayData.store.data || []);
+    } catch (error) {
+        console.error('Error fetching events:', error);
+    }
+};
+
+watch(
+    params,
+    async () => {
+        await fetchData();
+    },
+    { immediate: true, deep: true },
+);
+
+watch(
+    () => props.events,
+    (newEvents) => {
+        emit('update:events', newEvents);
+    },
+    { deep: true }
+);
+
+const deleteEvent = async (id) => {
+    if (!id) return;
+    await axios.delete(`VehicleEvents/${id}`);
+    notify(t('globals.dataSaved'), 'positive');
+    await fetchData();
+};
+
+const openInclusionForm = (event) => {
+    emit('openVehicleForm', {
+        date: event.dated,
+        event,
+        isNewMode: false,
+    });
+};
+
+onMounted(async () => {
+    weekdayStore.initStore();
+    await fetchVehicleState();
+});
+
+defineExpose({
+    fetchData
+});
+
+</script>
+
+<template>
+    <QForm @submit="onSubmit()">
+        <div class="column q-pa-md q-gutter-y-sm"></div>
+        <span class="color-vn-label text-subtitle1 q-px-md">{{
+            t('eventsPanel.events')
+        }}</span>
+        <QList>
+            <QItem v-for="(event, index) in events" :key="index" class="event-card">
+                <QItemSection left @click="openInclusionForm(event)">
+                    <div class="q-mb-xs">
+                        <span
+                            >({{ toDateFormat(event.started) }} -
+                            {{ toDateFormat(event.finished) }})</span
+                        >
+                    </div>
+                    <span class="color-vn-label"
+                        >{{ t('globals.description') }}:
+                        <span class="color-vn-text q-ml-xs">{{
+                            dashIfEmpty(event.description)
+                        }}</span>
+                    </span>
+                    <span class="color-vn-label"
+                        >{{ t('globals.state') }}:
+                        <span class="color-vn-text">{{
+                            getVehicleStateName(event.vehicleStateFk).state
+                        }}</span>
+                    </span>
+                </QItemSection>
+                <QItemSection side @click="openInclusionForm(event)">
+                    <QBtn
+                        icon="delete"
+                        data-cy="delete_event"
+                        flat
+                        dense
+                        size="md"
+                        color="primary"
+                        @click.stop="
+                            openConfirmationModal(
+                                t('vehicle.deleteTitle'),
+                                t('vehicle.deleteSubtitle'),
+                                () => deleteEvent(event.id),
+                            )
+                        "
+                    >
+                        <QTooltip>{{ t('eventsPanel.delete') }}</QTooltip>
+                    </QBtn>
+                </QItemSection>
+            </QItem>
+            <span
+                v-if="!events.length"
+                class="flex justify-center text-h5 color-vn-label"
+            >
+                {{ t('globals.noResults') }}
+            </span>
+        </QList>
+    </QForm>
+</template>
+
+<style scoped lang="scss">
+.event-card {
+    display: flex;
+    border-bottom: $border-thin-light;
+    margin: 0;
+
+    &:hover {
+        background-color: var(--vn-accent-color);
+        cursor: pointer;
+    }
+}
+</style>
diff --git a/src/pages/Route/Vehicle/VehicleCalendar.vue b/src/pages/Route/Vehicle/VehicleCalendar.vue
new file mode 100644
index 000000000..681bb966a
--- /dev/null
+++ b/src/pages/Route/Vehicle/VehicleCalendar.vue
@@ -0,0 +1,13 @@
+<script setup>
+import EntityCalendar from 'src/components/EntityCalendar.vue';
+
+const emit = defineEmits(['onDateSelected']);
+
+</script>
+
+<template>
+    <EntityCalendar 
+        v-bind="$props" 
+        @onDateSelected="(e) => emit('onDateSelected', e)"
+    />
+</template>
\ No newline at end of file
diff --git a/src/pages/Route/Vehicle/VehicleCalendarGrid.vue b/src/pages/Route/Vehicle/VehicleCalendarGrid.vue
new file mode 100644
index 000000000..99b6602c8
--- /dev/null
+++ b/src/pages/Route/Vehicle/VehicleCalendarGrid.vue
@@ -0,0 +1,97 @@
+<script setup>
+import { ref, watch } from 'vue';
+import EntityCalendarGrid from 'src/components/EntityCalendarGrid.vue';
+import VehicleCalendar from './VehicleCalendar.vue';
+import { useArrayData } from 'src/composables/useArrayData';
+
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const firstDay = ref(new Date());
+const lastDay = ref(new Date());
+const entityCalendarRef = ref(null);
+
+const arrayData = useArrayData(props.dataKey);
+const { store } = arrayData;
+const _data = ref(null);
+const days = ref({});
+const events = ref([]);
+
+const refreshEvents = () => {
+    days.value = {};
+    if (!events.value?.length || !firstDay.value || !lastDay.value) return;
+    
+    let day = new Date(firstDay.value.getTime());
+    let endDate = new Date(lastDay.value.getTime());
+
+    while (day <= endDate) {
+        let stamp = day.getTime();
+        let dayEvents = [];
+        
+        for (let event of events.value) {
+            const eventStart = event.started ? new Date(event.started).getTime() : null;
+            const eventEnd = event.finished ? new Date(event.finished).getTime() : null;
+            
+            let match = (!eventStart || stamp >= eventStart) && 
+                        (!eventEnd || stamp <= eventEnd);
+            
+            if (match) {
+                dayEvents.push(event);
+            }
+        }
+        
+        if (dayEvents.length) {
+            days.value[stamp] = dayEvents;
+        }
+
+        day.setDate(day.getDate() + 1);
+    }
+};
+
+watch(
+    () => store.data,
+    (value) => {
+        _data.value = value;
+        events.value = Array.isArray(value) ? value : [];
+        
+        function toStamp(date) {
+            return date && new Date(date).setHours(0, 0, 0, 0);
+        }
+
+        if (events.value) {
+            for (let event of events.value) {
+                event.dated = toStamp(event.dated);
+                event.finished = toStamp(event.finished);
+                event.started = toStamp(event.started);
+            }
+        }
+
+        refreshEvents();
+    },
+    { immediate: true },
+);
+
+watch(() => entityCalendarRef.value?.firstDay, (newVal) => {
+    if (newVal) firstDay.value = new Date(newVal);
+});
+
+watch(() => entityCalendarRef.value?.lastDay, (newVal) => {
+    if (newVal) lastDay.value = new Date(newVal);
+});
+
+</script>
+
+<template>
+    <EntityCalendarGrid
+        ref="entityCalendarRef"
+        :data-key="dataKey"
+        :calendar-component="VehicleCalendar"
+        :additional-props="{ daysMap: days }"
+        @refresh-events="refreshEvents"
+        v-bind="$attrs"
+    />
+</template>
\ No newline at end of file
diff --git a/src/pages/Route/Vehicle/locale/en.yml b/src/pages/Route/Vehicle/locale/en.yml
index af6f78fd1..aa1c6d185 100644
--- a/src/pages/Route/Vehicle/locale/en.yml
+++ b/src/pages/Route/Vehicle/locale/en.yml
@@ -15,6 +15,8 @@ vehicle:
     remove: Vehicle removed
     search: Search Vehicle
     searchInfo: Search by id or number plate
+    deleteTitle: This item will be deleted
+    deleteSubtitle: Are you sure you want to continue?
     params:
         vehicleTypeFk: Type
         vehicleStateFk: State
diff --git a/src/pages/Route/Vehicle/locale/es.yml b/src/pages/Route/Vehicle/locale/es.yml
index 9fd0d3e91..463784c55 100644
--- a/src/pages/Route/Vehicle/locale/es.yml
+++ b/src/pages/Route/Vehicle/locale/es.yml
@@ -15,6 +15,8 @@ vehicle:
     remove: Vehículo eliminado
     search: Buscar Vehículo
     searchInfo: Buscar por id o matrícula
+    deleteTitle: Este elemento será eliminado
+    deleteSubtitle: ¿Seguro que quieres continuar?
     params:
         vehicleTypeFk: Tipo
         vehicleStateFk: Estado
diff --git a/src/pages/Route/locale/en.yml b/src/pages/Route/locale/en.yml
index e7e2d691e..ca4a8ce9a 100644
--- a/src/pages/Route/locale/en.yml
+++ b/src/pages/Route/locale/en.yml
@@ -51,6 +51,11 @@ route:
         agencyModeName: Agency route
         isOwn: Own
         isAnyVolumeAllowed: Any volume allowed
+        created: Created
+        addressFromFk: Sender
+        addressToFk: Destination
+        landed: Landed
+        ead: EAD
     Worker: Worker
     Agency: Agency
     Vehicle: Vehicle
@@ -70,21 +75,3 @@ route:
     searchInfo: You can search by route reference
     dated: Dated
     preview: Preview
-    cmr:
-        search: Search Cmr
-        searchInfo: You can search Cmr by Id
-        params:
-            results: results
-            cmrFk: CMR id
-            hasCmrDms: Attached in gestdoc
-            'true': 'Yes'
-            'false': 'No'
-            ticketFk: Ticketd id
-            routeFk: Route id
-            countryFk: Country
-            clientFk: Client id
-            warehouseFk: Warehouse
-            shipped: Preparation date
-            viewCmr: View CMR
-            downloadCmrs: Download CMRs
-            search: General search
diff --git a/src/pages/Route/locale/es.yml b/src/pages/Route/locale/es.yml
index 2785ded31..fe3ba08be 100644
--- a/src/pages/Route/locale/es.yml
+++ b/src/pages/Route/locale/es.yml
@@ -47,11 +47,16 @@ route:
         routeFk: Id ruta
         clientFk: Id cliente
         countryFk: Pais
-        shipped: Fecha preparación
+        shipped: F. envío
         agencyModeName: Agencia Ruta
         agencyAgreement: Agencia Acuerdo
         isOwn: Propio
         isAnyVolumeAllowed: Cualquier volumen
+        created: Creado
+        addressFromFk: Remitente
+        addressToFk: Destinatario
+        landed: F. entrega
+        ead: ETD
     Worker: Trabajador
     Agency: Agencia
     Vehicle: Vehículo
diff --git a/src/pages/Shelving/Parking/Card/ParkingDescriptorProxy.vue b/src/pages/Shelving/Parking/Card/ParkingDescriptorProxy.vue
index e78a2b238..cff1f75c2 100644
--- a/src/pages/Shelving/Parking/Card/ParkingDescriptorProxy.vue
+++ b/src/pages/Shelving/Parking/Card/ParkingDescriptorProxy.vue
@@ -4,11 +4,6 @@ import ParkingSummary from './ParkingSummary.vue';
 </script>
 <template>
     <QPopupProxy style="max-width: 10px">
-        <ParkingDescriptor
-            v-if="$attrs.id"
-            v-bind="$attrs.id"
-            :summary="ParkingSummary"
-            :proxy-render="true"
-        />
+        <ParkingDescriptor v-if="$attrs.id" v-bind="$attrs" :summary="ParkingSummary" />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 2e3acdfb6..d26151994 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -7,12 +7,11 @@ import FetchData from 'components/FetchData.vue';
 import CrudModel from 'components/CrudModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 import { useQuasar } from 'quasar';
+import VnBankDetailsForm from 'src/components/common/VnBankDetailsForm.vue';
 
 const { t } = useI18n();
 const { notify } = useNotify();
@@ -26,11 +25,6 @@ const wireTransferFk = ref(null);
 const bankEntitiesOptions = ref([]);
 const filteredBankEntitiesOptions = ref([]);
 
-const onBankEntityCreated = async (dataSaved, rowData) => {
-    await bankEntitiesRef.value.fetch();
-    rowData.bankEntityFk = dataSaved.id;
-};
-
 const onChangesSaved = async () => {
     if (supplier.value.payMethodFk !== wireTransferFk.value)
         quasar
@@ -56,23 +50,6 @@ const setWireTransfer = async () => {
     await axios.patch(`Suppliers/${route.params.id}`, params);
     notify('globals.dataSaved', 'positive');
 };
-
-function findBankFk(value, row) {
-    row.bankEntityFk = null;
-    if (!value) return;
-
-    const bankEntityFk = bankEntitiesOptions.value.find((b) => b.id == value.slice(4, 8));
-    if (bankEntityFk) row.bankEntityFk = bankEntityFk.id;
-}
-
-function bankEntityFilter(val) {
-    const needle = val.toLowerCase();
-    filteredBankEntitiesOptions.value = bankEntitiesOptions.value.filter(
-        (bank) =>
-            bank.bic.toLowerCase().startsWith(needle) ||
-            bank.name.toLowerCase().includes(needle),
-    );
-}
 </script>
 <template>
     <FetchData
@@ -118,47 +95,16 @@ function bankEntityFilter(val) {
                     :key="index"
                     class="row q-gutter-md q-mb-md"
                 >
-                    <VnInput
-                        :label="t('supplier.accounts.iban')"
-                        v-model="row.iban"
-                        @update:model-value="(value) => findBankFk(value, row)"
-                        :required="true"
-                    >
-                        <template #append>
-                            <QIcon name="info" class="cursor-info">
-                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </VnInput>
-                    <VnSelectDialog
-                        :label="t('worker.create.bankEntity')"
-                        v-model="row.bankEntityFk"
-                        :options="filteredBankEntitiesOptions"
-                        :filter-fn="bankEntityFilter"
-                        option-label="bic"
-                        hide-selected
-                        :required="true"
-                        :roles-allowed-to-create="['financial']"
-                    >
-                        <template #form>
-                            <CreateBankEntityForm
-                                @on-data-saved="
-                                    (_, requestResponse) =>
-                                        onBankEntityCreated(requestResponse, row)
-                                "
-                            />
-                        </template>
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection v-if="scope.opt">
-                                    <QItemLabel
-                                        >{{ scope.opt.bic }}
-                                        {{ scope.opt.name }}</QItemLabel
-                                    >
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelectDialog>
+                    <VnBankDetailsForm
+                        v-model:iban="row.iban"
+                        v-model:bankEntityFk="row.bankEntityFk"
+                        @update-bic="
+                            ({ iban, bankEntityFk }) => {
+                                row.iban = iban;
+                                row.bankEntityFk = bankEntityFk;
+                            }
+                        "
+                    />
                     <VnInput
                         :label="t('supplier.accounts.beneficiary')"
                         v-model="row.beneficiary"
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 61932468c..5b04e9cfd 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -25,7 +25,9 @@ const { validate } = useValidator();
 const { notify } = useNotify();
 const router = useRouter();
 const { t } = useI18n();
-const canEditZone = useAcl().hasAcl('Ticket', 'editZone', 'WRITE');
+const canEditZone = useAcl().hasAny([
+    { model: 'Ticket', props: 'editZone', accessType: 'WRITE' },
+]);
 
 const agencyFetchRef = ref();
 const warehousesOptions = ref([]);
@@ -68,15 +70,20 @@ async function getDate(query, params) {
     for (const param in params) {
         if (!params[param]) return;
     }
-
-    formData.value.zoneFk = null;
     zonesOptions.value = [];
     const { data } = await axios.get(query, { params });
     if (!data) return notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
 
     formData.value.zoneFk = data.zoneFk;
-    if (data.landed) formData.value.landed = data.landed;
-    if (data.shipped) formData.value.shipped = data.shipped;
+    formData.value.landed = data.landed;
+    const shippedDate = new Date(params.shipped);
+    const landedDate = new Date(data.hour);
+    shippedDate.setHours(
+        landedDate.getHours(),
+        landedDate.getMinutes(),
+        landedDate.getSeconds(),
+    );
+    formData.value.shipped = shippedDate.toISOString();
 }
 
 const onChangeZone = async (zoneId) => {
@@ -125,6 +132,7 @@ const addressId = computed({
             formData.value.addressFk = val;
             onChangeAddress(val);
             getShipped({
+                shipped: formData.value?.shipped,
                 landed: formData.value?.landed,
                 addressFk: val,
                 agencyModeFk: formData.value?.agencyModeFk,
@@ -239,6 +247,9 @@ async function getZone(options) {
     <FetchData
         url="Warehouses"
         @on-fetch="(data) => (warehousesOptions = data)"
+        :where="{
+            isForTicket: true,
+        }"
         auto-load
     />
     <FetchData
@@ -419,6 +430,7 @@ async function getZone(options) {
                 v-model="formData.shipped"
                 :required="true"
                 :rules="validate('basicData.shippedHour')"
+                disabled
                 @update:model-value="setShipped"
             />
             <VnInputDate
diff --git a/src/pages/Ticket/Card/ExpeditionNewTicket.vue b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
index 6ecadfe6d..aec8049af 100644
--- a/src/pages/Ticket/Card/ExpeditionNewTicket.vue
+++ b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
@@ -1,5 +1,4 @@
 <script setup>
-import { reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
@@ -30,31 +29,29 @@ const { t } = useI18n();
 const router = useRouter();
 const { notify } = useNotify();
 
-const newTicketFormData = reactive({});
 const date = new Date();
 
-const createTicket = async () => {
+async function createTicket(formData) {
     const expeditionIds = $props.selectedExpeditions.map((expedition) => expedition.id);
     const params = {
         clientId: $props.ticket.clientFk,
-        landed: newTicketFormData.landed,
+        landed: formData.landed,
         warehouseId: $props.ticket.warehouseFk,
         addressId: $props.ticket.addressFk,
         agencyModeId: $props.ticket.agencyModeFk,
-        routeId: newTicketFormData.routeFk,
+        routeId: formData.routeFk,
         expeditionIds: expeditionIds,
     };
-
     const { data } = await axios.post('Expeditions/moveExpeditions', params);
     notify(t('globals.dataSaved'), 'positive');
     router.push({ name: 'TicketSummary', params: { id: data.id } });
-};
+}
 </script>
 
 <template>
     <FormModelPopup
         model="expeditionNewTicket"
-        :form-initial-data="newTicketFormData"
+        :form-initial-data="{}"
         :save-fn="createTicket"
     >
         <template #form-inputs="{ data }">
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index a3e25d63e..f2b474156 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -55,73 +55,75 @@ async function handleSave(e) {
         auto-load
         url="ObservationTypes"
     />
-    <div class="flex justify-center">
-        <CrudModel
-            ref="ticketNotesCrudRef"
-            data-key="TicketNotes"
-            url="TicketObservations"
-            model="TicketNotes"
-            :filter="crudModelFilter"
-            :data-required="crudModelRequiredData"
-            :default-remove="false"
-            auto-load
-            style="max-width: 800px"
-        >
-            <template #body="{ rows }">
-                <QCard class="q-px-lg q-py-md">
-                    <div
-                        v-for="(row, index) in rows"
-                        :key="index"
-                        class="q-mb-md row q-gutter-x-md"
-                    >
-                        <VnSelect
-                            :label="t('ticketNotes.observationType')"
-                            :options="observationTypes"
-                            hide-selected
-                            option-label="description"
-                            option-value="id"
-                            v-model="row.observationTypeFk"
-                            :disable="!!row.id"
-                            data-cy="ticketNotesObservationType"
-                        />
-                        <VnInput
-                            :label="t('basicData.description')"
-                            v-model="row.description"
-                            class="col"
-                            @keydown.enter.stop="handleSave"
-                            autogrow
-                            data-cy="ticketNotesDescription"
-                        />
-                        <QIcon
-                            name="delete"
-                            size="sm"
-                            class="cursor-pointer"
-                            color="primary"
-                            @click="handleDelete(row)"
-                            data-cy="ticketNotesRemoveNoteBtn"
+    <div class="full-width flex justify-center">
+        <QPage class="card-width q-pa-lg">
+            <CrudModel
+                class="fit"
+                ref="ticketNotesCrudRef"
+                data-key="TicketNotes"
+                url="TicketObservations"
+                model="TicketNotes"
+                :filter="crudModelFilter"
+                :data-required="crudModelRequiredData"
+                :default-remove="false"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <QCard class="q-px-lg q-py-md">
+                        <div
+                            v-for="(row, index) in rows"
+                            :key="index"
+                            class="q-mb-md row items-center q-gutter-x-md"
                         >
-                            <QTooltip>
-                                {{ t('ticketNotes.removeNote') }}
-                            </QTooltip>
-                        </QIcon>
-                    </div>
-                    <VnRow v-if="observationTypes.length > rows.length">
-                        <QBtn
-                            icon="add_circle"
-                            v-shortcut="'+'"
-                            flat
-                            class="fill-icon-on-hover q-ml-md"
-                            color="primary"
-                            @click="ticketNotesCrudRef.insert()"
-                            data-cy="ticketNotesAddNoteBtn"
-                        >
-                            <QTooltip>
-                                {{ t('ticketNotes.addNote') }}
-                            </QTooltip>
-                        </QBtn>
-                    </VnRow>
-                </QCard>
-            </template>
-        </CrudModel>
+                            <VnSelect
+                                :label="t('ticketNotes.observationType')"
+                                :options="observationTypes"
+                                hide-selected
+                                option-label="description"
+                                option-value="id"
+                                v-model="row.observationTypeFk"
+                                :disable="!!row.id"
+                                data-cy="ticketNotesObservationType"
+                            />
+                            <VnInput
+                                :label="t('basicData.description')"
+                                v-model="row.description"
+                                class="col"
+                                @keydown.enter.stop="handleSave"
+                                autogrow
+                                data-cy="ticketNotesDescription"
+                            />
+                            <QIcon
+                                name="delete"
+                                size="sm"
+                                class="cursor-pointer"
+                                color="primary"
+                                @click="handleDelete(row)"
+                                data-cy="ticketNotesRemoveNoteBtn"
+                            >
+                                <QTooltip>
+                                    {{ t('ticketNotes.removeNote') }}
+                                </QTooltip>
+                            </QIcon>
+                        </div>
+                        <VnRow v-if="observationTypes.length > rows.length">
+                            <QBtn
+                                icon="add_circle"
+                                v-shortcut="'+'"
+                                flat
+                                class="fill-icon-on-hover q-ml-md"
+                                color="primary"
+                                @click="ticketNotesCrudRef.insert()"
+                                data-cy="ticketNotesAddNoteBtn"
+                            >
+                                <QTooltip>
+                                    {{ t('ticketNotes.addNote') }}
+                                </QTooltip>
+                            </QBtn>
+                        </VnRow>
+                    </QCard>
+                </template>
+            </CrudModel>
+        </QPage>
     </div>
 </template>
diff --git a/src/pages/Ticket/Card/TicketPackage.vue b/src/pages/Ticket/Card/TicketPackage.vue
index 5fbf4c800..ff55bf9d4 100644
--- a/src/pages/Ticket/Card/TicketPackage.vue
+++ b/src/pages/Ticket/Card/TicketPackage.vue
@@ -49,88 +49,95 @@ watch(
     <FetchData
         @on-fetch="(data) => (listPackagingsOptions = data)"
         auto-load
-        :filter="{ fields: ['packagingFk', 'name'], order: 'name ASC' }"
         url="Packagings/listPackaging"
+        :filter="{
+            fields: ['packagingFk', 'name'],
+            order: ['name ASC'],
+        }"
     />
-    <div class="flex justify-center">
-        <CrudModel
-            ref="ticketPackagingsCrudRef"
-            data-key="TicketPackagings"
-            url="TicketPackagings"
-            model="TicketPackagings"
-            :filter="crudModelFilter"
-            :data-required="crudModelRequiredData"
-            :default-remove="false"
-            auto-load
-            style="max-width: 800px"
-        >
-            <template #body="{ rows, validate }">
-                <QCard class="q-px-lg q-py-md">
-                    <div
-                        v-for="(row, index) in rows"
-                        :key="index"
-                        class="q-mb-md row items-center q-gutter-x-md"
-                    >
-                        <VnSelect
-                            :label="t('package.package')"
-                            :options="listPackagingsOptions"
-                            hide-selected
-                            option-label="name"
-                            option-value="packagingFk"
-                            v-model="row.packagingFk"
+    <div class="full-width flex justify-center">
+        <QPage class="card-width q-pa-lg">
+            <CrudModel
+                ref="ticketPackagingsCrudRef"
+                data-key="TicketPackagings"
+                url="TicketPackagings"
+                model="TicketPackagings"
+                :filter="crudModelFilter"
+                :data-required="crudModelRequiredData"
+                :default-remove="false"
+                auto-load
+            >
+                <template #body="{ rows, validate }">
+                    <QCard class="q-px-lg q-py-md">
+                        <div
+                            v-for="(row, index) in rows"
+                            :key="index"
+                            class="q-mb-md row items-center q-gutter-x-md"
                         >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>
-                                            {{ scope.opt?.name }}
-                                        </QItemLabel>
-                                        <QItemLabel caption>
-                                            #{{ scope.opt?.itemFk }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                        <VnInput
-                            :label="t('basicData.quantity')"
-                            v-model.number="row.quantity"
-                            class="col"
-                            type="number"
-                            min="1"
-                            :required="true"
-                            @update:model-value="handleInputQuantityClear(row)"
-                            :rules="validate('TicketPackaging.quantity')"
-                        />
-                        <VnInputDate :label="t('package.added')" v-model="row.created" />
-                        <QIcon
-                            name="delete"
-                            size="sm"
-                            class="cursor-pointer"
-                            color="primary"
-                            @click="ticketPackagingsCrudRef.remove([row])"
-                        >
-                            <QTooltip>
-                                {{ t('package.removePackage') }}
-                            </QTooltip>
-                        </QIcon>
-                    </div>
-                    <VnRow>
-                        <QBtn
-                            icon="add_circle"
-                            v-shortcut="'+'"
-                            flat
-                            class="fill-icon-on-hover q-ml-md"
-                            color="primary"
-                            @click="ticketPackagingsCrudRef.insert()"
-                        >
-                            <QTooltip>
-                                {{ t('package.addPackage') }}
-                            </QTooltip>
-                        </QBtn>
-                    </VnRow>
-                </QCard>
-            </template>
-        </CrudModel>
+                            <VnSelect
+                                :label="t('package.package')"
+                                :options="listPackagingsOptions"
+                                hide-selected
+                                option-label="name"
+                                option-value="packagingFk"
+                                v-model="row.packagingFk"
+                            >
+                                <template #option="scope">
+                                    <QItem v-bind="scope.itemProps">
+                                        <QItemSection>
+                                            <QItemLabel>
+                                                {{ scope.opt?.name }}
+                                            </QItemLabel>
+                                            <QItemLabel caption>
+                                                #{{ scope.opt?.itemFk }}
+                                            </QItemLabel>
+                                        </QItemSection>
+                                    </QItem>
+                                </template>
+                            </VnSelect>
+                            <VnInput
+                                :label="t('basicData.quantity')"
+                                v-model.number="row.quantity"
+                                class="col"
+                                type="number"
+                                min="1"
+                                :required="true"
+                                @update:model-value="handleInputQuantityClear(row)"
+                                :rules="validate('TicketPackaging.quantity')"
+                            />
+                            <VnInputDate
+                                :label="t('package.added')"
+                                v-model="row.created"
+                            />
+                            <QIcon
+                                name="delete"
+                                size="sm"
+                                class="cursor-pointer"
+                                color="primary"
+                                @click="ticketPackagingsCrudRef.remove([row])"
+                            >
+                                <QTooltip>
+                                    {{ t('package.removePackage') }}
+                                </QTooltip>
+                            </QIcon>
+                        </div>
+                        <VnRow>
+                            <QBtn
+                                icon="add_circle"
+                                v-shortcut="'+'"
+                                flat
+                                class="fill-icon-on-hover q-ml-md"
+                                color="primary"
+                                @click="ticketPackagingsCrudRef.insert()"
+                            >
+                                <QTooltip>
+                                    {{ t('package.addPackage') }}
+                                </QTooltip>
+                            </QBtn>
+                        </VnRow>
+                    </QCard>
+                </template>
+            </CrudModel>
+        </QPage>
     </div>
 </template>
diff --git a/src/pages/Ticket/Negative/TicketLackFilter.vue b/src/pages/Ticket/Negative/TicketLackFilter.vue
index 78c030476..8c999e0b4 100644
--- a/src/pages/Ticket/Negative/TicketLackFilter.vue
+++ b/src/pages/Ticket/Negative/TicketLackFilter.vue
@@ -47,7 +47,14 @@ const setUserParams = (params) => {
 </script>
 
 <template>
-    <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
+    <FetchData
+        url="Warehouses"
+        @on-fetch="(data) => (warehouses = data)"
+        :where="{
+            isForTicket: true,
+        }"
+        auto-load
+    />
     <FetchData
         url="ItemCategories"
         :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index ea6c76781..c98484ea3 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -385,7 +385,12 @@ watch(
         if (!$el) return;
         const head = $el.querySelector('thead');
         const firstRow = $el.querySelector('thead > tr');
-
+        const headSelectionCol = $el.querySelector(
+            'thead tr.bg-header th.q-table--col-auto-width',
+        );
+        if (headSelectionCol) {
+            headSelectionCol.classList.add('horizontal-separator');
+        }
         const newRow = document.createElement('tr');
         destinationElRef.value = document.createElement('th');
         originElRef.value = document.createElement('th');
@@ -394,8 +399,8 @@ watch(
         destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
         originElRef.value.classList.add('text-uppercase', 'color-vn-label');
 
-        destinationElRef.value.setAttribute('colspan', '7');
-        originElRef.value.setAttribute('colspan', '9');
+        destinationElRef.value.setAttribute('colspan', '10');
+        originElRef.value.setAttribute('colspan', '10');
 
         destinationElRef.value.textContent = `${t(
             'advanceTickets.destination',
@@ -490,8 +495,6 @@ watch(
                 selection: 'multiple',
             }"
             v-model:selected="selectedTickets"
-            :pagination="{ rowsPerPage: 0 }"
-            :no-data-label="$t('globals.noResults')"
             :right-search="false"
             :order="['futureTotalWithVat ASC']"
             auto-load
diff --git a/src/pages/Ticket/TicketAdvanceFilter.vue b/src/pages/Ticket/TicketAdvanceFilter.vue
index a88d06300..5867e8289 100644
--- a/src/pages/Ticket/TicketAdvanceFilter.vue
+++ b/src/pages/Ticket/TicketAdvanceFilter.vue
@@ -51,6 +51,9 @@ onMounted(async () => await getItemPackingTypes());
     <FetchData
         url="Warehouses"
         @on-fetch="(data) => (warehousesOptions = data)"
+        :where="{
+            isForTicket: true,
+        }"
         auto-load
     />
     <VnFilterPanel
diff --git a/src/pages/Ticket/TicketCreate.vue b/src/pages/Ticket/TicketCreate.vue
index 96d200547..7510713da 100644
--- a/src/pages/Ticket/TicketCreate.vue
+++ b/src/pages/Ticket/TicketCreate.vue
@@ -67,14 +67,12 @@ const onClientSelected = async (formData) => {
 
 const fetchAvailableAgencies = async (formData) => {
     resetAgenciesSelector(formData);
-    const response= await getAgencies(formData, selectedClient.value);
+    const response = await getAgencies(formData, selectedClient.value);
     if (!response) return;
-    
-    const { options, agency } =  response
-    if(options)
-        agenciesOptions.value = options;
-    if(agency)
-        formData.agencyModeId = agency;
+
+    const { options, agency } = response;
+    if (options) agenciesOptions.value = options;
+    if (agency) formData.agencyModeId = agency;
 };
 
 const redirectToTicketList = (_, { id }) => {
@@ -92,6 +90,9 @@ const redirectToTicketList = (_, { id }) => {
     <FetchData
         url="Warehouses"
         @on-fetch="(data) => (warehousesOptions = data)"
+        :where="{
+            isForTicket: true,
+        }"
         order="name"
         auto-load
     />
diff --git a/src/pages/Ticket/TicketCreateDialog.vue b/src/pages/Ticket/TicketCreateDialog.vue
index 2245c5c81..9715da6f9 100644
--- a/src/pages/Ticket/TicketCreateDialog.vue
+++ b/src/pages/Ticket/TicketCreateDialog.vue
@@ -40,7 +40,7 @@ onBeforeMount(async () => {
 
 function resetAgenciesSelector(formData) {
     agenciesOptions.value = [];
-    if(formData) formData.agencyModeId = null;
+    if (formData) formData.agencyModeId = null;
 }
 
 const fetchClient = async (formData) => {
@@ -67,14 +67,12 @@ const onClientSelected = async (formData) => {
 
 const fetchAvailableAgencies = async (formData) => {
     resetAgenciesSelector(formData);
-    const response= await getAgencies(formData, selectedClient.value);
+    const response = await getAgencies(formData, selectedClient.value);
     if (!response) return;
-        
-    const { options, agency } =  response
-    if(options)
-        agenciesOptions.value = options;
-    if(agency)
-        formData.agencyModeId = agency;
+
+    const { options, agency } = response;
+    if (options) agenciesOptions.value = options;
+    if (agency) formData.agencyModeId = agency;
 };
 
 const redirectToTicketList = (_, { id }) => {
@@ -86,6 +84,9 @@ const redirectToTicketList = (_, { id }) => {
     <FetchData
         url="Warehouses"
         @on-fetch="(data) => (warehousesOptions = data)"
+        :where="{
+            isForTicket: true,
+        }"
         order="name"
         auto-load
     />
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 9e9b17ca6..0616ee8ac 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -41,8 +41,19 @@ const groupedStates = ref([]);
         @on-fetch="(data) => (agencies = data)"
         auto-load
     />
-    <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <FetchData
+        url="Warehouses"
+        @on-fetch="(data) => (warehouses = data)"
+        auto-load
+        :where="{
+            isForTicket: true,
+        }"
+    />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :unremovableParams="['from', 'to']"
+    >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index 588379ed9..6ed3afcc6 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -89,7 +89,7 @@ const ticketColumns = computed(() => [
     },
     {
         label: t('advanceTickets.import'),
-        name: 'import',
+        name: 'totalWithVat',
         align: 'left',
         headerClass: 'horizontal-separator',
         columnFilter: false,
@@ -317,7 +317,7 @@ watch(
                 </QBadge>
                 <span v-else> {{ dashIfEmpty(row.state) }}</span>
             </template>
-            <template #column-import="{ row }">
+            <template #column-totalWithVat="{ row }">
                 <QBadge
                     :text-color="
                         totalPriceColor(row.totalWithVat) === 'warning'
diff --git a/src/pages/Ticket/TicketFutureFilter.vue b/src/pages/Ticket/TicketFutureFilter.vue
index 033b47f72..a328479eb 100644
--- a/src/pages/Ticket/TicketFutureFilter.vue
+++ b/src/pages/Ticket/TicketFutureFilter.vue
@@ -55,6 +55,9 @@ onMounted(async () => {
     <FetchData
         url="Warehouses"
         @on-fetch="(data) => (warehousesOptions = data)"
+        :where="{
+            isForTicket: true,
+        }"
         auto-load
     />
     <VnFilterPanel
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 096aa101c..b7647260f 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -204,6 +204,9 @@ const columns = computed(() => [
         attrs: {
             url: 'warehouses',
             fields: ['id', 'name'],
+            where: {
+                isForTicket: true,
+            },
         },
         format: (row) => row.warehouse,
         columnField: {
@@ -670,9 +673,11 @@ function setReference(data) {
                                 :sort-by="['name']"
                                 :label="t('globals.warehouse')"
                                 v-model="data.warehouseId"
-                                :options="warehousesOptions"
                                 hide-selected
                                 required
+                                :where="{
+                                    isForTicket: true,
+                                }"
                                 @update:model-value="() => fetchAvailableAgencies(data)"
                             />
                         </div>
diff --git a/src/pages/Ticket/TicketWeekly.vue b/src/pages/Ticket/TicketWeekly.vue
index d6493550b..3906d6c44 100644
--- a/src/pages/Ticket/TicketWeekly.vue
+++ b/src/pages/Ticket/TicketWeekly.vue
@@ -102,6 +102,9 @@ const columns = computed(() => [
             attrs: {
                 url: 'Warehouses',
                 fields: ['id', 'name'],
+                where: {
+                    isForTicket: true,
+                },
             },
             inWhere: true,
         },
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 175f0955b..50443e2b0 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -208,6 +208,7 @@ ticketList:
     hour: Hour
     rounding: Rounding
     noVerifiedData: No verified data
+    warehouse: Warehouse
     purchaseRequest: Purchase request
     notVisible: Not visible
     clientFrozen: Client frozen
diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index a6ef8ad19..6ff73d5fa 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -28,13 +28,17 @@ const warehousesOptionsIn = ref([]);
         url="Warehouses"
         @on-fetch="(data) => (warehousesOptionsOut = data)"
         auto-load
-        :filter="{ where: { isOrigin: TRUE } }"
+        :where="{
+            isOrigin: true,
+        }"
     />
     <FetchData
         url="Warehouses"
         @on-fetch="(data) => (warehousesOptionsIn = data)"
         auto-load
-        :filter="{ where: { isDestiny: TRUE } }"
+        :where="{
+            isDestiny: true,
+        }"
     />
     <FormModel :url-update="`Travels/${route.params.id}`" model="Travel">
         <template #form="{ data }">
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 76ffdba20..c664c3afd 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -183,7 +183,9 @@ warehouses();
                     <VnSelect
                         :label="t('extraCommunity.filter.warehouseOutFk')"
                         v-model="params.warehouseOutFk"
-                        :options="warehousesOptions"
+                        :options="
+                            warehousesOptions.filter((option) => option.isOrigin === true)
+                        "
                         option-value="id"
                         option-label="name"
                         hide-selected
@@ -197,7 +199,11 @@ warehouses();
                     <VnSelect
                         :label="t('extraCommunity.filter.warehouseInFk')"
                         v-model="params.warehouseInFk"
-                        :options="warehousesOptions"
+                        :options="
+                            warehousesOptions.filter(
+                                (option) => option.isDestiny === true,
+                            )
+                        "
                         option-value="id"
                         option-label="name"
                         hide-selected
diff --git a/src/pages/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
index 35a936134..acadd88c1 100644
--- a/src/pages/Travel/TravelCreate.vue
+++ b/src/pages/Travel/TravelCreate.vue
@@ -81,6 +81,9 @@ const redirectToTravelBasicData = (_, { id }) => {
                         option-value="id"
                         option-label="name"
                         hide-selected
+                        :where="{
+                            isOrigin: true,
+                        }"
                     />
                     <VnSelect
                         :label="t('globals.warehouseIn')"
@@ -89,6 +92,9 @@ const redirectToTravelBasicData = (_, { id }) => {
                         option-value="id"
                         option-label="name"
                         hide-selected
+                        :where="{
+                            isDestiny: true,
+                        }"
                     />
                 </VnRow>
             </template>
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index 5498fd269..6d0a1a73a 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -64,6 +64,9 @@ defineExpose({ states });
                     option-filter="name"
                     dense
                     filled
+                    :where="{
+                        isDestiny: true,
+                    }"
                 />
                 <VnInputDate
                     :label="t('travel.shipped')"
@@ -89,6 +92,9 @@ defineExpose({ states });
                     option-filter="name"
                     dense
                     filled
+                    :where="{
+                        isOrigin: true,
+                    }"
                 />
                 <VnInputDate
                     :label="t('travel.landed')"
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 32ddc639a..65c02a661 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -99,6 +99,7 @@ const columns = computed(() => [
             fields: ['id', 'name'],
             optionLabel: 'name',
             optionValue: 'id',
+            where: { isDestiny: true },
         },
         format: (row) => row.warehouseInName,
         columnField: {
@@ -133,6 +134,7 @@ const columns = computed(() => [
         attrs: {
             url: 'warehouses',
             fields: ['id', 'name'],
+            where: { isOrigin: true },
         },
         format: (row) => row.warehouseOutName,
         columnField: {
diff --git a/src/pages/Worker/Card/WorkerCalendarItem.vue b/src/pages/Worker/Card/WorkerCalendarItem.vue
index 86d227ad3..071fa06be 100644
--- a/src/pages/Worker/Card/WorkerCalendarItem.vue
+++ b/src/pages/Worker/Card/WorkerCalendarItem.vue
@@ -11,6 +11,7 @@ import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
+import useWeekdaysOrder from 'src/composables/getWeekdays';
 
 const props = defineProps({
     year: {
@@ -44,6 +45,7 @@ const { locale } = useI18n();
 
 const calendarRef = ref(null);
 const weekdayStore = useWeekdayStore();
+const weekDays = useWeekdaysOrder();
 const selectedDate = ref();
 const calendarEventDates = [];
 const today = ref(date.formatDate(Date.vnNew(), 'YYYY-MM-DD'));
@@ -182,7 +184,7 @@ watch(_year, (newValue) => {
                 no-outside-days
                 :selected-dates="calendarEventDates"
                 no-active-date
-                :weekdays="[1, 2, 3, 4, 5, 6, 0]"
+                :weekdays="weekDays"
                 short-weekday-label
                 :locale="locale"
                 :now="today"
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 591dadcd2..b1bde6d75 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -4,9 +4,11 @@ import VnCard from 'src/components/common/VnCard.vue';
 </script>
 <template>
     <VnCard
-        data-key="Worker"
+        :data-key="$attrs['data-key'] ?? 'Worker'"
         url="Workers/summary"
         :id-in-where="true"
         :descriptor="WorkerDescriptor"
+        v-bind="$attrs"
+        v-on="$attrs"
     />
 </template>
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 9576e7e84..db0c7c096 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -2,7 +2,6 @@
 import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import EntityDescriptor from 'src/components/ui/EntityDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import VnChangePassword from 'src/components/common/VnChangePassword.vue';
@@ -11,6 +10,8 @@ import VnImg from 'src/components/ui/VnImg.vue';
 import EditPictureForm from 'components/EditPictureForm.vue';
 import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
 import DepartmentDescriptorProxy from 'src/pages/Worker/Department/Card/DepartmentDescriptorProxy.vue';
+import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
+import WorkerCard from './WorkerCard.vue';
 
 const $props = defineProps({
     id: {
@@ -52,14 +53,17 @@ const handlePhotoUpdated = (evt = false) => {
 };
 </script>
 <template>
-    <EntityDescriptor
+    <CardDescriptor
+        v-bind="$attrs"
         ref="cardDescriptorRef"
         :data-key="dataKey"
         :summary="$props.summary"
-        url="Workers/summary"
+        :card="WorkerCard"
+        :id="entityId"
         :filter="{ where: { id: entityId } }"
         title="user.nickname"
         @on-fetch="getIsExcluded"
+        module="Worker"
     >
         <template #menu="{ entity }">
             <WorkerDescriptorMenu
@@ -165,7 +169,7 @@ const handlePhotoUpdated = (evt = false) => {
                 </QBtn>
             </QCardActions>
         </template>
-    </EntityDescriptor>
+    </CardDescriptor>
     <VnChangePassword
         ref="changePassRef"
         :submit-fn="
diff --git a/src/pages/Worker/Card/WorkerTimeControlCalendar.vue b/src/pages/Worker/Card/WorkerTimeControlCalendar.vue
index 46ae4b698..e9b9cc915 100644
--- a/src/pages/Worker/Card/WorkerTimeControlCalendar.vue
+++ b/src/pages/Worker/Card/WorkerTimeControlCalendar.vue
@@ -4,6 +4,8 @@ import { useI18n } from 'vue-i18n';
 
 import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
 import QCalendarMonthWrapper from 'src/components/ui/QCalendarMonthWrapper.vue';
+import useWeekdaysOrder from 'src/composables/getWeekdays';
+
 const $props = defineProps({
     modelValue: {
         type: String,
@@ -32,6 +34,7 @@ const emit = defineEmits(['update:modelValue', 'clickDate', 'onMoved']);
 const { locale } = useI18n();
 
 const calendarRef = ref(null);
+const weekDays = useWeekdaysOrder();
 
 const stateClasses = {
     CONFIRMED: {
@@ -135,7 +138,7 @@ const paintWorkWeeks = async () => {
                 ref="calendarRef"
                 v-model="value"
                 show-work-weeks
-                :weekdays="[1, 2, 3, 4, 5, 6, 0]"
+                :weekdays="weekDays"
                 :selected-dates="selectedDates"
                 :min-weekday-label="1"
                 :locale="locale"
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 613ac2d66..40bdd0e34 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -10,15 +10,13 @@ import VnRadio from 'src/components/common/VnRadio.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
 import FetchData from 'src/components/FetchData.vue';
 import WorkerFilter from './WorkerFilter.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import VnSelectWorker from 'src/components/common/VnSelectWorker.vue';
 import VnSection from 'src/components/common/VnSection.vue';
-import VnInputBic from 'src/components/common/VnInputBic.vue';
+import VnBankDetailsForm from 'src/components/common/VnBankDetailsForm.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -122,12 +120,6 @@ onBeforeMount(async () => {
     ).data?.payMethodFk;
 });
 
-async function handleNewBankEntity(data, resp) {
-    await bankEntitiesRef.value.fetch();
-    data.bankEntityFk = resp.id;
-    bankEntitiesOptions.value.push(resp);
-}
-
 function handleLocation(data, location) {
     const { town, code, provinceFk, countryFk } = location ?? {};
     data.postcode = code;
@@ -323,51 +315,19 @@ function generateCodeUser(worker) {
                                     (val) => !val && delete data.payMethodFk
                                 "
                             />
-                            <VnInputBic
-                                :label="t('IBAN')"
-                                v-model="data.iban"
-                                :disable="data.isFreelance"
-                                @update-bic="
-                                    (bankEntityFk) => (data.bankEntityFk = bankEntityFk)
-                                "
-                            />
                         </VnRow>
                         <VnRow>
-                            <VnSelectDialog
-                                :label="t('worker.create.bankEntity')"
-                                v-model="data.bankEntityFk"
-                                :options="bankEntitiesOptions"
-                                option-label="name"
-                                option-value="id"
-                                hide-selected
-                                :acls="[
-                                    {
-                                        model: 'BankEntity',
-                                        props: '*',
-                                        accessType: 'WRITE',
-                                    },
-                                ]"
-                                :disable="data.isFreelance"
-                                :filter-options="['bic', 'name']"
-                            >
-                                <template #form>
-                                    <CreateBankEntityForm
-                                        @on-data-saved="
-                                            (_, resp) => handleNewBankEntity(data, resp)
-                                        "
-                                    />
-                                </template>
-                                <template #option="scope">
-                                    <QItem v-bind="scope.itemProps">
-                                        <QItemSection v-if="scope.opt">
-                                            <QItemLabel
-                                                >{{ scope.opt.bic }}
-                                                {{ scope.opt.name }}</QItemLabel
-                                            >
-                                        </QItemSection>
-                                    </QItem>
-                                </template>
-                            </VnSelectDialog>
+                            <VnBankDetailsForm
+                                v-model:iban="data.iban"
+                                v-model:bankEntityFk="data.bankEntityFk"
+                                :disable-element="data.isFreelance"
+                                @update-bic="
+                                    ({ iban, bankEntityFk }) => {
+                                        data.iban = iban;
+                                        data.bankEntityFk = bankEntityFk;
+                                    }
+                                "
+                            />
                         </VnRow>
                     </div>
                 </template>
diff --git a/src/pages/Zone/ZoneCalendar.vue b/src/pages/Zone/ZoneCalendar.vue
index 7cae59698..c2c66d753 100644
--- a/src/pages/Zone/ZoneCalendar.vue
+++ b/src/pages/Zone/ZoneCalendar.vue
@@ -10,6 +10,7 @@ import { QCalendarMonth } from '@quasar/quasar-ui-qcalendar/src/index.js';
 import '@quasar/quasar-ui-qcalendar/src/QCalendarVariables.scss';
 
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+import useWeekdaysOrder from 'src/composables/getWeekdays';
 import axios from 'axios';
 
 const props = defineProps({
@@ -46,6 +47,7 @@ const route = useRoute();
 
 const calendarRef = ref(null);
 const weekdayStore = useWeekdayStore();
+const weekDays = useWeekdaysOrder();
 const showZoneClosingTable = ref(false);
 const zoneClosingData = ref(null);
 const today = ref(date.formatDate(Date.vnNew(), 'YYYY-MM-DD'));
@@ -161,7 +163,7 @@ const handleDateClick = (timestamp) => {
                 show-work-weeks
                 no-outside-days
                 no-active-date
-                :weekdays="[1, 2, 3, 4, 5, 6, 0]"
+                :weekdays="weekDays"
                 short-weekday-label
                 :locale="locale"
                 :now="today"
diff --git a/src/pages/Zone/ZoneCalendarGrid.vue b/src/pages/Zone/ZoneCalendarGrid.vue
index 1ef687b3f..026b15735 100644
--- a/src/pages/Zone/ZoneCalendarGrid.vue
+++ b/src/pages/Zone/ZoneCalendarGrid.vue
@@ -229,22 +229,3 @@ onUnmounted(() => arrayData.destroy());
         </div>
     </QCard>
 </template>
-
-<style lang="scss" scoped>
-.calendars-header {
-    height: 45px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    background-color: $primary;
-    font-weight: bold;
-    font-size: 16px;
-}
-
-.calendars-container {
-    max-width: 800px;
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: space-evenly;
-}
-</style>
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 355eb900e..c8e2f1646 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -189,16 +189,14 @@ const exprBuilder = (param, value) => {
             return {
                 code: { like: `%${value}%` },
             };
+        case 'id':
+        case 'price':
         case 'agencyModeFk':
             return {
-                agencyModeFk: value,
+                [param]: value,
             };
         case 'search':
             return /^\d+$/.test(value) ? { id: value } : { name: { like: `%${value}%` } };
-        case 'price':
-            return {
-                price: value,
-            };
     }
 };
 
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 02eea8c6c..da380313b 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -85,6 +85,7 @@ export default {
             'EntryLatestBuys',
             'EntryStockBought',
             'EntryWasteRecalc',
+            'EntryPreAccount',
         ],
     },
     component: RouterView,
@@ -94,6 +95,7 @@ export default {
             name: 'EntryMain',
             path: '',
             component: () => import('src/components/common/VnModule.vue'),
+            props: (route) => ({ leftDrawer: route.name !== 'EntryPreAccount' }),
             redirect: { name: 'EntryIndexMain' },
             children: [
                 {
@@ -150,6 +152,15 @@ export default {
                     },
                     component: () => import('src/pages/Entry/EntryWasteRecalc.vue'),
                 },
+                {
+                    path: 'pre-account',
+                    name: 'EntryPreAccount',
+                    meta: {
+                        title: 'entryPreAccount',
+                        icon: 'account_balance',
+                    },
+                    component: () => import('src/pages/Entry/EntryPreAccount.vue'),
+                },
             ],
         },
     ],
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 2b7cfc5be..08ba1701f 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -170,6 +170,7 @@ const vehicleCard = {
             'VehicleBasicData',
             'VehicleNotes',
             'VehicleDms',
+            'VehicleEvents'
         ],
     },
     children: [
@@ -209,6 +210,15 @@ const vehicleCard = {
             },
             component: () => import('src/pages/Route/Vehicle/VehicleDms.vue'),
         },
+        {
+            name: 'VehicleEvents',
+            path: 'events',
+            meta: {
+                title: 'calendar',
+                icon: 'vn:calendar',
+            },
+            component: () => import('src/pages/Route/Vehicle/Card/VehicleEvents.vue'),
+        },
     ],
 };
 
diff --git a/test/cypress/docker/find/find.js b/test/cypress/docker/find/find.js
index 4f8063c86..9570dafaa 100644
--- a/test/cypress/docker/find/find.js
+++ b/test/cypress/docker/find/find.js
@@ -6,6 +6,9 @@ const FINDED_PATHS = ['src', E2E_PATH];
 
 function getGitDiff(options) {
     const TARGET_BRANCH = options[2] || 'dev';
+    execSync(`git fetch origin ${TARGET_BRANCH}`, {
+        encoding: 'utf-8',
+    });
     const diff = execSync(`git diff --name-only origin/${TARGET_BRANCH}`, {
         encoding: 'utf-8',
     });
diff --git a/test/cypress/integration/entry/entryPreAccount.spec.js b/test/cypress/integration/entry/entryPreAccount.spec.js
new file mode 100644
index 000000000..59fa4ee45
--- /dev/null
+++ b/test/cypress/integration/entry/entryPreAccount.spec.js
@@ -0,0 +1,48 @@
+/// <reference types="cypress" />
+describe('Entry PreAccount Functionality', () => {
+    beforeEach(() => {
+        cy.login('administrative');
+        cy.visit('/#/entry/pre-account');
+    });
+
+    it("should pre-account without questions if it's agricultural", () => {
+        selectRowsByCol('id', [2]);
+        cy.dataCy('preAccount_btn').click();
+        cy.checkNotification('It has been successfully pre-accounted');
+    });
+
+    it("should ask to upload a doc. if it's not agricultural and doesn't have doc. ", () => {
+        selectRowsByCol('id', [3]);
+        cy.dataCy('preAccount_btn').click();
+        cy.dataCy('Reference_input').type('{selectall}234343fh', { delay: 0 });
+        cy.dataCy('VnDms_inputFile').selectFile('test/cypress/fixtures/image.jpg', {
+            force: true,
+        });
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('It has been successfully pre-accounted');
+    });
+
+    it('should ask to inherit the doc. and open VnDms popup if user choose "no"', () => {
+        selectRowsByCol('id', [101]);
+        cy.dataCy('preAccount_btn').click();
+        cy.dataCy('updateFileNo').click();
+        cy.get('#formModel').should('be.visible');
+    });
+
+    it('should ask to inherit the doc. and open VnDms popup if user choose "yes" and pre-account', () => {
+        selectRowsByCol('id', [101]);
+        cy.dataCy('preAccount_btn').click();
+        cy.dataCy('updateFileYes').click();
+        cy.checkNotification('It has been successfully pre-accounted');
+    });
+});
+
+function selectRowsByCol(col = 'id', vals = []) {
+    for (const val of vals) {
+        const regex = new RegExp(`^\\s*(${val})\\s*$`);
+        cy.contains(`[data-col-field="${col}"]`, regex)
+            .parent()
+            .find('td > .q-checkbox')
+            .click();
+    }
+}
diff --git a/test/cypress/integration/item/ItemFixedPrice.spec.js b/test/cypress/integration/item/ItemFixedPrice.spec.js
index 41230f570..2b92c861e 100644
--- a/test/cypress/integration/item/ItemFixedPrice.spec.js
+++ b/test/cypress/integration/item/ItemFixedPrice.spec.js
@@ -54,7 +54,7 @@ describe('Handle Items FixedPrice', () => {
     });
 
     it('should edit all items', () => {
-        cy.get('.bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner').click();
+        cy.get('.bg-header > :nth-child(1) [data-cy="vnCheckbox"]').click();
         cy.dataCy('FixedPriceToolbarEditBtn').should('not.be.disabled');
         cy.dataCy('FixedPriceToolbarEditBtn').click();
         cy.dataCy('EditFixedPriceSelectOption').type(grouping);
@@ -65,7 +65,7 @@ describe('Handle Items FixedPrice', () => {
     });
 
     it('should remove all items', () => {
-        cy.get('.bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner').click();
+        cy.get('.bg-header > :nth-child(1) [data-cy="vnCheckbox"]').click();
         cy.dataCy('crudModelDefaultRemoveBtn').should('not.be.disabled');
         cy.dataCy('crudModelDefaultRemoveBtn').click();
         cy.dataCy('VnConfirm_confirm').click();
diff --git a/test/cypress/integration/item/itemTax.spec.js b/test/cypress/integration/item/itemTax.spec.js
index 971e3a732..10c3ee889 100644
--- a/test/cypress/integration/item/itemTax.spec.js
+++ b/test/cypress/integration/item/itemTax.spec.js
@@ -6,7 +6,7 @@ describe('Item tax', () => {
     });
 
     it('should modify the tax for Spain', () => {
-        cy.dataCy('Class_select').eq(1).type('General VAT{enter}');
+        cy.dataCy('Class_select').eq(1).type('IVA General{enter}');
         cy.dataCy('crudModelDefaultSaveBtn').click();
         cy.checkNotification('Data saved');
     });
diff --git a/test/cypress/integration/route/cmr/cmrList.spec.js b/test/cypress/integration/route/cmr/cmrList.spec.js
index a25a0c10a..fe05ab255 100644
--- a/test/cypress/integration/route/cmr/cmrList.spec.js
+++ b/test/cypress/integration/route/cmr/cmrList.spec.js
@@ -5,6 +5,9 @@ describe('Cmr list', () => {
     const selectors = {
         ticket: getLinkSelector('ticketFk'),
         client: getLinkSelector('clientFk'),
+        route: getLinkSelector('routeFk'),
+        agency: getLinkSelector('agencyModeFk'),
+        carrier: getLinkSelector('supplierFk'),
         lastRowSelectCheckBox:
             '.q-virtual-scroll__content > tr:last-child > :nth-child(1) > .q-checkbox',
         downloadBtn: '#subToolbar > .q-btn',
@@ -21,6 +24,10 @@ describe('Cmr list', () => {
     const data = {
         ticket: '1',
         client: 'Bruce Wayne',
+        route: 'first route',
+        routeId: '1',
+        agency: 'inhouse pickup',
+        carrier: 'PLANTS SL',
     };
 
     beforeEach(() => {
@@ -68,6 +75,26 @@ describe('Cmr list', () => {
         });
     });
 
+    describe('Route pop-ups', () => {
+        it('Should redirect to the route summary from the route descriptor pop-up', () => {
+            cy.get(selectors.route).should('be.visible').click();
+            cy.containContent(selectors.descriptorId, data.routeId);
+            cy.get(selectors.descriptorGoToSummaryBtn).should('be.visible').click();
+            cy.url().should('include', '/route/1/summary');
+            cy.containContent(selectors.summaryTitle, data.route);
+        });
+
+        it('Should redirect to the route summary from summary pop-up from the route descriptor pop-up', () => {
+            cy.get(selectors.route).should('be.visible').click();
+            cy.containContent(selectors.descriptorId, data.routeId);
+            cy.get(selectors.descriptorOpenSummaryBtn).should('be.visible').click();
+            cy.containContent(selectors.summaryTitle, data.route);
+            cy.get(selectors.summaryGoToSummaryBtn).should('be.visible').click();
+            cy.url().should('include', '/route/1/summary');
+            cy.containContent(selectors.summaryTitle, data.route);
+        });
+    });
+
     describe('Client pop-ups', () => {
         it('Should redirect to the client summary from the client descriptor pop-up', () => {
             cy.get(selectors.client).should('be.visible').click();
@@ -87,4 +114,44 @@ describe('Cmr list', () => {
             cy.containContent(selectors.summaryTitle, data.client);
         });
     });
+
+    describe('Agency pop-ups', () => {
+        it('Should redirect to the agency summary from the agency descriptor pop-up', () => {
+            cy.get(selectors.agency).should('be.visible').click();
+            cy.containContent(selectors.descriptorTitle, data.agency);
+            cy.get(selectors.descriptorGoToSummaryBtn).should('be.visible').click();
+            cy.url().should('include', '/agency/1/summary');
+            cy.containContent(selectors.summaryTitle, data.agency);
+        });
+
+        it('Should redirect to the agency summary from summary pop-up from the agency descriptor pop-up', () => {
+            cy.get(selectors.agency).should('be.visible').click();
+            cy.containContent(selectors.descriptorTitle, data.agency);
+            cy.get(selectors.descriptorOpenSummaryBtn).should('be.visible').click();
+            cy.containContent(selectors.summaryTitle, data.agency);
+            cy.get(selectors.summaryGoToSummaryBtn).should('be.visible').click();
+            cy.url().should('include', '/agency/1/summary');
+            cy.containContent(selectors.summaryTitle, data.agency);
+        });
+    });
+
+    describe('Carrier pop-ups', () => {
+        it('Should redirect to the supplier summary from the supplier descriptor pop-up', () => {
+            cy.get(selectors.carrier).should('be.visible').click();
+            cy.containContent(selectors.descriptorTitle, data.carrier);
+            cy.get(selectors.descriptorGoToSummaryBtn).should('be.visible').click();
+            cy.url().should('include', '/supplier/1/summary');
+            cy.containContent(selectors.summaryTitle, data.carrier);
+        });
+
+        it('Should redirect to the supplier summary from summary pop-up from the supplier descriptor pop-up', () => {
+            cy.get(selectors.carrier).should('be.visible').click();
+            cy.containContent(selectors.descriptorTitle, data.carrier);
+            cy.get(selectors.descriptorOpenSummaryBtn).should('be.visible').click();
+            cy.containContent(selectors.summaryTitle, data.carrier);
+            cy.get(selectors.summaryGoToSummaryBtn).should('be.visible').click();
+            cy.url().should('include', '/supplier/1/summary');
+            cy.containContent(selectors.summaryTitle, data.carrier);
+        });
+    });
 });
diff --git a/test/cypress/integration/route/vehicle/vehicleEvents.spec.js b/test/cypress/integration/route/vehicle/vehicleEvents.spec.js
new file mode 100644
index 000000000..f03e11b29
--- /dev/null
+++ b/test/cypress/integration/route/vehicle/vehicleEvents.spec.js
@@ -0,0 +1,27 @@
+describe('Vehicle', () => {
+
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('deliveryAssistant');
+        cy.visit(`/#/route/vehicle/3/events`);
+    });
+
+    it('should add, edit and delete a vehicle event', () => {
+        cy.get('.q-page-sticky > div > .q-btn').click();
+        cy.dataCy('Started_inputDate').type('01/01/2001');
+        cy.dataCy('Finished_inputDate').type('08/02/2001');
+        cy.get(':nth-child(5)').find('[data-cy="Description_input"]').clear().type('Test');
+        cy.selectOption('[data-cy="State_input"]', 3);
+        cy.get('.q-mt-lg > .q-btn--standard').click();
+
+        cy.get('.q-current-day > .q-calendar-month__day--content > .q-btn').click();
+        cy.dataCy('Started_inputDate').clear().type('03/02/2001');
+        cy.dataCy('Finished_inputDate').clear().type('15/03/2001');
+        cy.get(':nth-child(5)').find('[data-cy="Description_input"]').clear().type('Test2');
+        cy.selectOption('[data-cy="State_input"]', 5);
+        cy.get('.q-mt-lg > .q-btn--standard').click();
+
+        cy.dataCy('delete_event').eq(0).click();
+        cy.dataCy('VnConfirm_confirm').click();
+    });
+});
\ No newline at end of file
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 302707601..95649f51c 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -76,16 +76,13 @@ describe('TicketList', () => {
             });
         }).as('ticket');
 
-        cy.get('[data-cy="Warehouse_select"]').type('Warehouse Five');
-        cy.get('.q-menu .q-item').contains('Warehouse Five').click();
+        cy.get('[data-cy="Warehouse_select"]').type('Warehouse One');
+        cy.get('.q-menu .q-item').contains('Warehouse One').click();
         cy.wait('@ticket').then((interception) => {
-            const data = interception.response.body[1];
+            const data = interception.response.body[0];
             expect(data.hasComponentLack).to.equal(1);
-            expect(data.isTooLittle).to.equal(1);
-            expect(data.hasItemShortage).to.equal(1);
         });
         cy.get('.icon-components').should('exist');
         cy.get('.icon-unavailable').should('exist');
-        cy.get('.icon-isTooLittle').should('exist');
     });
 });