diff --git a/package.json b/package.json
index f25e570a3..eaffd8d85 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.36.0",
+    "version": "24.40.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -62,4 +62,4 @@
         "vite": "^5.1.4",
         "vitest": "^0.31.1"
     }
-}
+}
\ No newline at end of file
diff --git a/src/boot/mainShortcutMixin.js b/src/boot/mainShortcutMixin.js
index 3b5c604b7..8e5f147db 100644
--- a/src/boot/mainShortcutMixin.js
+++ b/src/boot/mainShortcutMixin.js
@@ -9,16 +9,16 @@ export default {
         const keyBindingMap = routes
             .filter((route) => route.meta.keyBinding)
             .reduce((map, route) => {
-                map[route.meta.keyBinding.toLowerCase()] = route.path;
+                map['Key' + route.meta.keyBinding.toUpperCase()] = route.path;
                 return map;
             }, {});
 
         const handleKeyDown = (event) => {
-            const { ctrlKey, altKey, key } = event;
+            const { ctrlKey, altKey, code } = event;
 
-            if (ctrlKey && altKey && keyBindingMap[key] && !isNotified) {
+            if (ctrlKey && altKey && keyBindingMap[code] && !isNotified) {
                 event.preventDefault();
-                router.push(keyBindingMap[key]);
+                router.push(keyBindingMap[code]);
                 isNotified = true;
             }
         };
diff --git a/src/components/CreateNewExpenseForm.vue b/src/components/CreateNewExpenseForm.vue
new file mode 100644
index 000000000..7088cec03
--- /dev/null
+++ b/src/components/CreateNewExpenseForm.vue
@@ -0,0 +1,50 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModelPopup from './FormModelPopup.vue';
+
+const emit = defineEmits(['onDataSaved']);
+const { t } = useI18n();
+</script>
+<template>
+    <FormModelPopup
+        url-create="Expenses"
+        model="Expense"
+        :title="t('New expense')"
+        :form-initial-data="{ id: null, isWithheld: false, name: null }"
+        @on-data-saved="emit('onDataSaved', $event)"
+    >
+        <template #form-inputs="{ data, validate }">
+            <VnRow>
+                <VnInput
+                    :label="`${t('globals.code')}`"
+                    v-model="data.id"
+                    :required="true"
+                    :rules="validate('expense.code')"
+                />
+                <QCheckbox
+                    dense
+                    size="sm"
+                    :label="`${t('It\'s a withholding')}`"
+                    v-model="data.isWithheld"
+                    :rules="validate('expense.isWithheld')"
+                />
+            </VnRow>
+            <VnRow>
+                <VnInput
+                    :label="`${t('globals.description')}`"
+                    v-model="data.name"
+                    :required="true"
+                    :rules="validate('expense.description')"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    New expense: Nuevo gasto
+    It's a withholding: Es una retención
+</i18n>
diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 33c831e3f..0386e037b 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -189,11 +189,11 @@ async function saveChanges(data) {
     });
 }
 
-async function insert() {
+async function insert(pushData = $props.dataRequired) {
     const $index = formData.value.length
         ? formData.value[formData.value.length - 1].$index + 1
         : 0;
-    formData.value.push(Object.assign({ $index }, $props.dataRequired));
+    formData.value.push(Object.assign({ $index }, pushData));
     hasChanges.value = true;
 }
 
diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue
index 743c2c9d1..8449f9354 100644
--- a/src/components/ItemsFilterPanel.vue
+++ b/src/components/ItemsFilterPanel.vue
@@ -159,8 +159,8 @@ const removeTag = (index, params, search) => {
     />
     <VnFilterPanel
         :data-key="props.dataKey"
-        :expr-builder="exprBuilder"
-        :custom-tags="customTags"
+        :expr-builder="props.exprBuilder"
+        :custom-tags="props.customTags"
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'categoryFk'">
diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 213c08d7e..03fe11a85 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { onMounted, ref, reactive } from 'vue';
+import { onMounted, watch, ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { QSeparator, useQuasar } from 'quasar';
 import { useRoute } from 'vue-router';
@@ -29,6 +29,15 @@ onMounted(async () => {
     getRoutes();
 });
 
+watch(
+    () => route.matched,
+    () => {
+        items.value = [];
+        getRoutes();
+    },
+    { deep: true }
+);
+
 function findMatches(search, item) {
     const matches = [];
     function findRoute(search, item) {
diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index f3f2315a3..9fe66e278 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -33,7 +33,12 @@ const itemComputed = computed(() => {
         <QItemSection avatar v-if="!itemComputed.icon">
             <QIcon name="disabled_by_default" />
         </QItemSection>
-        <QItemSection>{{ t(itemComputed.title) }}</QItemSection>
+        <QItemSection>
+            {{ t(itemComputed.title) }}
+            <QTooltip>
+                {{ 'Ctrl + Alt + ' + item.keyBinding.toUpperCase() }}
+            </QTooltip>
+        </QItemSection>
         <QItemSection side>
             <slot name="side" :item="itemComputed" />
         </QItemSection>
diff --git a/src/components/RefundInvoiceForm.vue b/src/components/RefundInvoiceForm.vue
index 1b545103a..c21c892dd 100644
--- a/src/components/RefundInvoiceForm.vue
+++ b/src/components/RefundInvoiceForm.vue
@@ -33,6 +33,7 @@ const invoiceCorrectionTypesOptions = ref([]);
 const refund = async () => {
     const params = {
         id: invoiceParams.id,
+        withWarehouse: invoiceParams.inheritWarehouse,
         cplusRectificationTypeFk: invoiceParams.cplusRectificationTypeFk,
         siiTypeInvoiceOutFk: invoiceParams.siiTypeInvoiceOutFk,
         invoiceCorrectionTypeFk: invoiceParams.invoiceCorrectionTypeFk,
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 44b430e86..4ba7d0227 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -49,6 +49,10 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
+    createAsDialog: {
+        type: Boolean,
+        default: true,
+    },
     cardClass: {
         type: String,
         default: 'flex-one',
@@ -89,6 +93,10 @@ const $props = defineProps({
         type: Object,
         default: () => ({}),
     },
+    crudModel: {
+        type: Object,
+        default: () => ({}),
+    },
     tableHeight: {
         type: String,
         default: '90vh',
@@ -288,10 +296,17 @@ function parseOrder(urlOrders) {
 
 const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
 defineExpose({
+    create: createForm,
     reload,
     redirect: redirectFn,
     selected,
+    CrudModelRef,
 });
+
+function handleOnDataSaved(_, res) {
+    if (_.onDataSaved) _.onDataSaved(this);
+    else $props.create.onDataSaved(_);
+}
 </script>
 <template>
     <QDrawer
@@ -379,6 +394,7 @@ defineExpose({
                 @virtual-scroll="
                     (event) =>
                         event.index > rows.length - 2 &&
+                        ($props.crudModel?.paginate ?? true) &&
                         CrudModelRef.vnPaginateRef.paginate()
                 "
                 @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
@@ -487,6 +503,7 @@ defineExpose({
                     >
                         <QBtn
                             v-for="(btn, index) of col.actions"
+                            v-show="btn.show ? btn.show(row) : true"
                             :key="index"
                             :title="btn.title"
                             :icon="btn.icon"
@@ -621,8 +638,17 @@ defineExpose({
             </QTable>
         </template>
     </CrudModel>
-    <QPageSticky v-if="create" :offset="[20, 20]" style="z-index: 2">
-        <QBtn @click="showForm = !showForm" color="primary" fab icon="add" shortcut="+" />
+    <QPageSticky :offset="[20, 20]" style="z-index: 2">
+        <QBtn
+            @click="
+                () =>
+                    createAsDialog ? (showForm = !showForm) : handleOnDataSaved(create)
+            "
+            color="primary"
+            fab
+            icon="add"
+            shortcut="+"
+        />
         <QTooltip>
             {{ createForm.title }}
         </QTooltip>
diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index a7fe651ad..5cee06582 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { onBeforeMount, computed } from 'vue';
-import { useRoute, onBeforeRouteUpdate } from 'vue-router';
+import { useRoute, useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
@@ -17,10 +17,12 @@ const props = defineProps({
     filterPanel: { type: Object, default: undefined },
     searchDataKey: { type: String, default: undefined },
     searchbarProps: { type: Object, default: undefined },
+    redirectOnError: { type: Boolean, default: false },
 });
 
 const stateStore = useStateStore();
 const route = useRoute();
+const router = useRouter();
 const url = computed(() => {
     if (props.baseUrl) return `${props.baseUrl}/${route.params.id}`;
     return props.customUrl;
@@ -35,8 +37,12 @@ const arrayData = useArrayData(props.dataKey, {
 });
 
 onBeforeMount(async () => {
-    if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
-    await arrayData.fetch({ append: false, updateRouter: false });
+    try {
+        if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
+        await arrayData.fetch({ append: false, updateRouter: false });
+    } catch (e) {
+        router.push({ name: 'WorkerList' });
+    }
 });
 
 if (props.baseUrl) {
diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index c42de6690..68ff0e359 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -135,6 +135,7 @@ const columns = computed(() => [
         field: 'hasFile',
         label: t('globals.original'),
         name: 'hasFile',
+        toolTip: t('The documentation is available in paper form'),
         component: QCheckbox,
         props: (prop) => ({
             disable: true,
@@ -297,6 +298,14 @@ defineExpose({
                 row-key="clientFk"
                 :grid="$q.screen.lt.sm"
             >
+                <template #header="props">
+                    <QTr :props="props" class="bg">
+                        <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                            <QTooltip v-if="col.toolTip">{{ col.toolTip }}</QTooltip
+                            >{{ col.label }}
+                        </QTh>
+                    </QTr>
+                </template>
                 <template #body-cell="props">
                     <QTd :props="props">
                         <QTr :props="props">
@@ -397,8 +406,10 @@ defineExpose({
 <i18n>
 en:
     contentTypesInfo: Allowed file types {allowedContentTypes}
+    The documentation is available in paper form: The documentation is available in paper form
 es:
     contentTypesInfo: Tipos de archivo permitidos {allowedContentTypes}
     Generate identifier for original file: Generar identificador para archivo original
     Upload file: Subir fichero
+    the documentation is available in paper form: Se tiene la documentación en papel
 </i18n>
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 75d4b8a28..570d0cbfe 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -92,7 +92,6 @@ const mixinRules = [
                 <slot name="prepend" />
             </template>
             <template #append>
-                <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon
                     name="close"
                     size="xs"
@@ -104,6 +103,7 @@ const mixinRules = [
                         }
                     "
                 ></QIcon>
+                <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon v-if="info" name="info">
                     <QTooltip max-width="350px">
                         {{ info }}
@@ -119,3 +119,8 @@ const mixinRules = [
     es:
         inputMin: Debe ser mayor a {value}
 </i18n>
+<style lang="scss">
+.q-field__append {
+    padding-inline: 0;
+}
+</style>
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index f94130da4..96e47d6d7 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -9,6 +9,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    showEvent: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const { t } = useI18n();
@@ -94,6 +98,7 @@ watch(
             :class="{ required: $attrs.required }"
             :rules="$attrs.required ? [requiredFieldRule] : null"
             :clearable="false"
+            @click="isPopupOpen = true"
         >
             <template #append>
                 <QIcon
@@ -111,6 +116,7 @@ watch(
                     "
                 />
                 <QIcon
+                    v-if="showEvent"
                     name="event"
                     class="cursor-pointer"
                     @click="isPopupOpen = !isPopupOpen"
@@ -130,6 +136,7 @@ watch(
                     v-model="popupDate"
                     :landscape="true"
                     :today-btn="true"
+                    :options="$attrs.options"
                     @update:model-value="
                         (date) => {
                             formattedDate = date;
diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 2163d54d4..ab522cfde 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -14,6 +14,7 @@ import VnJsonValue from '../common/VnJsonValue.vue';
 import FetchData from '../FetchData.vue';
 import VnSelect from './VnSelect.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
+import VnPaginate from '../ui/VnPaginate.vue';
 
 const stateStore = useStateStore();
 const validationsStore = useValidator();
@@ -66,9 +67,10 @@ const filter = {
             },
         },
     ],
+    where: { and: [{ originFk: route.params.id }] },
 };
 
-const workers = ref();
+const paginate = ref();
 const actions = ref();
 const changeInput = ref();
 const searchInput = ref();
@@ -235,9 +237,7 @@ async function openPointRecord(id, modelLog) {
     const locale = validations[modelLog.model]?.locale || {};
     pointRecord.value = parseProps(propNames, locale, data);
 }
-async function setLogTree() {
-    filter.where = { and: [{ originFk: route.params.id }] };
-    const { data } = await getLogs(filter);
+async function setLogTree(data) {
     logTree.value = getLogTree(data);
 }
 
@@ -266,15 +266,7 @@ async function applyFilter() {
         filter.where.and.push(selectedFilters.value);
     }
 
-    const { data } = await getLogs(filter);
-
-    logTree.value = getLogTree(data);
-}
-
-async function getLogs(filter) {
-    return axios.get(props.url ?? `${props.model}Logs`, {
-        params: { filter: JSON.stringify(filter) },
-    });
+    paginate.value.fetch(filter);
 }
 
 function setDate(type) {
@@ -377,8 +369,6 @@ async function clearFilter() {
     await applyFilter();
 }
 
-setLogTree();
-
 onUnmounted(() => {
     stateStore.rightDrawer = false;
 });
@@ -391,16 +381,6 @@ watch(
 );
 </script>
 <template>
-    <FetchData
-        :url="`${props.model}Logs/${route.params.id}/editors`"
-        :filter="{
-            fields: ['id', 'nickname', 'name', 'image'],
-            order: 'nickname',
-            limit: 30,
-        }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
     <FetchData
         :url="`${props.model}Logs/${route.params.id}/models`"
         :filter="{ order: ['changedModel'] }"
@@ -418,231 +398,283 @@ watch(
         "
         auto-load
     />
-    <div
-        class="column items-center logs origin-log q-mt-md"
-        v-for="(originLog, originLogIndex) in logTree"
-        :key="originLogIndex"
+    <VnPaginate
+        ref="paginate"
+        :data-key="`${model}Log`"
+        :url="`${model}Logs`"
+        :filter="filter"
+        :skeleton="false"
+        auto-load
+        @on-fetch="setLogTree"
     >
-        <QItem class="origin-info items-center q-my-md" v-if="logTree.length > 1">
-            <h6 class="origin-id text-grey">
-                {{ useCapitalize(validations[props.model].locale.name) }}
-                #{{ originLog.originFk }}
-            </h6>
-            <div class="line bg-grey"></div>
-        </QItem>
-        <div
-            class="user-log q-mb-sm"
-            v-for="(userLog, userIndex) in originLog.logs"
-            :key="userIndex"
-        >
-            <div class="timeline">
-                <div class="user-avatar">
-                    <VnUserLink :worker-id="userLog?.user?.id">
-                        <template #link>
-                            <VnAvatar
-                                :class="{ 'cursor-pointer': userLog?.user?.id }"
-                                :worker-id="userLog?.user?.id"
-                                :title="userLog?.user?.nickname"
-                                :show-letter="!userLog?.user"
-                                size="lg"
-                            />
-                        </template>
-                    </VnUserLink>
-                </div>
-                <div class="arrow bg-panel" v-if="byRecord"></div>
-                <div class="line"></div>
-            </div>
-            <QList class="user-changes" v-if="userLog">
-                <QItem
-                    class="model-log column q-px-none q-py-xs"
-                    v-for="(modelLog, modelLogIndex) in userLog.logs"
-                    :key="modelLogIndex"
+        <template #body>
+            <div
+                class="column items-center logs origin-log q-mt-md"
+                v-for="(originLog, originLogIndex) in logTree"
+                :key="originLogIndex"
+            >
+                <QItem class="origin-info items-center q-my-md" v-if="logTree.length > 1">
+                    <h6 class="origin-id text-grey">
+                        {{ useCapitalize(validations[props.model].locale.name) }}
+                        #{{ originLog.originFk }}
+                    </h6>
+                    <div class="line bg-grey"></div>
+                </QItem>
+                <div
+                    class="user-log q-mb-sm"
+                    v-for="(userLog, userIndex) in originLog.logs"
+                    :key="userIndex"
                 >
-                    <QItemSection>
-                        <QItemLabel class="model-info q-mb-xs" v-if="!byRecord">
-                            <QChip
-                                dense
-                                size="md"
-                                class="model-name q-mr-xs text-white"
-                                v-if="
-                                    !(modelLog.changedModel && modelLog.changedModelId) &&
-                                    modelLog.model
-                                "
-                                :style="{
-                                    backgroundColor: useColor(modelLog.model),
-                                }"
-                                :title="`${modelLog.model} #${modelLog.id}`"
-                            >
-                                {{ t(modelLog.modelI18n) }}
-                            </QChip>
-
-                            <span
-                                class="model-id q-mr-xs"
-                                v-if="modelLog.summaryId"
-                                v-text="`#${modelLog.summaryId}`"
-                            />
-                            <span
-                                class="model-value"
-                                :title="modelLog.showValue"
-                                v-text="modelLog.showValue"
-                            />
-                            <QBtn
-                                flat
-                                round
-                                color="grey"
-                                class="q-mr-xs q-ml-auto"
-                                size="sm"
-                                icon="filter_alt"
-                                :title="t('recordChanges')"
-                                @click.stop="filterByRecord(modelLog)"
-                            />
-                        </QItemLabel>
-                    </QItemSection>
-                    <QItemSection>
-                        <QCard
-                            class="changes-log q-py-none q-mb-xs"
-                            v-for="(log, logIndex) in modelLog.logs"
-                            :key="logIndex"
+                    <div class="timeline">
+                        <div class="user-avatar">
+                            <VnUserLink :worker-id="userLog?.user?.id">
+                                <template #link>
+                                    <VnAvatar
+                                        :class="{ 'cursor-pointer': userLog?.user?.id }"
+                                        :worker-id="userLog?.user?.id"
+                                        :title="userLog?.user?.nickname"
+                                        :show-letter="!userLog?.user"
+                                        size="lg"
+                                    />
+                                </template>
+                            </VnUserLink>
+                        </div>
+                        <div class="arrow bg-panel" v-if="byRecord"></div>
+                        <div class="line"></div>
+                    </div>
+                    <QList class="user-changes" v-if="userLog">
+                        <QItem
+                            class="model-log column q-px-none q-py-xs"
+                            v-for="(modelLog, modelLogIndex) in userLog.logs"
+                            :key="modelLogIndex"
                         >
-                            <QCardSection class="change-info q-pa-none">
-                                <QItem
-                                    class="q-px-sm q-py-xs justify-between items-center"
-                                >
-                                    <div
-                                        class="date text-grey text-caption q-mr-sm"
-                                        :title="
-                                            date.formatDate(
-                                                log.creationDate,
-                                                'DD/MM/YYYY hh:mm:ss'
-                                            ) ?? `date:'dd/MM/yyyy HH:mm:ss'`
+                            <QItemSection>
+                                <QItemLabel class="model-info q-mb-xs" v-if="!byRecord">
+                                    <QChip
+                                        dense
+                                        size="md"
+                                        class="model-name q-mr-xs text-white"
+                                        v-if="
+                                            !(
+                                                modelLog.changedModel &&
+                                                modelLog.changedModelId
+                                            ) && modelLog.model
                                         "
+                                        :style="{
+                                            backgroundColor: useColor(modelLog.model),
+                                        }"
+                                        :title="`${modelLog.model} #${modelLog.id}`"
                                     >
-                                        {{ toRelativeDate(log.creationDate) }}
-                                    </div>
-                                    <div>
-                                        <QBtn
-                                            color="grey"
-                                            class="pit"
-                                            icon="preview"
-                                            flat
-                                            round
-                                            :title="t('pointRecord')"
-                                            padding="none"
-                                            v-if="log.action != 'insert'"
-                                            @click.stop="
-                                                openPointRecord(log.id, modelLog)
-                                            "
-                                        >
-                                            <QPopupProxy>
-                                                <QCard v-if="pointRecord">
-                                                    <div
-                                                        class="header q-px-sm q-py-xs q-ma-none text-white text-bold bg-primary"
-                                                    >
-                                                        {{ modelLog.modelI18n }}
-                                                        <span v-if="modelLog.id"
-                                                            >#{{ modelLog.id }}</span
-                                                        >
-                                                    </div>
-                                                    <QCardSection
-                                                        class="change-detail q-pa-sm"
-                                                    >
-                                                        <QItem
-                                                            v-for="(
-                                                                value, index
-                                                            ) in pointRecord"
-                                                            :key="index"
-                                                            class="q-pa-none"
-                                                        >
-                                                            <span
-                                                                class="json-field q-mr-xs text-grey"
-                                                                :title="value.name"
-                                                            >
-                                                                {{ value.nameI18n }}:
-                                                            </span>
-                                                            <VnJsonValue
-                                                                :value="value.val.val"
-                                                            />
-                                                        </QItem>
-                                                    </QCardSection>
-                                                </QCard>
-                                            </QPopupProxy>
-                                        </QBtn>
-                                        <QIcon
-                                            class="action q-ml-xs"
-                                            :class="actionsClass[log.action]"
-                                            :name="actionsIcon[log.action]"
-                                            :title="
-                                                t(`actions.${actionsText[log.action]}`)
-                                            "
-                                        />
-                                    </div>
-                                </QItem>
-                            </QCardSection>
-                            <QCardSection
-                                class="change-detail q-px-sm q-py-xs"
-                                :class="{ expanded: log.expand }"
-                                v-if="log.props.length || log.description"
-                            >
-                                <QIcon
-                                    class="cursor-pointer q-mr-md"
-                                    color="grey"
-                                    name="expand_more"
-                                    :title="t('globals.details')"
-                                    size="sm"
-                                    @click="log.expand = !log.expand"
-                                />
-                                <span v-if="log.props.length" class="attributes">
-                                    <span v-if="!log.expand" class="q-pa-none text-grey">
-                                        <span
-                                            v-for="(prop, propIndex) in log.props"
-                                            :key="propIndex"
-                                            class="basic-json"
-                                        >
-                                            <span class="json-field" :title="prop.name">
-                                                {{ prop.nameI18n }}:
-                                            </span>
-                                            <VnJsonValue :value="prop.val.val" />
-                                            <span v-if="propIndex < log.props.length - 1"
-                                                >,&nbsp;
-                                            </span>
-                                        </span>
-                                    </span>
+                                        {{ t(modelLog.modelI18n) }}
+                                    </QChip>
+
                                     <span
-                                        v-if="log.expand"
-                                        class="expanded-json column q-pa-none"
-                                    >
-                                        <div
-                                            v-for="(prop, prop2Index) in log.props"
-                                            :key="prop2Index"
-                                            class="q-pa-none text-grey"
+                                        class="model-id q-mr-xs"
+                                        v-if="modelLog.summaryId"
+                                        v-text="`#${modelLog.summaryId}`"
+                                    />
+                                    <span
+                                        class="model-value"
+                                        :title="modelLog.showValue"
+                                        v-text="modelLog.showValue"
+                                    />
+                                    <QBtn
+                                        flat
+                                        round
+                                        color="grey"
+                                        class="q-mr-xs q-ml-auto"
+                                        size="sm"
+                                        icon="filter_alt"
+                                        :title="t('recordChanges')"
+                                        @click.stop="filterByRecord(modelLog)"
+                                    />
+                                </QItemLabel>
+                            </QItemSection>
+                            <QItemSection>
+                                <QCard
+                                    class="changes-log q-py-none q-mb-xs"
+                                    v-for="(log, logIndex) in modelLog.logs"
+                                    :key="logIndex"
+                                >
+                                    <QCardSection class="change-info q-pa-none">
+                                        <QItem
+                                            class="q-px-sm q-py-xs justify-between items-center"
                                         >
-                                            <span class="json-field" :title="prop.name">
-                                                {{ prop.nameI18n }}:
-                                            </span>
-                                            <VnJsonValue :value="prop.val.val" />
-                                            <span v-if="prop.val.id" class="id-value">
-                                                #{{ prop.val.id }}
-                                            </span>
-                                            <span v-if="log.action == 'update'">
-                                                ←
-                                                <VnJsonValue :value="prop.old.val" />
-                                                <span v-if="prop.old.id" class="id-value">
-                                                    #{{ prop.old.id }}
+                                            <div
+                                                class="date text-grey text-caption q-mr-sm"
+                                                :title="
+                                                    date.formatDate(
+                                                        log.creationDate,
+                                                        'DD/MM/YYYY hh:mm:ss'
+                                                    ) ?? `date:'dd/MM/yyyy HH:mm:ss'`
+                                                "
+                                            >
+                                                {{ toRelativeDate(log.creationDate) }}
+                                            </div>
+                                            <div>
+                                                <QBtn
+                                                    color="grey"
+                                                    class="pit"
+                                                    icon="preview"
+                                                    flat
+                                                    round
+                                                    :title="t('pointRecord')"
+                                                    padding="none"
+                                                    v-if="log.action != 'insert'"
+                                                    @click.stop="
+                                                        openPointRecord(log.id, modelLog)
+                                                    "
+                                                >
+                                                    <QPopupProxy>
+                                                        <QCard v-if="pointRecord">
+                                                            <div
+                                                                class="header q-px-sm q-py-xs q-ma-none text-white text-bold bg-primary"
+                                                            >
+                                                                {{ modelLog.modelI18n }}
+                                                                <span v-if="modelLog.id"
+                                                                    >#{{
+                                                                        modelLog.id
+                                                                    }}</span
+                                                                >
+                                                            </div>
+                                                            <QCardSection
+                                                                class="change-detail q-pa-sm"
+                                                            >
+                                                                <QItem
+                                                                    v-for="(
+                                                                        value, index
+                                                                    ) in pointRecord"
+                                                                    :key="index"
+                                                                    class="q-pa-none"
+                                                                >
+                                                                    <span
+                                                                        class="json-field q-mr-xs text-grey"
+                                                                        :title="
+                                                                            value.name
+                                                                        "
+                                                                    >
+                                                                        {{
+                                                                            value.nameI18n
+                                                                        }}:
+                                                                    </span>
+                                                                    <VnJsonValue
+                                                                        :value="
+                                                                            value.val.val
+                                                                        "
+                                                                    />
+                                                                </QItem>
+                                                            </QCardSection>
+                                                        </QCard>
+                                                    </QPopupProxy>
+                                                </QBtn>
+                                                <QIcon
+                                                    class="action q-ml-xs"
+                                                    :class="actionsClass[log.action]"
+                                                    :name="actionsIcon[log.action]"
+                                                    :title="
+                                                        t(
+                                                            `actions.${
+                                                                actionsText[log.action]
+                                                            }`
+                                                        )
+                                                    "
+                                                />
+                                            </div>
+                                        </QItem>
+                                    </QCardSection>
+                                    <QCardSection
+                                        class="change-detail q-px-sm q-py-xs"
+                                        :class="{ expanded: log.expand }"
+                                        v-if="log.props.length || log.description"
+                                    >
+                                        <QIcon
+                                            class="cursor-pointer q-mr-md"
+                                            color="grey"
+                                            name="expand_more"
+                                            :title="t('globals.details')"
+                                            size="sm"
+                                            @click="log.expand = !log.expand"
+                                        />
+                                        <span v-if="log.props.length" class="attributes">
+                                            <span
+                                                v-if="!log.expand"
+                                                class="q-pa-none text-grey"
+                                            >
+                                                <span
+                                                    v-for="(prop, propIndex) in log.props"
+                                                    :key="propIndex"
+                                                    class="basic-json"
+                                                >
+                                                    <span
+                                                        class="json-field"
+                                                        :title="prop.name"
+                                                    >
+                                                        {{ prop.nameI18n }}:
+                                                    </span>
+                                                    <VnJsonValue :value="prop.val.val" />
+                                                    <span
+                                                        v-if="
+                                                            propIndex <
+                                                            log.props.length - 1
+                                                        "
+                                                        >,&nbsp;
+                                                    </span>
                                                 </span>
                                             </span>
-                                        </div>
-                                    </span>
-                                </span>
-                                <span v-if="!log.props.length" class="description">
-                                    {{ log.description }}
-                                </span>
-                            </QCardSection>
-                        </QCard>
-                    </QItemSection>
-                </QItem>
-            </QList>
-        </div>
-    </div>
+                                            <span
+                                                v-if="log.expand"
+                                                class="expanded-json column q-pa-none"
+                                            >
+                                                <div
+                                                    v-for="(
+                                                        prop, prop2Index
+                                                    ) in log.props"
+                                                    :key="prop2Index"
+                                                    class="q-pa-none text-grey"
+                                                >
+                                                    <span
+                                                        class="json-field"
+                                                        :title="prop.name"
+                                                    >
+                                                        {{ prop.nameI18n }}:
+                                                    </span>
+                                                    <VnJsonValue :value="prop.val.val" />
+                                                    <span
+                                                        v-if="prop.val.id"
+                                                        class="id-value"
+                                                    >
+                                                        #{{ prop.val.id }}
+                                                    </span>
+                                                    <span v-if="log.action == 'update'">
+                                                        ←
+                                                        <VnJsonValue
+                                                            :value="prop.old.val"
+                                                        />
+                                                        <span
+                                                            v-if="prop.old.id"
+                                                            class="id-value"
+                                                        >
+                                                            #{{ prop.old.id }}
+                                                        </span>
+                                                    </span>
+                                                </div>
+                                            </span>
+                                        </span>
+                                        <span
+                                            v-if="!log.props.length"
+                                            class="description"
+                                        >
+                                            {{ log.description }}
+                                        </span>
+                                    </QCardSection>
+                                </QCard>
+                            </QItemSection>
+                        </QItem>
+                    </QList>
+                </div>
+            </div>
+        </template>
+    </VnPaginate>
     <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
         <QList dense>
             <QSeparator />
@@ -691,17 +723,16 @@ watch(
                 </QOptionGroup>
             </QItem>
             <QItem class="q-mt-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers && userRadio !== null">
+                <QItemSection v-if="userRadio !== null">
                     <VnSelect
                         class="full-width"
                         :label="t('globals.user')"
                         v-model="userSelect"
                         option-label="name"
                         option-value="id"
-                        :options="workers"
+                        :url="`${model}Logs/${$route.params.id}/editors`"
+                        :fields="['id', 'nickname', 'name', 'image']"
+                        sort-by="nickname"
                         @update:model-value="selectFilter('userSelect')"
                         hide-selected
                     >
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index c8538f6fd..637180c22 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -133,17 +133,6 @@ async function search(evt) {
     }
 }
 
-async function reload() {
-    isLoading.value = true;
-    const params = Object.values(userParams.value).filter((param) => param);
-    store.skip = 0;
-    store.page = 1;
-    await arrayData.fetch({ append: false });
-    if (!$props.showAll && !params.length) store.data = [];
-    isLoading.value = false;
-    emit('refresh');
-}
-
 async function clearFilters() {
     try {
         isLoading.value = true;
@@ -233,32 +222,18 @@ function sanitizer(params) {
                     </QItemLabel>
                 </QItemSection>
                 <QItemSection top side>
-                    <div class="q-gutter-xs">
-                        <QBtn
-                            @click="clearFilters"
-                            color="primary"
-                            dense
-                            flat
-                            icon="filter_list_off"
-                            padding="none"
-                            round
-                            size="sm"
-                        >
-                            <QTooltip>{{ t('Remove filters') }}</QTooltip>
-                        </QBtn>
-                        <QBtn
-                            @click="reload"
-                            color="primary"
-                            dense
-                            flat
-                            icon="refresh"
-                            padding="none"
-                            round
-                            size="sm"
-                        >
-                            <QTooltip>{{ t('Refresh') }}</QTooltip>
-                        </QBtn>
-                    </div>
+                    <QBtn
+                        @click="clearFilters"
+                        color="primary"
+                        dense
+                        flat
+                        icon="filter_list_off"
+                        padding="none"
+                        round
+                        size="sm"
+                    >
+                        <QTooltip>{{ t('Remove filters') }}</QTooltip>
+                    </QBtn>
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
diff --git a/src/components/ui/VnRow.vue b/src/components/ui/VnRow.vue
index 34cdf88b8..16bcfab7d 100644
--- a/src/components/ui/VnRow.vue
+++ b/src/components/ui/VnRow.vue
@@ -1,3 +1,6 @@
+<script setup>
+defineProps({ wrap: { type: Boolean, default: false } });
+</script>
 <template>
     <div class="vn-row q-gutter-md q-mb-md">
         <slot />
@@ -15,7 +18,9 @@
 }
 @media screen and (max-width: 800px) {
     .vn-row {
-        flex-direction: column;
+        &:not(.wrap) {
+            flex-direction: column;
+        }
     }
 }
 </style>
diff --git a/src/composables/getTotal.js b/src/composables/getTotal.js
new file mode 100644
index 000000000..41c4330c4
--- /dev/null
+++ b/src/composables/getTotal.js
@@ -0,0 +1,10 @@
+import { toCurrency } from 'src/filters';
+
+export function getTotal(rows, key, opts = {}) {
+    const { currency, cb } = opts;
+    const total = rows.reduce((acc, row) => acc + +(cb ? cb(row) : row[key] || 0), 0);
+
+    return currency
+        ? toCurrency(total, currency == 'default' ? undefined : currency)
+        : total;
+}
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 82ecc4378..3546d79a0 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -41,6 +41,8 @@ globals:
     noChanges: No changes to save
     changesToSave: You have changes pending to save
     confirmRemove: You are about to delete this row. Are you sure?
+    rowWillBeRemoved: This row will be removed
+    sureToContinue: Are you sure you want to continue?
     rowAdded: Row added
     rowRemoved: Row removed
     pleaseWait: Please wait...
@@ -85,7 +87,7 @@ globals:
     description: Description
     id: Id
     order: Order
-    original: Original
+    original: Phys. Doc
     file: File
     selectFile: Select a file
     copyClipboard: Copy on clipboard
@@ -266,6 +268,7 @@ globals:
         clientsActionsMonitor: Clients and actions
         serial: Serial
         medical: Mutual
+    supplier: Supplier
     created: Created
     worker: Worker
     now: Now
@@ -629,56 +632,6 @@ parking:
     searchBar:
         info: You can search by parking code
         label: Search parking...
-invoiceIn:
-    list:
-        ref: Reference
-        supplier: Supplier
-        supplierRef: Supplier ref.
-        serialNumber: Serial number
-        serial: Serial
-        file: File
-        issued: Issued
-        isBooked: Is booked
-        awb: AWB
-        amount: Amount
-    card:
-        issued: Issued
-        amount: Amount
-        client: Client
-        company: Company
-        customerCard: Customer card
-        ticketList: Ticket List
-        vat: Vat
-        dueDay: Due day
-        intrastat: Intrastat
-    summary:
-        supplier: Supplier
-        supplierRef: Supplier ref.
-        currency: Currency
-        docNumber: Doc number
-        issued: Expedition date
-        operated: Operation date
-        bookEntried: Entry date
-        bookedDate: Booked date
-        sage: Sage withholding
-        vat: Undeductible VAT
-        company: Company
-        booked: Booked
-        expense: Expense
-        taxableBase: Taxable base
-        rate: Rate
-        sageVat: Sage vat
-        sageTransaction: Sage transaction
-        dueDay: Date
-        bank: Bank
-        amount: Amount
-        foreignValue: Foreign value
-        dueTotal: Due day
-        noMatch: Do not match
-        code: Code
-        net: Net
-        stems: Stems
-        country: Country
 order:
     field:
         salesPersonFk: Sales Person
@@ -1174,6 +1127,7 @@ components:
         active: Is active
         visible: Is visible
         floramondo: Is floramondo
+        showBadDates: Show future items
     userPanel:
         copyToken: Token copied to clipboard
         settings: Settings
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 85f106d5f..3b31a6778 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -40,6 +40,8 @@ globals:
     noChanges: Sin cambios que guardar
     changesToSave: Tienes cambios pendientes de guardar
     confirmRemove: Vas a eliminar este registro. ¿Continuar?
+    rowWillBeRemoved: Esta linea se eliminará
+    sureToContinue: ¿Seguro que quieres continuar?
     rowAdded: Fila añadida
     rowRemoved: Fila eliminada
     pleaseWait: Por favor espera...
@@ -87,7 +89,7 @@ globals:
     description: Descripción
     id: Id
     order: Orden
-    original: Original
+    original: Doc. física
     file: Fichero
     selectFile: Seleccione un fichero
     copyClipboard: Copiar en portapapeles
@@ -270,6 +272,7 @@ globals:
         clientsActionsMonitor: Clientes y acciones
         serial: Facturas por serie
         medical: Mutua
+    supplier: Proveedor
     created: Fecha creación
     worker: Trabajador
     now: Ahora
@@ -676,54 +679,6 @@ parking:
     searchBar:
         info: Puedes buscar por código de parking
         label: Buscar parking...
-invoiceIn:
-    list:
-        ref: Referencia
-        supplier: Proveedor
-        supplierRef: Ref. proveedor
-        serialNumber: Num. serie
-        shortIssued: F. emisión
-        serial: Serie
-        file: Fichero
-        issued: Fecha emisión
-        isBooked: Conciliada
-        awb: AWB
-        amount: Importe
-    card:
-        issued: Fecha emisión
-        amount: Importe
-        client: Cliente
-        company: Empresa
-        customerCard: Ficha del cliente
-        ticketList: Listado de tickets
-        vat: Iva
-        dueDay: Fecha de vencimiento
-    summary:
-        supplier: Proveedor
-        supplierRef: Ref. proveedor
-        currency: Divisa
-        docNumber: Número documento
-        issued: Fecha de expedición
-        operated: Fecha operación
-        bookEntried: Fecha asiento
-        bookedDate: Fecha contable
-        sage: Retención sage
-        vat: Iva no deducible
-        company: Empresa
-        booked: Contabilizada
-        expense: Gasto
-        taxableBase: Base imp.
-        rate: Tasa
-        sageTransaction: Sage transación
-        dueDay: Fecha
-        bank: Caja
-        amount: Importe
-        foreignValue: Divisa
-        dueTotal: Vencimiento
-        code: Código
-        net: Neto
-        stems: Tallos
-        country: País
 department:
     pageTitles:
         basicData: Basic data
@@ -1155,6 +1110,7 @@ components:
         active: Activo
         visible: Visible
         floramondo: Floramondo
+        showBadDates: Ver items a futuro
     userPanel:
         copyToken: Token copiado al portapapeles
         settings: Configuración
diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
index 4d3450665..057745831 100644
--- a/src/pages/Account/AccountConnections.vue
+++ b/src/pages/Account/AccountConnections.vue
@@ -27,15 +27,15 @@ const filter = {
     order: 'created DESC',
 };
 
-const urlPath = 'AccessTokens';
+const urlPath = 'VnTokens';
 
 const refresh = () => paginateRef.value.fetch();
 
 const navigate = (id) => router.push({ name: 'AccountSummary', params: { id } });
 
-const killSession = async (id) => {
+const killSession = async ({ userId, created }) => {
     try {
-        await axios.delete(`${urlPath}/${id}`);
+        await axios.post(`${urlPath}/killSession`, { userId, created });
         paginateRef.value.fetch();
         notify(t('Session killed'), 'positive');
     } catch (error) {
@@ -84,7 +84,7 @@ const killSession = async (id) => {
                                     openConfirmationModal(
                                         t('Session will be killed'),
                                         t('Are you sure you want to continue?'),
-                                        () => killSession(row.id)
+                                        () => killSession(row)
                                     )
                                 "
                                 outline
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 0470dc176..79f4fe449 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
 import axios from 'axios';
+import { usePrintService } from 'composables/usePrintService';
 import { useQuasar } from 'quasar';
 
 import { useState } from 'src/composables/useState';
@@ -27,7 +28,7 @@ const router = useRouter();
 const state = useState();
 const user = state.getUser();
 const stateStore = useStateStore();
-
+const { sendEmail } = usePrintService();
 const client = ref({});
 const hasChanged = ref(false);
 const isLoading = ref(false);
@@ -156,22 +157,33 @@ const onSubmit = async () => {
     }
 };
 
-const onDataSaved = async ({
-    addressId,
-    companyFk,
-    companyId,
-    from,
-    recipient,
-    replyTo,
-}) => {
-    await axios.post(`Clients/${route.params.id}/incoterms-authorization-email`, {
-        addressId,
-        companyFk,
-        companyId,
-        from,
-        recipient,
-        replyTo,
-    });
+const getSamples = async () => {
+    try {
+        const filter = { where: { id: initialData.typeFk } };
+        let { data } = await axios.get('Samples', {
+            params: { filter: JSON.stringify(filter) },
+        });
+        return data[0];
+    } catch (error) {
+        notify('errors.create', 'negative');
+    }
+};
+
+getSamples();
+const onDataSaved = async () => {
+    try {
+        const params = {
+            recipientId: initialData.recipientId,
+            recipient: initialData.recipient,
+            replyTo: initialData.replyTo,
+        };
+        setParams(params);
+        const samplesData = await getSamples();
+        const path = `${samplesData.model}/${route.params.id}/${samplesData.code}-email`;
+        await sendEmail(path, params);
+    } catch (error) {
+        notify('errors.create', 'negative');
+    }
     toCustomerSamples();
 };
 
diff --git a/src/pages/Dashboard/DashboardMain.vue b/src/pages/Dashboard/DashboardMain.vue
index 6da39ce25..a339120e2 100644
--- a/src/pages/Dashboard/DashboardMain.vue
+++ b/src/pages/Dashboard/DashboardMain.vue
@@ -55,6 +55,15 @@ const pinnedModules = computed(() => navigation.getPinnedModules());
                                 >
                                     <div class="text-center text-primary button-text">
                                         {{ t(item.title) }}
+                                        <div v-if="item.keyBinding">
+                                            {{ '(' + item.keyBinding + ')' }}
+                                            <QTooltip>
+                                                {{
+                                                    'Ctrl + Alt + ' +
+                                                    item.keyBinding.toUpperCase()
+                                                }}
+                                            </QTooltip>
+                                        </div>
                                     </div>
                                 </QBtn>
                             </div>
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index e9a9ab815..ff89faada 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -26,7 +26,6 @@ const { notify } = useNotify();
 
 const rowsSelected = ref([]);
 const entryBuysPaginateRef = ref(null);
-const packagingsOptions = ref(null);
 const originalRowDataCopy = ref(null);
 
 const getInputEvents = (colField, props) => {
@@ -66,7 +65,10 @@ const tableColumnComponents = computed(() => ({
             'map-options': true,
             'use-input': true,
             'hide-selected': true,
-            options: packagingsOptions.value,
+            url: 'Packagings',
+            fields: ['id'],
+            where: { freightItemFk: true },
+            'sort-by': 'id ASC',
             dense: true,
         },
         event: getInputEvents,
@@ -304,13 +306,6 @@ const lockIconType = (groupingMode, mode) => {
 </script>
 
 <template>
-    <FetchData
-        ref="expensesRef"
-        url="Packagings"
-        :filter="{ fields: ['id'], where: { freightItemFk: true }, order: 'id ASC' }"
-        auto-load
-        @on-fetch="(data) => (packagingsOptions = data)"
-    />
     <VnSubToolbar>
         <template #st-actions>
             <QBtnGroup push style="column-gap: 10px">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index ede9af825..045517a3f 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -223,6 +223,10 @@ async function onSubmit() {
                     autofocus
                 />
             </VnRow>
+            <VnRow>
+                <VnInputDate :label="t('Entry date')" v-model="data.bookEntried" />
+                <VnInputDate :label="t('Accounted date')" v-model="data.booked" />
+            </VnRow>
             <VnRow>
                 <VnSelect
                     :label="t('Undeductible VAT')"
@@ -285,10 +289,6 @@ async function onSubmit() {
                     </template>
                 </VnInput>
             </VnRow>
-            <VnRow>
-                <VnInputDate :label="t('Entry date')" v-model="data.bookEntried" />
-                <VnInputDate :label="t('Accounted date')" v-model="data.booked" />
-            </VnRow>
             <VnRow>
                 <VnSelect
                     :label="t('Currency')"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index a95f289b0..0fe2a2368 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -3,6 +3,8 @@ import VnCard from 'components/common/VnCard.vue';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
 import InvoiceInFilter from '../InvoiceInFilter.vue';
 import InvoiceInSearchbar from '../InvoiceInSearchbar.vue';
+import { onBeforeRouteUpdate } from 'vue-router';
+import { setRectificative } from '../composables/setRectificative';
 
 const filter = {
     include: [
@@ -20,6 +22,8 @@ const filter = {
         { relation: 'currency' },
     ],
 };
+
+onBeforeRouteUpdate(async (to) => await setRectificative(to));
 </script>
 <template>
     <VnCard
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index cba2a31d2..e9a7eafee 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -356,10 +356,7 @@ const createInvoiceInCorrection = async () => {
         <template #body="{ entity }">
             <VnLv :label="t('invoiceIn.card.issued')" :value="toDate(entity.issued)" />
             <VnLv :label="t('invoiceIn.summary.booked')" :value="toDate(entity.booked)" />
-            <VnLv
-                :label="t('invoiceIn.card.amount')"
-                :value="toCurrency(totalAmount, entity.currency?.code)"
-            />
+            <VnLv :label="t('invoiceIn.card.amount')" :value="toCurrency(totalAmount)" />
             <VnLv :label="t('invoiceIn.summary.supplier')">
                 <template #value>
                     <span class="link">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index 62beb88ad..1593ea1be 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -5,10 +5,10 @@ import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { toDate } from 'src/filters';
 import { useArrayData } from 'src/composables/useArrayData';
+import { getTotal } from 'src/composables/getTotal';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import { toCurrency } from 'src/filters';
 import useNotify from 'src/composables/useNotify.js';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
@@ -72,7 +72,6 @@ async function insert() {
     await invoiceInFormRef.value.reload();
     notify(t('globals.dataSaved'), 'positive');
 }
-const getTotalAmount = (rows) => rows.reduce((acc, { amount }) => acc + +amount, 0);
 </script>
 <template>
     <FetchData
@@ -155,9 +154,17 @@ const getTotalAmount = (rows) => rows.reduce((acc, { amount }) => acc + +amount,
                         <QTd />
                         <QTd />
                         <QTd>
-                            {{ toCurrency(getTotalAmount(rows), currency) }}
+                            {{ getTotal(rows, 'amount', { currency: 'default' }) }}
+                        </QTd>
+                        <QTd>
+                            <template v-if="isNotEuro(invoiceIn.currency.code)">
+                                {{
+                                    getTotal(rows, 'foreignValue', {
+                                        currency: invoiceIn.currency.code,
+                                    })
+                                }}
+                            </template>
                         </QTd>
-                        <QTd />
                     </QTr>
                 </template>
                 <template #item="props">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 481698832..717f30b7f 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -2,18 +2,15 @@
 import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { toCurrency } from 'src/filters';
+import { getTotal } from 'src/composables/getTotal';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import { useArrayData } from 'src/composables/useArrayData';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 
 const { t } = useI18n();
 
 const route = useRoute();
-const arrayData = useArrayData();
-const currency = computed(() => arrayData.store.data?.currency?.code);
 const invoceInIntrastat = ref([]);
 const rowsSelected = ref([]);
 const countries = ref([]);
@@ -72,9 +69,6 @@ const columns = computed(() => [
     },
 ]);
 
-const getTotal = (data, key) =>
-    data.reduce((acc, cur) => acc + +String(cur[key] || 0).replace(',', '.'), 0);
-
 const formatOpt = (row, { model, options }, prop) => {
     const obj = row[model];
     const option = options.find(({ id }) => id == obj);
@@ -154,7 +148,7 @@ const formatOpt = (row, { model, options }, prop) => {
                             <QTd />
                             <QTd />
                             <QTd>
-                                {{ toCurrency(getTotal(rows, 'amount'), currency) }}
+                                {{ getTotal(rows, 'amount', { currency: 'default' }) }}
                             </QTd>
                             <QTd>
                                 {{ getTotal(rows, 'net') }}
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 644b472e2..bf2e7db48 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -35,7 +35,7 @@ const vatColumns = ref([
         name: 'landed',
         label: 'invoiceIn.summary.taxableBase',
         field: (row) => row.taxableBase,
-        format: (value) => toCurrency(value, currency.value),
+        format: (value) => toCurrency(value),
         sortable: true,
         align: 'left',
     },
@@ -64,7 +64,7 @@ const vatColumns = ref([
         name: 'rate',
         label: 'invoiceIn.summary.rate',
         field: (row) => taxRate(row.taxableBase, row.taxTypeSage?.rate),
-        format: (value) => toCurrency(value, currency.value),
+        format: (value) => toCurrency(value),
         sortable: true,
         align: 'left',
     },
@@ -72,7 +72,7 @@ const vatColumns = ref([
         name: 'currency',
         label: 'invoiceIn.summary.currency',
         field: (row) => row.foreignValue,
-        format: (value) => value,
+        format: (val) => val && toCurrency(val, currency.value),
         sortable: true,
         align: 'left',
     },
@@ -97,7 +97,7 @@ const dueDayColumns = ref([
         name: 'amount',
         label: 'invoiceIn.summary.amount',
         field: (row) => row.amount,
-        format: (value) => toCurrency(value, currency.value),
+        format: (value) => toCurrency(value),
         sortable: true,
         align: 'left',
     },
@@ -105,7 +105,7 @@ const dueDayColumns = ref([
         name: 'landed',
         label: 'invoiceIn.summary.foreignValue',
         field: (row) => row.foreignValue,
-        format: (value) => value,
+        format: (val) => val && toCurrency(val, currency.value),
         sortable: true,
         align: 'left',
     },
@@ -124,7 +124,7 @@ const intrastatColumns = ref([
     {
         name: 'amount',
         label: 'invoiceIn.summary.amount',
-        field: (row) => toCurrency(row.amount, currency.value),
+        field: (row) => toCurrency(row.amount),
         sortable: true,
         align: 'left',
     },
@@ -179,7 +179,6 @@ const getTotalTax = (tax) =>
 
 const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
 </script>
-
 <template>
     <CardSummary
         data-key="InvoiceInSummary"
@@ -229,10 +228,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     :label="t('invoiceIn.summary.currency')"
                     :value="entity.currency?.code"
                 />
-                <VnLv
-                    :label="t('invoiceIn.summary.docNumber')"
-                    :value="`${entity.serial}/${entity.serialNumber}`"
-                />
+                <VnLv :label="t('invoiceIn.serial')" :value="`${entity.serial}`" />
             </QCard>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
@@ -293,12 +289,9 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnLv
                         :label="t('invoiceIn.summary.taxableBase')"
-                        :value="toCurrency(entity.totals.totalTaxableBase, currency)"
-                    />
-                    <VnLv
-                        label="Total"
-                        :value="toCurrency(entity.totals.totalVat, currency)"
+                        :value="toCurrency(entity.totals.totalTaxableBase)"
                     />
+                    <VnLv label="Total" :value="toCurrency(entity.totals.totalVat)" />
                     <VnLv :label="t('invoiceIn.summary.dueTotal')">
                         <template #value>
                             <QChip
@@ -311,7 +304,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                                         : t('invoiceIn.summary.dueTotal')
                                 "
                             >
-                                {{ toCurrency(entity.totals.totalDueDay, currency) }}
+                                {{ toCurrency(entity.totals.totalDueDay) }}
                             </QChip>
                         </template>
                     </VnLv>
@@ -350,15 +343,17 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     <template #bottom-row>
                         <QTr class="bg">
                             <QTd></QTd>
+                            <QTd>{{ toCurrency(entity.totals.totalTaxableBase) }}</QTd>
+                            <QTd></QTd>
+                            <QTd></QTd>
+                            <QTd>{{ toCurrency(getTotalTax(entity.invoiceInTax)) }}</QTd>
                             <QTd>{{
-                                toCurrency(entity.totals.totalTaxableBase, currency)
+                                entity.totals.totalTaxableBaseForeignValue &&
+                                toCurrency(
+                                    entity.totals.totalTaxableBaseForeignValue,
+                                    currency
+                                )
                             }}</QTd>
-                            <QTd></QTd>
-                            <QTd></QTd>
-                            <QTd>{{
-                                toCurrency(getTotalTax(entity.invoiceInTax, currency))
-                            }}</QTd>
-                            <QTd></QTd>
                         </QTr>
                     </template>
                 </QTable>
@@ -384,9 +379,17 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                             <QTd></QTd>
                             <QTd></QTd>
                             <QTd>
-                                {{ toCurrency(entity.totals.totalDueDay, currency) }}
+                                {{ toCurrency(entity.totals.totalDueDay) }}
+                            </QTd>
+                            <QTd>
+                                {{
+                                    entity.totals.totalDueDayForeignValue &&
+                                    toCurrency(
+                                        entity.totals.totalDueDayForeignValue,
+                                        currency
+                                    )
+                                }}
                             </QTd>
-                            <QTd></QTd>
                         </QTr>
                     </template>
                 </QTable>
@@ -421,7 +424,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     <template #bottom-row>
                         <QTr class="bg">
                             <QTd></QTd>
-                            <QTd>{{ toCurrency(intrastatTotals.amount, currency) }}</QTd>
+                            <QTd>{{ toCurrency(intrastatTotals.amount) }}</QTd>
                             <QTd>{{ intrastatTotals.net }}</QTd>
                             <QTd>{{ intrastatTotals.stems }}</QTd>
                             <QTd></QTd>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 34b0b64bd..d44880937 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -2,18 +2,17 @@
 import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
-import axios from 'axios';
 import { useArrayData } from 'src/composables/useArrayData';
+import { getTotal } from 'src/composables/getTotal';
 import { toCurrency } from 'src/filters';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import CrudModel from 'src/components/CrudModel.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
+import CreateNewExpenseForm from 'src/components/CreateNewExpenseForm.vue';
 
 const { t } = useI18n();
-const quasar = useQuasar();
 
 const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
@@ -23,15 +22,7 @@ const expenses = ref([]);
 const sageTaxTypes = ref([]);
 const sageTransactionTypes = ref([]);
 const rowsSelected = ref([]);
-const newExpense = ref({
-    code: undefined,
-    isWithheld: false,
-    description: undefined,
-});
-
 const invoiceInFormRef = ref();
-const expensesRef = ref();
-const newExpenseRef = ref();
 
 defineProps({
     actionIcon: {
@@ -56,7 +47,7 @@ const columns = computed(() => [
     {
         name: 'taxablebase',
         label: t('Taxable base'),
-        field: (row) => toCurrency(row.taxableBase, currency.value),
+        field: (row) => row.taxableBase,
         model: 'taxableBase',
         sortable: true,
         tabIndex: 2,
@@ -91,7 +82,7 @@ const columns = computed(() => [
         label: t('Rate'),
         sortable: true,
         tabIndex: 5,
-        field: (row) => toCurrency(taxRate(row, row.taxTypeSageFk), currency.value),
+        field: (row) => taxRate(row, row.taxTypeSageFk),
         align: 'left',
     },
     {
@@ -132,40 +123,6 @@ function taxRate(invoiceInTax) {
     return (taxTypeSage / 100) * taxableBase;
 }
 
-async function addExpense() {
-    try {
-        if (!newExpense.value.code) throw new Error(t(`The code can't be empty`));
-        if (isNaN(newExpense.value.code))
-            throw new Error(t(`The code have to be a number`));
-        if (!newExpense.value.description)
-            throw new Error(t(`The description can't be empty`));
-
-        const data = [
-            {
-                id: newExpense.value.code,
-                isWithheld: newExpense.value.isWithheld,
-                name: newExpense.value.description,
-            },
-        ];
-
-        await axios.post(`Expenses`, data);
-        await expensesRef.value.fetch();
-        quasar.notify({
-            type: 'positive',
-            message: t('globals.dataSaved'),
-        });
-        newExpenseRef.value.hide();
-    } catch (error) {
-        quasar.notify({
-            type: 'negative',
-            message: t(`${error.message}`),
-        });
-    }
-}
-const getTotalTaxableBase = (rows) =>
-    rows.reduce((acc, { taxableBase }) => acc + +(taxableBase || 0), 0);
-const getTotalRate = (rows) => rows.reduce((acc, cur) => acc + +taxRate(cur), 0);
-
 const formatOpt = (row, { model, options }, prop) => {
     const obj = row[model];
     const option = options.find(({ id }) => id == obj);
@@ -207,37 +164,25 @@ const formatOpt = (row, { model, options }, prop) => {
             >
                 <template #body-cell-expense="{ row, col }">
                     <QTd>
-                        <VnSelect
+                        <VnSelectDialog
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
                             :option-label="col.optionLabel"
                             :filter-options="['id', 'name']"
+                            :tooltip="t('Create a new expense')"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
                                     {{ `${scope.opt.id}: ${scope.opt.name}` }}
                                 </QItem>
                             </template>
-                            <template #append>
-                                <QIcon
-                                    name="close"
-                                    @click.stop="value = null"
-                                    class="cursor-pointer"
-                                    size="xs"
+                            <template #form>
+                                <CreateNewExpenseForm
+                                    @on-data-saved="$refs.expensesRef.fetch()"
                                 />
-                                <QIcon
-                                    @click.stop.prevent="newExpenseRef.show()"
-                                    :name="actionIcon"
-                                    size="xs"
-                                    class="default-icon"
-                                >
-                                    <QTooltip>
-                                        {{ t('Create expense') }}
-                                    </QTooltip>
-                                </QIcon>
                             </template>
-                        </VnSelect>
+                        </VnSelectDialog>
                     </QTd>
                 </template>
                 <template #body-cell-taxablebase="{ row }">
@@ -325,12 +270,24 @@ const formatOpt = (row, { model, options }, prop) => {
                         <QTd />
                         <QTd />
                         <QTd>
-                            {{ toCurrency(getTotalTaxableBase(rows), currency) }}
+                            {{ getTotal(rows, 'taxableBase', { currency: 'default' }) }}
                         </QTd>
                         <QTd />
                         <QTd />
-                        <QTd> {{ toCurrency(getTotalRate(rows), currency) }}</QTd>
-                        <QTd />
+                        <QTd>
+                            {{
+                                getTotal(rows, null, { cb: taxRate, currency: 'default' })
+                            }}</QTd
+                        >
+                        <QTd>
+                            <template v-if="isNotEuro(invoiceIn.currency.code)">
+                                {{
+                                    getTotal(rows, 'foreignValue', {
+                                        currency: invoiceIn.currency.code,
+                                    })
+                                }}
+                            </template>
+                        </QTd>
                     </QTr>
                 </template>
                 <template #item="props">
@@ -342,7 +299,7 @@ const formatOpt = (row, { model, options }, prop) => {
                             <QSeparator />
                             <QList>
                                 <QItem>
-                                    <VnSelect
+                                    <VnSelectDialog
                                         :label="t('Expense')"
                                         class="full-width"
                                         v-model="props.row['expenseFk']"
@@ -350,13 +307,17 @@ const formatOpt = (row, { model, options }, prop) => {
                                         option-value="id"
                                         option-label="name"
                                         :filter-options="['id', 'name']"
+                                        :tooltip="t('Create a new expense')"
                                     >
                                         <template #option="scope">
                                             <QItem v-bind="scope.itemProps">
                                                 {{ `${scope.opt.id}: ${scope.opt.name}` }}
                                             </QItem>
                                         </template>
-                                    </VnSelect>
+                                        <template #form>
+                                            <CreateNewExpenseForm />
+                                        </template>
+                                    </VnSelectDialog>
                                 </QItem>
                                 <QItem>
                                     <VnInputNumber
@@ -439,44 +400,6 @@ const formatOpt = (row, { model, options }, prop) => {
             </QTable>
         </template>
     </CrudModel>
-    <QDialog ref="newExpenseRef">
-        <QCard>
-            <QCardSection class="q-pb-none">
-                <QItem class="q-pa-none">
-                    <span class="text-primary text-h6 full-width">
-                        <QIcon name="edit" class="q-mr-xs" />
-                        {{ t('New expense') }}
-                    </span>
-                    <QBtn icon="close" flat round dense v-close-popup />
-                </QItem>
-            </QCardSection>
-            <QCardSection class="q-pt-none">
-                <QItem>
-                    <VnInput
-                        :label="`${t('Code')}*`"
-                        v-model="newExpense.code"
-                        :required="true"
-                    />
-                    <QCheckbox
-                        dense
-                        size="sm"
-                        :label="`${t('It\'s a withholding')}`"
-                        v-model="newExpense.isWithheld"
-                    />
-                </QItem>
-                <QItem>
-                    <VnInput
-                        :label="`${t('Descripction')}*`"
-                        v-model="newExpense.description"
-                    />
-                </QItem>
-            </QCardSection>
-            <QCardActions class="justify-end">
-                <QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
-                <QBtn :label="t('globals.save')" color="primary" @click="addExpense" />
-            </QCardActions>
-        </QCard>
-    </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
         <QBtn
             color="primary"
@@ -484,7 +407,9 @@ const formatOpt = (row, { model, options }, prop) => {
             size="lg"
             round
             @click="invoiceInFormRef.insert()"
-        />
+        >
+            <QTooltip>{{ t('Add tax') }}</QTooltip>
+        </QBtn>
     </QPageSticky>
 </template>
 
@@ -524,18 +449,11 @@ const formatOpt = (row, { model, options }, prop) => {
 <i18n>
 es:
     Expense: Gasto
-    Create expense: Crear gasto
+    Create a new expense: Crear nuevo gasto
     Add tax: Crear gasto
     Taxable base: Base imp.
     Sage tax: Sage iva
     Sage transaction: Sage transacción
     Rate: Tasa
     Foreign value: Divisa
-    New expense: Nuevo gasto
-    Code: Código
-    It's a withholding: Es una retención
-    Descripction: Descripción
-    The code can't be empty: El código no puede estar vacío
-    The description can't be empty: La descripción no puede estar vacía
-    The code have to be a number: El código debe ser un número.
 </i18n>
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 2f87c2b2e..bf4e023a9 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -28,6 +28,16 @@ const activities = ref([]);
             </div>
         </template>
         <template #body="{ params, searchFn }">
+            <QItem>
+                <QItemSection>
+                    <VnInputDate :label="t('From')" v-model="params.from" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate :label="t('To')" v-model="params.to" is-outlined />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelect
@@ -64,16 +74,6 @@ const activities = ref([]);
                     />
                 </QItemSection>
             </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('params.serialNumber')"
-                        v-model="params.serialNumber"
-                        is-outlined
-                        lazy-rules
-                    />
-                </QItemSection>
-            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -84,15 +84,6 @@ const activities = ref([]);
                     />
                 </QItemSection>
             </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        :label="t('Issued')"
-                        v-model="params.issued"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -140,22 +131,6 @@ const activities = ref([]);
                     />
                 </QItemSection>
             </QItem>
-            <QExpansionItem :label="t('More options')" expand-separator>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            :label="t('From')"
-                            v-model="params.from"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate :label="t('To')" v-model="params.to" is-outlined />
-                    </QItemSection>
-                </QItem>
-            </QExpansionItem>
         </template>
     </VnFilterPanel>
 </template>
@@ -179,6 +154,7 @@ en:
         correctedFk: Rectified
         issued: Issued
         to: To
+        from: From
         awbCode: AWB
         correctingFk: Rectificative
         supplierActivityFk: Supplier activity
@@ -201,6 +177,8 @@ es:
         correctedFk: Rectificada
         correctingFk: Rectificativa
         supplierActivityFk: Actividad proveedor
+        from: Desde
+        to: Hasta
     From: Desde
     To: Hasta
     Amount: Importe
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 234cfb50f..0cad09378 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -47,12 +47,6 @@ const cols = computed(() => [
         name: 'supplierRef',
         label: t('invoiceIn.list.supplierRef'),
     },
-
-    {
-        align: 'left',
-        name: 'serialNumber',
-        label: t('invoiceIn.list.serialNumber'),
-    },
     {
         align: 'left',
         name: 'serial',
@@ -141,7 +135,7 @@ const cols = computed(() => [
                 v-model="data.supplierFk"
                 url="Suppliers"
                 :fields="['id', 'nickname']"
-                :label="t('Supplier')"
+                :label="t('globals.supplier')"
                 option-value="id"
                 option-label="nickname"
                 :filter-options="['id', 'name']"
@@ -162,7 +156,7 @@ const cols = computed(() => [
             />
             <VnSelect
                 url="Companies"
-                :label="t('Company')"
+                :label="t('globals.company')"
                 :fields="['id', 'code']"
                 v-model="data.companyFk"
                 option-value="id"
diff --git a/src/pages/InvoiceIn/composables/setRectificative.js b/src/pages/InvoiceIn/composables/setRectificative.js
new file mode 100644
index 000000000..a1afb8fb0
--- /dev/null
+++ b/src/pages/InvoiceIn/composables/setRectificative.js
@@ -0,0 +1,14 @@
+import axios from 'axios';
+
+export async function setRectificative(route) {
+    const card = route.matched.find((route) => route.name === 'InvoiceInCard');
+    const corrective = card.children.find(
+        (route) => route.name === 'InvoiceInCorrective'
+    );
+
+    corrective.meta.hidden = !(
+        await axios.get('InvoiceInCorrections', {
+            params: { filter: { where: { correctingFk: route.params.id } } },
+        })
+    ).data.length;
+}
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
new file mode 100644
index 000000000..824fd6e12
--- /dev/null
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -0,0 +1,49 @@
+invoiceIn:
+    serial: Serial
+    list:
+        ref: Reference
+        supplier: Supplier
+        supplierRef: Supplier ref.
+        serial: Serial
+        file: File
+        issued: Issued
+        isBooked: Is booked
+        awb: AWB
+        amount: Amount
+    card:
+        issued: Issued
+        amount: Amount
+        client: Client
+        company: Company
+        customerCard: Customer card
+        ticketList: Ticket List
+        vat: Vat
+        dueDay: Due day
+        intrastat: Intrastat
+    summary:
+        supplier: Supplier
+        supplierRef: Supplier ref.
+        currency: Currency
+        issued: Expedition date
+        operated: Operation date
+        bookEntried: Entry date
+        bookedDate: Booked date
+        sage: Sage withholding
+        vat: Undeductible VAT
+        company: Company
+        booked: Booked
+        expense: Expense
+        taxableBase: Taxable base
+        rate: Rate
+        sageVat: Sage vat
+        sageTransaction: Sage transaction
+        dueDay: Date
+        bank: Bank
+        amount: Amount
+        foreignValue: Foreign value
+        dueTotal: Due day
+        noMatch: Do not match
+        code: Code
+        net: Net
+        stems: Stems
+        country: Country
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
new file mode 100644
index 000000000..944708364
--- /dev/null
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -0,0 +1,47 @@
+invoiceIn:
+    serial: Serie
+    list:
+        ref: Referencia
+        supplier: Proveedor
+        supplierRef: Ref. proveedor
+        shortIssued: F. emisión
+        file: Fichero
+        issued: Fecha emisión
+        isBooked: Conciliada
+        awb: AWB
+        amount: Importe
+    card:
+        issued: Fecha emisión
+        amount: Importe
+        client: Cliente
+        company: Empresa
+        customerCard: Ficha del cliente
+        ticketList: Listado de tickets
+        vat: Iva
+        dueDay: Fecha de vencimiento
+    summary:
+        supplier: Proveedor
+        supplierRef: Ref. proveedor
+        currency: Divisa
+        docNumber: Número documento
+        issued: Fecha de expedición
+        operated: Fecha operación
+        bookEntried: Fecha asiento
+        bookedDate: Fecha contable
+        sage: Retención sage
+        vat: Iva no deducible
+        company: Empresa
+        booked: Contabilizada
+        expense: Gasto
+        taxableBase: Base imp.
+        rate: Tasa
+        sageTransaction: Sage transación
+        dueDay: Fecha
+        bank: Caja
+        amount: Importe
+        foreignValue: Divisa
+        dueTotal: Vencimiento
+        code: Código
+        net: Neto
+        stems: Tallos
+        country: País
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 8381f0624..baac0c608 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -10,8 +10,6 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import RegularizeStockForm from 'components/RegularizeStockForm.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
-
-import { useState } from 'src/composables/useState';
 import useCardDescription from 'src/composables/useCardDescription';
 import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
@@ -35,58 +33,69 @@ const $props = defineProps({
         type: Number,
         default: null,
     },
+    warehouseFk: {
+        type: Number,
+        default: null,
+    },
 });
 
 const quasar = useQuasar();
 const route = useRoute();
 const router = useRouter();
 const { t } = useI18n();
-const state = useState();
-const user = state.getUser();
-
+const warehouseConfig = ref(null);
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
+
 const regularizeStockFormDialog = ref(null);
 const available = ref(null);
 const visible = ref(null);
-const _warehouseFk = ref(null);
 const salixUrl = ref();
-const warehouseFk = computed({
-    get() {
-        return _warehouseFk.value;
-    },
-    set(val) {
-        _warehouseFk.value = val;
-        if (val) updateStock();
-    },
-});
 
 onMounted(async () => {
-    warehouseFk.value = user.value.warehouseFk;
     salixUrl.value = await getUrl('');
+    await getItemConfigs();
+    await updateStock();
 });
 
 const data = ref(useCardDescription());
-const setData = (entity) => {
-    if (!entity) return;
-    data.value = useCardDescription(entity.name, entity.id);
+const setData = async (entity) => {
+    try {
+        if (!entity) return;
+        data.value = useCardDescription(entity.name, entity.id);
+        await updateStock();
+    } catch (err) {
+        console.error('Error item');
+    }
 };
 
+const getItemConfigs = async () => {
+    try {
+        const { data } = await axios.get('ItemConfigs/findOne');
+        if (!data) return;
+        return (warehouseConfig.value = data.warehouseFk);
+    } catch (err) {
+        console.error('Error item');
+    }
+};
 const updateStock = async () => {
     try {
         available.value = null;
         visible.value = null;
 
         const params = {
-            warehouseFk: warehouseFk.value,
+            warehouseFk: $props.warehouseFk,
             dated: $props.dated,
         };
 
+        await getItemConfigs();
+        if (!params.warehouseFk) {
+            params.warehouseFk = warehouseConfig.value;
+        }
         const { data } = await axios.get(`Items/${entityId.value}/getVisibleAvailable`, {
             params,
         });
-
         available.value = data.available;
         visible.value = data.visible;
     } catch (err) {
diff --git a/src/pages/Item/Card/ItemDescriptorImage.vue b/src/pages/Item/Card/ItemDescriptorImage.vue
index d83f534b8..a4ef22ce3 100644
--- a/src/pages/Item/Card/ItemDescriptorImage.vue
+++ b/src/pages/Item/Card/ItemDescriptorImage.vue
@@ -47,8 +47,11 @@ const getWarehouseName = async (warehouseFk) => {
     const filter = {
         where: { id: warehouseFk },
     };
-
-    const { data } = await axios.get('Warehouses/findOne', { filter });
+    const { data } = await axios.get('Warehouses/findOne', {
+        params: {
+            filter: JSON.stringify(filter),
+        },
+    });
     if (!data) return;
     warehouseName.value = data.name;
 };
diff --git a/src/pages/Item/Card/ItemDescriptorProxy.vue b/src/pages/Item/Card/ItemDescriptorProxy.vue
index 2b7b39a65..2ffc9080f 100644
--- a/src/pages/Item/Card/ItemDescriptorProxy.vue
+++ b/src/pages/Item/Card/ItemDescriptorProxy.vue
@@ -15,6 +15,10 @@ const $props = defineProps({
         type: Number,
         default: null,
     },
+    warehouseFk: {
+        type: Number,
+        default: null,
+    },
 });
 </script>
 
@@ -26,6 +30,7 @@ const $props = defineProps({
             :summary="ItemSummary"
             :dated="dated"
             :sale-fk="saleFk"
+            :warehouse-fk="warehouseFk"
         />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 6b469d13a..d91b5189e 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -1,196 +1,190 @@
 <script setup>
-import { onMounted, ref, reactive, computed, onUnmounted, watch } from 'vue';
+import { onMounted, ref, reactive, onUnmounted, nextTick, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-
-import FetchData from 'components/FetchData.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import EditTableCellValueForm from 'src/components/EditTableCellValueForm.vue';
 import ItemFixedPriceFilter from './ItemFixedPriceFilter.vue';
+import { useQuasar } from 'quasar';
 import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
-
+import { tMobile } from 'src/composables/tMobile';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import FetchData from 'src/components/FetchData.vue';
 import { useStateStore } from 'stores/useStateStore';
-import { dashIfEmpty } from 'src/filters';
+import { toDate } from 'src/filters';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useState } from 'src/composables/useState';
-import { toCurrency } from 'filters/index';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
-import { useArrayData } from 'composables/useArrayData';
 import { isLower, isBigger } from 'src/filters/date.js';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import { QCheckbox } from 'quasar';
 
+const quasar = useQuasar();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();
 const state = useState();
 const { notify } = useNotify();
-
+const tableRef = ref();
 const editTableCellDialogRef = ref(null);
 const user = state.getUser();
 const fixedPrices = ref([]);
-const fixedPricesOriginalData = ref([]);
 const warehousesOptions = ref([]);
 const rowsSelected = ref([]);
 
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-            return { 'i.name': { like: `%${value}%` } };
-        case 'itemFk':
-        case 'warehouseFk':
-        case 'rate2':
-        case 'rate3':
-            param = `fp.${param}`;
-            return { [param]: value };
-        case 'minPrice':
-            param = `i.${param}`;
-            return { [param]: value };
-    }
-};
+const itemFixedPriceFilterRef = ref();
 
 const params = reactive({});
-const arrayData = useArrayData('ItemFixedPrices', {
-    url: 'FixedPrices/filter',
-    userParams: params,
-    order: ['name ASC', 'itemFk'],
-    exprBuilder: exprBuilder,
-});
-const store = arrayData.store;
-
-const fetchFixedPrices = async () => {
-    await arrayData.fetch({ append: false });
-};
-
-const onFixedPricesFetched = (data) => {
-    fixedPrices.value = data;
-    // el objetivo de guardar una copia de las rows es evitar guardar cambios si la data no cambió al disparar los eventos
-    fixedPricesOriginalData.value = JSON.parse(JSON.stringify(data));
-};
-
-watch(
-    () => store.data,
-    (data) => onFixedPricesFetched(data)
-);
-
-const applyColumnFilter = async (col) => {
-    try {
-        const paramKey = col.columnFilter?.filterParamKey || col.field;
-        params[paramKey] = col.columnFilter.filterValue;
-        await arrayData.addFilter({ params });
-    } catch (err) {
-        console.error('Error applying column filter', err);
-    }
-};
-
-const getColumnInputEvents = (col) => {
-    return col.columnFilter.type === 'select'
-        ? { 'update:modelValue': () => applyColumnFilter(col) }
-        : {
-              'keyup.enter': () => applyColumnFilter(col),
-          };
-};
-
-const defaultColumnFilter = {
-    component: VnInput,
-    type: 'text',
-    filterValue: null,
-    event: getColumnInputEvents,
-    attrs: {
-        dense: true,
-    },
-};
-
 const defaultColumnAttrs = {
     align: 'left',
     sortable: true,
 };
-
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    params.warehouseFk = user.value.warehouseFk;
+});
+onUnmounted(() => (stateStore.rightDrawer = false));
 const columns = computed(() => [
     {
         label: t('item.fixedPrice.itemId'),
         name: 'itemId',
-        field: 'itemFk',
         ...defaultColumnAttrs,
-        columnFilter: {
-            ...defaultColumnFilter,
+        isId: true,
+        cardVisible: true,
+        columnField: {
+            component: 'input',
+            type: 'number',
         },
+        columnClass: 'shrink',
     },
     {
-        label: t('globals.description'),
+        label: t('globals.name'),
         field: 'name',
         name: 'description',
         ...defaultColumnAttrs,
-        columnFilter: {
-            ...defaultColumnFilter,
-        },
+        create: true,
+        cardVisible: true,
     },
     {
         label: t('item.fixedPrice.groupingPrice'),
         field: 'rate2',
-        name: 'groupingPrice',
+        name: 'rate2',
         ...defaultColumnAttrs,
-        columnFilter: {
-            ...defaultColumnFilter,
+        cardVisible: true,
+        columnField: {
+            class: 'expand',
+            component: 'input',
+            type: 'number',
+        },
+        columnFilter: {
+            class: 'expand',
+            component: 'input',
+            type: 'number',
         },
-        format: (val) => toCurrency(val),
     },
     {
         label: t('item.fixedPrice.packingPrice'),
         field: 'rate3',
-        name: 'packingPrice',
+        name: 'rate3',
         ...defaultColumnAttrs,
-        columnFilter: {
-            ...defaultColumnFilter,
+        cardVisible: true,
+        columnField: {
+            class: 'expand',
+            component: 'input',
+            type: 'number',
+        },
+        columnFilter: {
+            class: 'expand',
+            component: 'input',
+            type: 'number',
         },
-        format: (val) => dashIfEmpty(val),
     },
 
     {
         label: t('item.fixedPrice.minPrice'),
         field: 'minPrice',
+        columnClass: 'shrink',
         name: 'minPrice',
         ...defaultColumnAttrs,
+        cardVisible: true,
+        columnField: {
+            class: 'expand',
+            component: 'input',
+            type: 'number',
+        },
         columnFilter: {
-            ...defaultColumnFilter,
+            class: 'expand',
+            component: 'input',
+            type: 'number',
         },
     },
     {
         label: t('item.fixedPrice.started'),
         field: 'started',
         name: 'started',
+        format: ({ started }) => toDate(started),
+        cardVisible: true,
         ...defaultColumnAttrs,
-        columnFilter: null,
+        columnField: {
+            component: 'date',
+            class: 'shrink',
+        },
+        columnFilter: {
+            component: 'date',
+        },
+        columnClass: 'expand',
     },
     {
         label: t('item.fixedPrice.ended'),
         field: 'ended',
         name: 'ended',
         ...defaultColumnAttrs,
-        columnFilter: null,
+        cardVisible: true,
+        columnField: {
+            component: 'date',
+            class: 'shrink',
+        },
+        columnFilter: {
+            component: 'date',
+        },
+        columnClass: 'expand',
+        format: (row) => toDate(row.ended),
     },
 
     {
         label: t('item.fixedPrice.warehouse'),
         field: 'warehouseFk',
-        name: 'warehouse',
+        name: 'warehouseFk',
         ...defaultColumnAttrs,
+        columnClass: 'shrink',
         columnFilter: {
-            component: VnSelect,
-            type: 'select',
-            filterValue: null,
-            event: getColumnInputEvents,
-            attrs: {
-                options: warehousesOptions.value,
-                'option-value': 'id',
-                'option-label': 'name',
-                dense: true,
-            },
+            component: 'select',
+        },
+        columnField: {
+            component: 'select',
+            class: 'expand',
+        },
+        attrs: {
+            options: warehousesOptions,
         },
     },
-    { name: 'deleteAction', align: 'center' },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: (row) => confirmRemove(row),
+                isPrimary: true,
+            },
+        ],
+    },
 ]);
 
 const editTableFieldsOptions = [
@@ -218,15 +212,6 @@ const editTableFieldsOptions = [
             type: 'number',
         },
     },
-    {
-        field: 'hasMinPrice',
-        label: t('item.fixedPrice.hasMinPrice'),
-        component: 'checkbox',
-        attrs: {
-            'false-value': 0,
-            'true-value': 1,
-        },
-    },
     {
         field: 'started',
         label: t('item.fixedPrice.started'),
@@ -248,7 +233,6 @@ const editTableFieldsOptions = [
         },
     },
 ];
-
 const getRowUpdateInputEvents = (props, resetMinPrice, inputType = 'text') => {
     return inputType === 'text'
         ? {
@@ -258,91 +242,6 @@ const getRowUpdateInputEvents = (props, resetMinPrice, inputType = 'text') => {
         : { 'update:modelValue': () => upsertPrice(props, resetMinPrice) };
 };
 
-const validations = (row, rowIndex, col) => {
-    const isNew = !row.id;
-    // Si la row no tiene id significa que fue agregada con addRow y no se ha guardado en la base de datos
-    // Si isNew es falso no se checkea si el valor es igual a la original
-    if (!isNew)
-        if (fixedPricesOriginalData.value[rowIndex][col.field] == row[col.field])
-            return false;
-
-    const requiredFields = ['itemFk', 'started', 'ended', 'rate2', 'rate3'];
-    return requiredFields.every(
-        (field) => row[field] !== null && row[field] !== undefined
-    );
-};
-
-const upsertPrice = async ({ row, col, rowIndex }, resetMinPrice = false) => {
-    if (!validations(row, rowIndex, col)) return;
-
-    try {
-        if (resetMinPrice) row.hasMinPrice = 0;
-
-        const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row);
-        row = data;
-        fixedPricesOriginalData.value[rowIndex][col.field] = row[col.field];
-    } catch (err) {
-        console.error('Error editing price', err);
-    }
-};
-
-const addRow = () => {
-    if (!fixedPrices.value || fixedPrices.value.length === 0) {
-        fixedPrices.value = [];
-
-        const today = Date.vnNew();
-        const millisecsInDay = 86400000;
-        const daysInWeek = 7;
-        const nextWeek = new Date(today.getTime() + daysInWeek * millisecsInDay);
-
-        const newPrice = {
-            started: today,
-            ended: nextWeek,
-            hasMinPrice: 0,
-        };
-
-        fixedPricesOriginalData.value.push({ ...newPrice });
-        fixedPrices.value.push({ ...newPrice });
-        return;
-    }
-
-    const lastItemCopy = JSON.parse(
-        JSON.stringify(fixedPrices.value[fixedPrices.value.length - 1])
-    );
-    delete lastItemCopy.id;
-    fixedPricesOriginalData.value.push(lastItemCopy);
-    fixedPrices.value.push(lastItemCopy);
-};
-
-const openEditTableCellDialog = () => {
-    editTableCellDialogRef.value.show();
-};
-
-const onEditCellDataSaved = async () => {
-    rowsSelected.value = [];
-    await fetchFixedPrices();
-};
-
-const onWarehousesFetched = (data) => {
-    warehousesOptions.value = data;
-    // Actualiza las 'options' del elemento con field 'warehouseFk' en 'editTableFieldsOptions'.
-    const warehouseField = editTableFieldsOptions.find(
-        (field) => field.field === 'warehouseFk'
-    );
-    warehouseField.attrs.options = data;
-};
-
-const removePrice = async (id, rowIndex) => {
-    try {
-        await axios.delete(`FixedPrices/${id}`);
-        fixedPrices.value.splice(rowIndex, 1);
-        fixedPricesOriginalData.value.splice(rowIndex, 1);
-        notify(t('globals.dataSaved'), 'positive');
-    } catch (err) {
-        console.error('Error removing price', err);
-    }
-};
-
 const updateMinPrice = async (value, props) => {
     // El checkbox hasMinPrice se encuentra en la misma columna que el input hasMinPrice
     // Por lo tanto le mandamos otro objeto con las mismas propiedades pero con el campo 'field' cambiado
@@ -354,213 +253,361 @@ const updateMinPrice = async (value, props) => {
     });
 };
 
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-    params.warehouseFk = user.value.warehouseFk;
-    await fetchFixedPrices();
-});
+const upsertPrice = async (props, resetMinPrice = false) => {
+    try {
+        const { row } = props;
+        if (tableRef.value.CrudModelRef.getChanges().updates.length > 0) {
+            if (resetMinPrice) row.hasMinPrice = 0;
+            await upsertFixedPrice(row);
+        }
+    } catch (err) {
+        console.error('Error editing price', err);
+    }
+};
 
-onUnmounted(() => (stateStore.rightDrawer = false));
+async function upsertFixedPrice(row) {
+    try {
+        const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row);
+        return data;
+    } catch (err) {
+        console.error('Error editing price', err);
+    }
+}
+
+async function saveOnRowChange(row) {
+    if (rowsSelected.value.length > 1) return;
+    if (rowsSelected.value[0]?.id === row.id) return;
+    else if (rowsSelected.value.length === 1) await upsertPrice(rowsSelected.value[0]);
+    rowsSelected.value = [row];
+}
+
+function checkLastVisibleRow() {
+    let lastVisibleRow = null;
+
+    getTableRows().forEach((row, index) => {
+        const rect = row.getBoundingClientRect();
+        if (rect.top >= 0 && rect.bottom <= window.innerHeight) {
+            lastVisibleRow = index;
+        }
+    });
+
+    return lastVisibleRow;
+}
+
+const addRow = (original = null) => {
+    let copy = null;
+    if (!original) {
+        const today = Date.vnNew();
+        const millisecsInDay = 86400000;
+        const daysInWeek = 7;
+        const nextWeek = new Date(today.getTime() + daysInWeek * millisecsInDay);
+
+        copy = {
+            id: 0,
+            started: today,
+            ended: nextWeek,
+            hasMinPrice: 0,
+            $index: 0,
+        };
+    } else
+        copy = {
+            $index: original.$index - 1,
+            itemFk: original.itemFk,
+            name: original.name,
+            subName: original.subName,
+            value5: original.value5,
+            value6: original.value6,
+            value7: original.value7,
+            value8: original.value8,
+            value9: original.value9,
+            value10: original.value10,
+            warehouseFk: original.warehouseFk,
+            rate2: original.rate2,
+            rate3: original.rate3,
+            hasMinPrice: original.hasMinPrice,
+            minPrice: original.minPrice,
+            started: Date.vnNew(),
+            ended: Date.vnNew(),
+        };
+    return { original, copy };
+};
+
+const getTableRows = () =>
+    document.getElementsByClassName('q-table')[0].querySelectorAll('tr.cursor-pointer');
+
+function highlightNewRow({ $index: index }) {
+    const row = getTableRows()[index];
+    if (row) {
+        row.classList.add('highlight');
+        setTimeout(() => {
+            row.classList.remove('highlight');
+        }, 3000); // Duración de la animación en milisegundos
+    }
+}
+const openEditTableCellDialog = () => {
+    editTableCellDialogRef.value.show();
+};
+
+const onEditCellDataSaved = async () => {
+    rowsSelected.value = [];
+    tableRef.value.reload();
+};
+
+const removeFuturePrice = async () => {
+    try {
+        rowsSelected.value.forEach(({ id }) => {
+            const rowIndex = fixedPrices.value.findIndex(({ id }) => id === id);
+            removePrice(id, rowIndex);
+        });
+    } catch (err) {
+        console.error('Error removing price', err);
+    }
+};
+
+function confirmRemove(item, isFuture) {
+    const promise = async () =>
+        isFuture ? removeFuturePrice(item.id) : removePrice(item.id);
+    quasar.dialog({
+        component: VnConfirm,
+        componentProps: {
+            title: t('globals.rowWillBeRemoved'),
+            message: t('globals.confirmDeletion'),
+            promise,
+        },
+    });
+}
+
+const removePrice = async (id) => {
+    try {
+        await axios.delete(`FixedPrices/${id}`);
+        notify(t('globals.dataSaved'), 'positive');
+        tableRef.value.reload({});
+    } catch (err) {
+        console.error('Error removing price', err);
+    }
+};
+const dateStyle = (date) =>
+    date
+        ? {
+              'bg-color': 'warning',
+              'is-outlined': true,
+          }
+        : {};
+
+function handleOnDataSave({ CrudModelRef }) {
+    const { original, copy } = addRow(CrudModelRef.formData[checkLastVisibleRow()]);
+    if (original) {
+        CrudModelRef.formData.splice(original?.$index ?? 0, 0, copy);
+    } else {
+        CrudModelRef.insert(copy);
+    }
+    nextTick(() => {
+        highlightNewRow(original ?? { $index: 0 });
+    });
+}
 </script>
 
 <template>
     <FetchData
-        url="Warehouses"
-        :filter="{ order: ['name'] }"
+        @on-fetch="(data) => (warehousesOptions = data)"
         auto-load
-        @on-fetch="(data) => onWarehousesFetched(data)"
+        url="Warehouses"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
     />
     <RightMenu>
         <template #right-panel>
             <ItemFixedPriceFilter
                 data-key="ItemFixedPrices"
-                :warehouses-options="warehousesOptions"
+                ref="itemFixedPriceFilterRef"
             />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <QTable
-            :rows="fixedPrices"
+    <VnSubToolbar>
+        <template #st-data>
+            <QBtn
+                v-if="rowsSelected.length"
+                @click="openEditTableCellDialog()"
+                color="primary"
+                icon="edit"
+            >
+                <QTooltip>
+                    {{ t('Edit fixed price(s)') }}
+                </QTooltip>
+            </QBtn>
+            <QBtn
+                :label="tMobile('globals.remove')"
+                color="primary"
+                icon="delete"
+                flat
+                @click="(row) => confirmRemove(row, true)"
+                :title="t('globals.remove')"
+                v-if="rowsSelected.length"
+            />
+        </template>
+    </VnSubToolbar>
+    <QPage>
+        <VnTable
+            @on-fetch="
+                (data) =>
+                    data.forEach((item) => {
+                        item.hasMinPrice = `${item.hasMinPrice !== 0}`;
+                    })
+            "
+            :default-remove="false"
+            :default-reset="false"
+            :default-save="false"
+            data-key="ItemFixedPrices"
+            url="FixedPrices/filter"
+            :order="['itemFk ASC']"
+            save-url="FixedPrices/crud"
+            :user-params="{ warehouseFk: user.warehouseFk }"
+            ref="tableRef"
+            dense
             :columns="columns"
-            row-key="id"
-            selection="multiple"
+            default-mode="table"
+            auto-load
+            :is-editable="true"
+            :right-search="false"
+            :table="{
+                'row-key': 'id',
+                selection: 'multiple',
+            }"
+            :crud-model="{
+                paginate: false,
+            }"
             v-model:selected="rowsSelected"
-            :pagination="{ rowsPerPage: 0 }"
-            class="full-width q-mt-md"
-            :no-data-label="t('globals.noResults')"
+            :row-click="saveOnRowChange"
+            :create-as-dialog="false"
+            :create="{
+                onDataSaved: handleOnDataSave,
+            }"
+            :use-model="true"
+            :disable-option="{ card: true }"
         >
-            <template #top-row="{ cols }">
-                <QTr>
-                    <QTd />
-                    <QTd
-                        v-for="(col, index) in cols"
-                        :key="index"
-                        style="max-width: 100px"
-                    >
-                        <component
-                            :is="col.columnFilter.component"
-                            v-if="col.columnFilter"
-                            v-model="col.columnFilter.filterValue"
-                            v-bind="col.columnFilter.attrs"
-                            v-on="col.columnFilter.event(col)"
-                            dense
-                        />
-                    </QTd>
-                </QTr>
+            <template #header-selection="scope">
+                <QCheckbox v-model="scope.selected" />
+            </template>
+            <template #body-selection="scope">
+                {{ scope }}
+                <QCheckbox flat v-model="scope.selected" />
             </template>
 
-            <template #body-cell-itemId="props">
-                <QTd>
-                    <VnSelect
-                        url="Items/withName"
-                        hide-selected
-                        option-label="id"
-                        option-value="id"
-                        v-model="props.row.itemFk"
-                        v-on="getRowUpdateInputEvents(props, true, 'select')"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                    <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </QTd>
+            <template #column-itemId="props">
+                <VnSelect
+                    style="max-width: 100px"
+                    url="Items/withName"
+                    hide-selected
+                    option-label="id"
+                    option-value="id"
+                    v-model="props.row.itemFk"
+                    v-on="getRowUpdateInputEvents(props, true, 'select')"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
             </template>
-            <template #body-cell-description="{ row }">
-                <QTd class="col">
-                    <span class="link">
-                        {{ row.name }}
-                    </span>
-                    <ItemDescriptorProxy :id="row.itemFk" />
-                    <FetchedTags :item="row" />
-                </QTd>
+            <template #column-description="{ row }">
+                <span class="link">
+                    {{ row.name }}
+                </span>
+                <span class="subName">{{ row.subName }}</span>
+                <ItemDescriptorProxy :id="row.itemFk" />
+                <FetchedTags style="width: max-content; max-width: 220px" :item="row" />
             </template>
-            <template #body-cell-groupingPrice="props">
-                <QTd class="col">
-                    <VnInput
-                        v-model.number="props.row.rate2"
-                        v-on="getRowUpdateInputEvents(props)"
-                    >
-                        <template #append>€</template>
-                    </VnInput>
-                </QTd>
+            <template #column-rate2="props">
+                <VnInput
+                    mask="###.##"
+                    v-model.number="props.row.rate2"
+                    v-on="getRowUpdateInputEvents(props)"
+                >
+                    <template #append>€</template>
+                </VnInput>
             </template>
-            <template #body-cell-packingPrice="props">
-                <QTd class="col">
-                    <VnInput
-                        v-model.number="props.row.rate3"
-                        v-on="getRowUpdateInputEvents(props)"
-                    >
-                        <template #append>€</template>
-                    </VnInput>
-                </QTd>
+            <template #column-rate3="props">
+                <VnInput
+                    mask="###.##"
+                    v-model.number="props.row.rate3"
+                    v-on="getRowUpdateInputEvents(props)"
+                >
+                    <template #append>€</template>
+                </VnInput>
             </template>
-            <template #body-cell-minPrice="props">
+            <template #column-minPrice="props">
                 <QTd class="col">
-                    <div class="row">
+                    <div class="row" style="width: 115px">
                         <QCheckbox
-                            class="col"
                             :model-value="props.row.hasMinPrice"
                             @update:model-value="updateMinPrice($event, props)"
-                            :false-value="0"
-                            :true-value="1"
-                            :toggle-indeterminate="false"
+                            :false-value="'false'"
+                            :true-value="'true'"
                         />
                         <VnInput
                             class="col"
-                            :disable="!props.row.hasMinPrice"
+                            :disable="props.row.hasMinPrice === 1"
                             v-model.number="props.row.minPrice"
                             v-on="getRowUpdateInputEvents(props)"
-                            type="number"
-                        />
+                        >
+                            <template #append>€</template>
+                        </VnInput>
                     </div>
                 </QTd>
             </template>
-            <template #body-cell-started="props">
-                <QTd class="col" style="min-width: 160px">
-                    <VnInputDate
-                        v-model="props.row.started"
-                        v-on="getRowUpdateInputEvents(props, false, 'date')"
-                        v-bind="
-                            isBigger(props.row.started)
-                                ? { 'bg-color': 'warning', 'is-outlined': true }
-                                : {}
-                        "
-                    />
-                </QTd>
+            <template #column-started="props">
+                <VnInputDate
+                    class="vnInputDate"
+                    :show-event="true"
+                    v-model="props.row.started"
+                    v-on="getRowUpdateInputEvents(props, false, 'date')"
+                    v-bind="dateStyle(isBigger(props.row.started))"
+                />
             </template>
-            <template #body-cell-ended="props">
-                <QTd class="col" style="min-width: 150px">
-                    <VnInputDate
-                        v-model="props.row.ended"
-                        v-on="getRowUpdateInputEvents(props, false, 'date')"
-                        v-bind="
-                            isLower(props.row.ended)
-                                ? { 'bg-color': 'warning', 'is-outlined': true }
-                                : {}
-                        "
-                    />
-                </QTd>
+            <template #column-ended="props">
+                <VnInputDate
+                    class="vnInputDate"
+                    :show-event="true"
+                    v-model="props.row.ended"
+                    v-on="getRowUpdateInputEvents(props, false, 'date')"
+                    v-bind="dateStyle(isLower(props.row.ended))"
+                />
             </template>
-            <template #body-cell-warehouse="props">
-                <QTd class="col">
-                    <VnSelect
-                        :options="warehousesOptions"
-                        hide-selected
-                        option-label="name"
-                        option-value="id"
-                        v-model="props.row.warehouseFk"
-                        v-on="getRowUpdateInputEvents(props, false, 'select')"
-                    />
-                </QTd>
+            <template #column-warehouseFk="props">
+                <VnSelect
+                    style="max-width: 150px"
+                    :options="warehousesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="props.row.warehouseFk"
+                    v-on="getRowUpdateInputEvents(props, false, 'select')"
+                />
             </template>
-            <template #body-cell-deleteAction="{ row, rowIndex }">
-                <QTd class="col">
-                    <QIcon
-                        name="delete"
-                        size="sm"
-                        class="cursor-pointer fill-icon-on-hover"
-                        color="primary"
-                        @click.stop="
-                            openConfirmationModal(
-                                t('This row will be removed'),
-                                t('Do you want to clone this item?'),
-                                () => removePrice(row.id, rowIndex)
-                            )
-                        "
-                    >
-                        <QTooltip class="text-no-wrap">
-                            {{ t('Delete') }}
-                        </QTooltip>
-                    </QIcon>
-                </QTd>
+            <template #column-deleteAction="{ row, rowIndex }">
+                <QIcon
+                    name="delete"
+                    size="sm"
+                    class="cursor-pointer fill-icon-on-hover"
+                    color="primary"
+                    @click.stop="
+                        openConfirmationModal(
+                            t('globals.rowWillBeRemoved'),
+                            t('Do you want to clone this item?'),
+                            () => removePrice(row.id, rowIndex)
+                        )
+                    "
+                >
+                    <QTooltip class="text-no-wrap">
+                        {{ t('globals.delete') }}
+                    </QTooltip>
+                </QIcon>
             </template>
-            <template #bottom-row>
-                <QTd align="center">
-                    <QIcon
-                        @click.stop="addRow()"
-                        class="fill-icon-on-hover"
-                        color="primary"
-                        name="add_circle"
-                        size="sm"
-                    >
-                        <QTooltip>
-                            {{ t('Add fixed price') }}
-                        </QTooltip>
-                    </QIcon>
-                </QTd>
-            </template>
-        </QTable>
-        <QPageSticky v-if="rowsSelected.length" :offset="[20, 20]">
-            <QBtn @click="openEditTableCellDialog()" color="primary" fab icon="edit" />
-            <QTooltip>
-                {{ t('Edit fixed price(s)') }}
-            </QTooltip>
-        </QPageSticky>
+        </VnTable>
+
         <QDialog ref="editTableCellDialogRef">
             <EditTableCellValueForm
                 edit-url="FixedPrices/editFixedPrice"
@@ -571,12 +618,56 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         </QDialog>
     </QPage>
 </template>
+<style lang="scss">
+.q-table th,
+.q-table td {
+    padding-inline: 5px !important;
+    // text-align: -webkit-right;
+}
+.q-table tbody td {
+    max-width: none;
 
+    .q-td.col {
+        & .vnInputDate {
+            min-width: 90px;
+        }
+        & div.row {
+            & .q-checkbox {
+                & .q-checkbox__inner {
+                    position: relative !important;
+                    &.q-checkbox__inner--truthy {
+                        color: var(--q-primary);
+                    }
+                }
+            }
+        }
+    }
+}
+.q-field__after,
+.q-field__append {
+    padding: 0;
+}
+
+tbody tr.highlight .q-td {
+    animation: highlight-animation 4s ease-in-out;
+}
+@keyframes highlight-animation {
+    0% {
+        background-color: $primary-light;
+    }
+    100% {
+        background-color: transparent;
+    }
+}
+.subName {
+    margin-left: 5%;
+    font-size: 0.75rem;
+    text-transform: uppercase;
+    color: var(--vn-label-color);
+}
+</style>
 <i18n>
 es:
     Add fixed price: Añadir precio fijado
     Edit fixed price(s): Editar precio(s) fijado(s)
-    This row will be removed: Esta linea se eliminará
-    Are you sure you want to continue?: ¿Seguro que quieres continuar?
-    Delete: Eliminar
 </i18n>
diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index 6c847ece8..84eefaed3 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -9,18 +9,29 @@ import ItemsFilterPanel from 'src/components/ItemsFilterPanel.vue';
 
 const { t } = useI18n();
 
-defineProps({
+const props = defineProps({
     dataKey: {
         type: String,
         required: true,
     },
-    warehousesOptions: {
-        type: Array,
-        default: () => [],
-    },
 });
 
 const itemTypeWorkersOptions = ref([]);
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'name':
+            return { 'i.name': { like: `%${value}%` } };
+        case 'itemFk':
+        case 'warehouseFk':
+        case 'rate2':
+        case 'rate3':
+            param = `fp.${param}`;
+            return { [param]: value };
+        case 'minPrice':
+            param = `i.${param}`;
+            return { [param]: value };
+    }
+};
 </script>
 
 <template>
@@ -31,7 +42,7 @@ const itemTypeWorkersOptions = ref([]);
         :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC', limit: 30 }"
         @on-fetch="(data) => (itemTypeWorkersOptions = data)"
     />
-    <ItemsFilterPanel :data-key="dataKey" :custom-tags="['tags']">
+    <ItemsFilterPanel :data-key="props.dataKey" :custom-tags="['tags']">
         <template #body="{ params, searchFn }">
             <QItem class="q-my-md">
                 <QItemSection>
@@ -52,9 +63,11 @@ const itemTypeWorkersOptions = ref([]);
             <QItem class="q-my-md">
                 <QItemSection>
                     <VnSelect
+                        url="Warehouses"
+                        auto-load
+                        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
                         :label="t('components.itemsFilterPanel.warehouseFk')"
                         v-model="params.warehouseFk"
-                        :options="warehousesOptions"
                         option-label="name"
                         option-value="id"
                         dense
@@ -93,8 +106,15 @@ const itemTypeWorkersOptions = ref([]);
                         toggle-indeterminate
                         @update:model-value="searchFn()"
                     />
-                </QItemSection>
-                <QItemSection>
+
+                    <QCheckbox
+                        v-model="params.showBadDates"
+                        :label="t(`components.itemsFilterPanel.showBadDates`)"
+                        toggle-indeterminate
+                        @update:model-value="searchFn()"
+                    >
+                    </QCheckbox>
+
                     <QCheckbox
                         :label="t('components.itemsFilterPanel.hasMinPrice')"
                         v-model="params.hasMinPrice"
diff --git a/src/pages/Order/Card/OrderDescriptorMenu.vue b/src/pages/Order/Card/OrderDescriptorMenu.vue
index 2e36aa3c5..2695da4e5 100644
--- a/src/pages/Order/Card/OrderDescriptorMenu.vue
+++ b/src/pages/Order/Card/OrderDescriptorMenu.vue
@@ -23,7 +23,7 @@ function confirmRemove() {
         .dialog({
             component: VnConfirm,
             componentProps: {
-                title: t('confirmDeletion'),
+                title: t('globals.confirmDeletion'),
                 message: t('confirmDeletionMessage'),
                 promise: remove,
             },
@@ -52,12 +52,10 @@ async function remove() {
 <i18n>
 en:
     deleteOrder: Delete order
-    confirmDeletion: Confirm deletion
     confirmDeletionMessage: Are you sure you want to delete this order?
 
 es:
     deleteOrder: Eliminar pedido
-    confirmDeletion: Confirmar eliminación
     confirmDeletionMessage: Seguro que quieres eliminar este pedido?
 
 </i18n>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 1b0bdd68c..5df9222bf 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -384,7 +384,11 @@ async function changeState(value) {
                             <QTd>
                                 <QBtn class="link" flat>
                                     {{ props.row.itemFk }}
-                                    <ItemDescriptorProxy :id="props.row.itemFk" />
+                                    <ItemDescriptorProxy
+                                        :id="props.row.itemFk"
+                                        :sale-fk="props.row.id"
+                                        :warehouse-fk="ticket.warehouseFk"
+                                    />
                                 </QBtn>
                             </QTd>
                             <QTd>{{ props.row.visible }}</QTd>
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 0abcdcafd..5f9fa0f8e 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -15,5 +15,6 @@ import WorkerFilter from '../WorkerFilter.vue';
             label: 'Search worker',
             info: 'You can search by worker id or name',
         }"
+        :redirect-on-error="true"
     />
 </template>
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 154db1258..8d7f4f683 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -1,12 +1,11 @@
 <script setup>
-import { computed, ref, watch } from 'vue';
+import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import WorkerChangePasswordForm from 'src/pages/Worker/Card/WorkerChangePasswordForm.vue';
-import useCardDescription from 'src/composables/useCardDescription';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import VnImg from 'src/components/ui/VnImg.vue';
@@ -38,49 +37,6 @@ const entityId = computed(() => {
 
 const worker = ref();
 const workerExcluded = ref(false);
-const filter = {
-    include: [
-        {
-            relation: 'user',
-            scope: {
-                fields: ['email', 'name', 'nickname'],
-            },
-        },
-        {
-            relation: 'department',
-            scope: {
-                include: [
-                    {
-                        relation: 'department',
-                    },
-                ],
-            },
-        },
-        {
-            relation: 'sip',
-        },
-    ],
-};
-
-const sip = ref(null);
-watch(
-    () => [worker.value?.sip?.extension, state.get('extension')],
-    ([newWorkerSip, newStateExtension], [oldWorkerSip, oldStateExtension]) => {
-        if (newStateExtension !== oldStateExtension || sip.value === oldStateExtension) {
-            sip.value = newStateExtension;
-        } else if (newWorkerSip !== oldWorkerSip && sip.value !== newStateExtension) {
-            sip.value = newWorkerSip;
-        }
-    }
-);
-
-const data = ref(useCardDescription());
-const setData = (entity) => {
-    if (!entity) return;
-    data.value = useCardDescription(entity.user?.nickname, entity.id);
-};
-
-const openChangePasswordForm = () => changePasswordFormDialog.value.show();
 
 const getIsExcluded = async () => {
     try {
@@ -115,14 +71,12 @@ const refetch = async () => await cardDescriptorRef.value.getData();
         ref="cardDescriptorRef"
         module="Worker"
         data-key="workerData"
-        :url="`Workers/${entityId}`"
-        :filter="filter"
-        :title="data.title"
-        :subtitle="data.subtitle"
+        url="Workers/descriptor"
+        :filter="{ where: { id: entityId } }"
+        title="user.nickname"
         @on-fetch="
             (data) => {
                 worker = data;
-                setData(data);
                 getIsExcluded();
             }
         "
@@ -141,7 +95,7 @@ const refetch = async () => await cardDescriptorRef.value.getData();
                 v-if="!worker.user.emailVerified && user.id != worker.id"
                 v-ripple
                 clickable
-                @click="openChangePasswordForm()"
+                @click="$refs.changePasswordFormDialog.show()"
             >
                 <QItemSection>
                     {{ t('Change password') }}
@@ -209,10 +163,10 @@ const refetch = async () => await cardDescriptorRef.value.getData();
                     <VnLinkPhone :phone-number="entity.phone" />
                 </template>
             </VnLv>
-            <VnLv :value="sip">
+            <VnLv :value="worker?.sip?.extension">
                 <template #label>
                     {{ t('worker.summary.sipExtension') }}
-                    <VnLinkPhone v-if="sip" :phone-number="sip" />
+                    <VnLinkPhone :phone-number="worker?.sip?.extension" />
                 </template>
             </VnLv>
         </template>
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index ab201f964..0e7bfd863 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -34,13 +34,22 @@ const filter = {
         {
             relation: 'user',
             scope: {
-                fields: ['email', 'name', 'nickname', 'roleFk'],
-                include: {
-                    relation: 'role',
-                    scope: {
-                        fields: ['name'],
+                fields: ['name', 'nickname', 'roleFk'],
+
+                include: [
+                    {
+                        relation: 'role',
+                        scope: {
+                            fields: ['name'],
+                        },
                     },
-                },
+                    {
+                        relation: 'emailUser',
+                        scope: {
+                            fields: ['email'],
+                        },
+                    },
+                ],
             },
         },
         {
@@ -153,14 +162,18 @@ const filter = {
             </QCard>
             <QCard class="vn-one">
                 <VnTitle :text="t('worker.summary.userData')" />
-                <VnLv :label="t('worker.summary.userId')" :value="worker.user.id" />
-                <VnLv :label="t('worker.card.name')" :value="worker.user.nickname" />
-                <VnLv :label="t('worker.list.email')" :value="worker.user.email" copy />
+                <VnLv :label="t('worker.summary.userId')" :value="worker?.user?.id" />
+                <VnLv :label="t('worker.card.name')" :value="worker?.user?.nickname" />
+                <VnLv
+                    :label="t('worker.list.email')"
+                    :value="worker.user?.emailUser?.email"
+                    copy
+                />
                 <VnLv :label="t('worker.summary.role')">
                     <template #value>
                         <span class="link">
-                            {{ worker.user.role.name }}
-                            <RoleDescriptorProxy :id="worker.user.role.id" />
+                            {{ worker?.user?.role?.name }}
+                            <RoleDescriptorProxy :id="worker?.user?.role?.id" />
                         </span>
                     </template>
                 </VnLv>
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index f560fcfed..f68614575 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -629,6 +629,9 @@ onMounted(async () => {
         margin-bottom: 0px;
     }
 }
+:deep(.q-td) {
+    min-width: 170px;
+}
 </style>
 
 <i18n>
diff --git a/src/router/modules/Supplier.js b/src/router/modules/Supplier.js
index b711066b2..143d7c824 100644
--- a/src/router/modules/Supplier.js
+++ b/src/router/modules/Supplier.js
@@ -7,6 +7,7 @@ export default {
         title: 'suppliers',
         icon: 'vn:supplier',
         moduleName: 'Supplier',
+        keyBinding: 'p',
     },
     component: RouterView,
     redirect: { name: 'SupplierMain' },
diff --git a/src/router/modules/account.js b/src/router/modules/account.js
index cfec2b95d..34f804b18 100644
--- a/src/router/modules/account.js
+++ b/src/router/modules/account.js
@@ -7,6 +7,7 @@ export default {
         title: 'users',
         icon: 'face',
         moduleName: 'Account',
+        keyBinding: 'u',
     },
     component: RouterView,
     redirect: { name: 'AccountMain' },
diff --git a/src/router/modules/claim.js b/src/router/modules/claim.js
index cced9e24d..d597267b2 100644
--- a/src/router/modules/claim.js
+++ b/src/router/modules/claim.js
@@ -7,6 +7,7 @@ export default {
         title: 'claims',
         icon: 'vn:claims',
         moduleName: 'Claim',
+        keyBinding: 'r',
     },
     component: RouterView,
     redirect: { name: 'ClaimMain' },
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 684b83b0f..5b73ddc84 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -7,6 +7,7 @@ export default {
         title: 'customers',
         icon: 'vn:client',
         moduleName: 'Customer',
+        keyBinding: 'c',
     },
     component: RouterView,
     redirect: { name: 'CustomerMain' },
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 0d38ed626..365615b87 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -7,6 +7,7 @@ export default {
         title: 'entries',
         icon: 'vn:entry',
         moduleName: 'Entry',
+        keyBinding: 'e',
     },
     component: RouterView,
     redirect: { name: 'EntryMain' },
diff --git a/src/router/modules/invoiceIn.js b/src/router/modules/invoiceIn.js
index 906db8a58..64c7b23e9 100644
--- a/src/router/modules/invoiceIn.js
+++ b/src/router/modules/invoiceIn.js
@@ -1,5 +1,5 @@
 import { RouterView } from 'vue-router';
-
+import { setRectificative } from 'src/pages/InvoiceIn/composables/setRectificative';
 export default {
     path: '/invoice-in',
     name: 'InvoiceIn',
@@ -63,6 +63,10 @@ export default {
             path: ':id',
             component: () => import('src/pages/InvoiceIn/Card/InvoiceInCard.vue'),
             redirect: { name: 'InvoiceInSummary' },
+            beforeEnter: async (to, from, next) => {
+                await setRectificative(to);
+                next();
+            },
             children: [
                 {
                     name: 'InvoiceInSummary',
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 4bd5df4e2..48e19dd54 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -7,6 +7,7 @@ export default {
         title: 'items',
         icon: 'vn:item',
         moduleName: 'Item',
+        keyBinding: 'a',
     },
     component: RouterView,
     redirect: { name: 'ItemMain' },
diff --git a/src/router/modules/monitor.js b/src/router/modules/monitor.js
index 3353da3cf..7342a5904 100644
--- a/src/router/modules/monitor.js
+++ b/src/router/modules/monitor.js
@@ -7,6 +7,7 @@ export default {
         title: 'monitors',
         icon: 'grid_view',
         moduleName: 'Monitor',
+        keyBinding: 'm',
     },
     component: RouterView,
     redirect: { name: 'MonitorMain' },
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
index 9ccdb820b..bfa37fce5 100644
--- a/src/router/modules/order.js
+++ b/src/router/modules/order.js
@@ -7,6 +7,7 @@ export default {
         title: 'order',
         icon: 'vn:basket',
         moduleName: 'Order',
+        keyBinding: 'o',
     },
     component: RouterView,
     redirect: { name: 'OrderMain' },
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 955fc9098..3c5c860cf 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -7,7 +7,6 @@ export default {
         title: 'routes',
         icon: 'vn:delivery',
         moduleName: 'Route',
-        keyBinding: 'r',
     },
     component: RouterView,
     redirect: { name: 'RouteMain' },
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 4074f089f..0f6fc9b22 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -7,6 +7,7 @@ export default {
         title: 'tickets',
         icon: 'vn:ticket',
         moduleName: 'Ticket',
+        keyBinding: 't',
     },
     component: RouterView,
     redirect: { name: 'TicketMain' },
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 2a523e7fe..b2716474b 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -7,6 +7,7 @@ export default {
         title: 'workers',
         icon: 'vn:worker',
         moduleName: 'Worker',
+        keyBinding: 'w',
     },
     component: RouterView,
     redirect: { name: 'WorkerMain' },
diff --git a/src/router/modules/zone.js b/src/router/modules/zone.js
index 40358c58e..1f27cc76f 100644
--- a/src/router/modules/zone.js
+++ b/src/router/modules/zone.js
@@ -7,6 +7,7 @@ export default {
         title: 'zones',
         icon: 'vn:zone',
         moduleName: 'Zone',
+        keyBinding: 'z',
     },
     component: RouterView,
     redirect: { name: 'ZoneMain' },
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 961e80377..f9ff067d0 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -56,6 +56,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
     function addMenuItem(module, route, parent) {
         const { meta } = route;
         let { menuChildren = null } = meta;
+        if (meta.hidden) return;
         if (menuChildren)
             menuChildren = menuChildren.map(({ name, title, icon }) => ({
                 name,
@@ -72,6 +73,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
         if (meta) {
             item.title = `globals.pageTitles.${meta.title}`;
             item.icon = meta.icon;
+            item.keyBinding = meta.keyBinding;
         }
 
         parent.push(item);
diff --git a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
index 77a11969b..e1939fe5a 100644
--- a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
@@ -36,8 +36,7 @@ describe('InvoiceInBasicData', () => {
     });
 
     it('should throw an error creating a new dms if a file is not attached', () => {
-        cy.get(formInputs).eq(5).click();
-        cy.get(formInputs).eq(5).type('{selectall}{backspace}');
+        cy.get(formInputs).eq(7).type('{selectall}{backspace}');
         cy.get(documentBtns).eq(0).click();
         cy.get(dialogActionBtns).eq(1).click();
         cy.get('.q-notification__message').should(
diff --git a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
index 018ae7a53..b84d743d1 100644
--- a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
@@ -3,13 +3,14 @@ describe('InvoiceInVat', () => {
     const thirdRow = 'tbody > :nth-child(3)';
     const firstLineVat = 'tbody > :nth-child(1) > :nth-child(4)';
     const dialogInputs = '.q-dialog label input';
-    const dialogBtns = '.q-dialog button';
-    const acrossInput = 'tbody tr:nth-child(1) td:nth-child(2) .default-icon';
+    const addBtn = 'tbody tr:nth-child(1) td:nth-child(2) .--add-icon';
     const randomInt = Math.floor(Math.random() * 100);
 
     beforeEach(() => {
         cy.login('developer');
         cy.visit(`/#/invoice-in/1/vat`);
+        cy.intercept('GET', '/api/InvoiceIns/1/getTotals').as('lastCall');
+        cy.wait('@lastCall');
     });
 
     it('should edit the sage iva', () => {
@@ -26,22 +27,15 @@ describe('InvoiceInVat', () => {
     });
 
     it('should remove the first line', () => {
-        cy.removeRow(2);
-    });
-
-    it('should throw an error if there are fields undefined', () => {
-        cy.get(acrossInput).click();
-        cy.get(dialogBtns).eq(2).click();
-        cy.get('.q-notification__message').should('have.text', "The code can't be empty");
+        cy.removeRow(1);
     });
 
     it('should correctly handle expense addition', () => {
-        cy.get(acrossInput).click();
+        cy.get(addBtn).click();
         cy.get(dialogInputs).eq(0).type(randomInt);
-        cy.get(dialogInputs).eq(1).click();
         cy.get(dialogInputs).eq(1).type('This is a dummy expense');
 
-        cy.get(dialogBtns).eq(2).click();
-        cy.get('.q-notification__message').should('have.text', 'Data saved');
+        cy.get('button[type="submit"]').click();
+        cy.get('.q-notification__message').should('have.text', 'Data created');
     });
 });
diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index 882aab157..9bd7c6053 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -9,6 +9,7 @@ describe('Ticket descriptor', () => {
 
         cy.login('developer');
         cy.visit(`/#/ticket/${ticketId}/summary`);
+        cy.waitForElement('.q-page', 7000);
     });
 
     it('should clone the ticket without warehouse', () => {
diff --git a/test/cypress/integration/vnComponent/VnShortcut.spec.js b/test/cypress/integration/vnComponent/VnShortcut.spec.js
new file mode 100644
index 000000000..b49b4e964
--- /dev/null
+++ b/test/cypress/integration/vnComponent/VnShortcut.spec.js
@@ -0,0 +1,33 @@
+/// <reference types="cypress" />
+
+describe('VnShortcuts', () => {
+    const modules = {
+        item: 'a',
+        customer: 'c',
+        ticket: 't',
+        claim: 'r',
+        worker: 'w',
+        monitor: 'm',
+        order: 'o',
+        supplier: 'p',
+        entry: 'e',
+        zone: 'z',
+        account: 'u',
+    };
+    beforeEach(() => {
+        cy.login('developer');
+        cy.visit('/');
+    });
+
+    for (const [module, shortcut] of Object.entries(modules)) {
+        it(`should visit ${module} module`, () => {
+            cy.get('body').trigger('keydown', {
+                ctrlKey: true,
+                altKey: true,
+                code: `Key${shortcut.toUpperCase()}`,
+            });
+
+            cy.url().should('include', module);
+        });
+    }
+});
diff --git a/test/cypress/integration/wagonType/wagonTypeCreate.spec.js b/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
index bcf7fe841..5e8b6b888 100644
--- a/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
+++ b/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
@@ -3,6 +3,7 @@ describe('WagonTypeCreate', () => {
         cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit('/#/wagon/type/create');
+        cy.waitForElement('.q-page', 6000);
     });
 
     function chooseColor(color) {
diff --git a/test/cypress/integration/worker/workerLocker.spec.js b/test/cypress/integration/worker/workerLocker.spec.js
index 9a4066f54..8a169dfb2 100644
--- a/test/cypress/integration/worker/workerLocker.spec.js
+++ b/test/cypress/integration/worker/workerLocker.spec.js
@@ -1,12 +1,12 @@
 describe('WorkerLocker', () => {
-    const workerId = 1109;
+    const productionId = 49;
     const lockerCode = '2F';
     const input = '.q-card input';
     const thirdOpt = '[role="listbox"] .q-item:nth-child(1)';
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('productionBoss');
-        cy.visit(`/#/worker/${workerId}/locker`);
+        cy.visit(`/#/worker/${productionId}/locker`);
     });
 
     it('should allocates a locker', () => {