diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5026b7d3b..8f601aa77 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -14,5 +14,5 @@
     "[vue]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
-    "cSpell.words": ["axios"]
+    "cSpell.words": ["axios", "composables"]
 }
diff --git a/src/boot/axios.js b/src/boot/axios.js
index 4fd83ddea..fa8a08003 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -55,10 +55,10 @@ const onResponseError = (error) => {
     }
 
     if (session.isLoggedIn() && response?.status === 401) {
-        session.destroy();
+        session.destroy(false);
         const hash = window.location.hash;
         const url = hash.slice(1);
-        Router.push({ path: url });
+        Router.push(`/login?redirect=${url}`);
     } else if (!session.isLoggedIn()) {
         return Promise.reject(error);
     }
diff --git a/src/components/CreateManualInvoiceForm.vue b/src/components/CreateManualInvoiceForm.vue
index 92399c20c..1aa95011f 100644
--- a/src/components/CreateManualInvoiceForm.vue
+++ b/src/components/CreateManualInvoiceForm.vue
@@ -46,22 +46,6 @@ const onDataSaved = async (formData, requestResponse) => {
         @on-fetch="(data) => (taxAreasOptions = data)"
         auto-load
     />
-    <FetchData
-        url="Tickets"
-        :filter="{
-            fields: ['id', 'nickname'],
-            where: { refFk: null },
-            order: 'shipped DESC',
-        }"
-        @on-fetch="(data) => (ticketsOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Clients"
-        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-        @on-fetch="(data) => (clientsOptions = data)"
-        auto-load
-    />
     <FormModelPopup
         ref="formModelPopupRef"
         :title="t('Create manual invoice')"
@@ -84,6 +68,10 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-value="id"
                     v-model="data.ticketFk"
                     @update:model-value="data.clientFk = null"
+                    url="Tickets"
+                    :where="{ refFk: null }"
+                    :fields="['id', 'nickname']"
+                    :filter-options="{ order: 'shipped DESC' }"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
@@ -105,6 +93,9 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-value="id"
                     v-model="data.clientFk"
                     @update:model-value="data.ticketFk = null"
+                    url="Clients"
+                    :fields="['id', 'name']"
+                    :filter-options="{ order: 'name ASC' }"
                 />
                 <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
             </VnRow>
@@ -116,7 +107,6 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-label="description"
                     option-value="code"
                     v-model="data.serial"
-                    :required="true"
                 />
                 <VnSelect
                     :label="t('Area')"
@@ -125,7 +115,6 @@ const onDataSaved = async (formData, requestResponse) => {
                     option-label="code"
                     option-value="code"
                     v-model="data.taxArea"
-                    :required="true"
                 />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index fa7761c5f..74c4a9bc0 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -10,7 +10,6 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import SkeletonTable from 'components/ui/SkeletonTable.vue';
 import { tMobile } from 'src/composables/tMobile';
-import VnSubToolbar from './ui/VnSubToolbar.vue';
 
 const { push } = useRouter();
 const quasar = useQuasar();
@@ -99,19 +98,17 @@ defineExpose({
 });
 
 async function fetch(data) {
-    if (data && Array.isArray(data)) {
-        let $index = 0;
-        data.map((d) => (d.$index = $index++));
-    }
-
     resetData(data);
-
     emit('onFetch', data);
     return data;
 }
 
 function resetData(data) {
     if (!data) return;
+    if (data && Array.isArray(data)) {
+        let $index = 0;
+        data.map((d) => (d.$index = $index++));
+    }
     originalData.value = JSON.parse(JSON.stringify(data));
     formData.value = JSON.parse(JSON.stringify(data));
 
@@ -300,7 +297,7 @@ watch(formUrl, async () => {
         :url="url"
         :limit="limit"
         @on-fetch="fetch"
-        @on-change="resetData"
+        @on-change="fetch"
         :skeleton="false"
         ref="vnPaginateRef"
         v-bind="$attrs"
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index becc1c174..758ddd433 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -90,7 +90,7 @@ const $props = defineProps({
 });
 const emit = defineEmits(['onFetch', 'onDataSaved']);
 const modelValue = computed(
-    () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
+    () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`
 ).value;
 const componentIsRendered = ref(false);
 const arrayData = useArrayData(modelValue);
@@ -137,7 +137,7 @@ onMounted(async () => {
                     JSON.stringify(newVal) !== JSON.stringify(originalData.value);
                 isResetting.value = false;
             },
-            { deep: true },
+            { deep: true }
         );
     }
 });
@@ -145,7 +145,7 @@ onMounted(async () => {
 if (!$props.url)
     watch(
         () => arrayData.store.data,
-        (val) => updateAndEmit('onFetch', val),
+        (val) => updateAndEmit('onFetch', val)
     );
 
 watch(formUrl, async () => {
@@ -239,7 +239,7 @@ function filter(value, update, filterOptions) {
         (ref) => {
             ref.setOptionIndex(-1);
             ref.moveOptionSelection(1, true);
-        },
+        }
     );
 }
 
@@ -261,13 +261,7 @@ defineExpose({
 </script>
 <template>
     <div class="column items-center full-width">
-        <QForm
-            
-            @submit="save"
-            @reset="reset"
-            class="q-pa-md"
-            id="formModel"
-        >
+        <QForm @submit="save" @reset="reset" class="q-pa-md" id="formModel">
             <QCard>
                 <slot
                     v-if="formData"
@@ -276,70 +270,72 @@ defineExpose({
                     :validate="validate"
                     :filter="filter"
                 />
-                <SkeletonForm v-else/>
+                <SkeletonForm v-else />
             </QCard>
         </QForm>
     </div>
     <Teleport
         to="#st-actions"
-        v-if="stateStore?.isSubToolbarShown() && componentIsRendered"
+        v-if="
+            $props.defaultActions &&
+            stateStore?.isSubToolbarShown() &&
+            componentIsRendered
+        "
     >
-        <div v-if="$props.defaultActions">
-            <QBtnGroup push class="q-gutter-x-sm">
-                <slot name="moreActions" />
-                <QBtn
-                    :label="tMobile(defaultButtons.reset.label)"
-                    :color="defaultButtons.reset.color"
-                    :icon="defaultButtons.reset.icon"
-                    flat
-                    @click="reset"
-                    :disable="!hasChanges"
-                    :title="t(defaultButtons.reset.label)"
-                />
-                <QBtnDropdown
-                    v-if="$props.goTo"
-                    @click="saveAndGo"
-                    :label="tMobile('globals.saveAndContinue')"
-                    :title="t('globals.saveAndContinue')"
-                    :disable="!hasChanges"
-                    color="primary"
-                    icon="save"
-                    split
-                >
-                    <QList>
-                        <QItem
-                            clickable
-                            v-close-popup
-                            @click="save"
-                            :title="t('globals.save')"
-                        >
-                            <QItemSection>
-                                <QItemLabel>
-                                    <QIcon
-                                        name="save"
-                                        color="white"
-                                        class="q-mr-sm"
-                                        size="sm"
-                                    />
-                                    {{ t('globals.save').toUpperCase() }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QList>
-                </QBtnDropdown>
-                <QBtn
-                    v-else
-                    :label="tMobile('globals.save')"
-                    color="primary"
-                    icon="save"
-                    @click="save"
-                    :disable="!hasChanges"
-                    :title="t(defaultButtons.save.label)"
-                />
-            </QBtnGroup>
-        </div>
+        <QBtnGroup push class="q-gutter-x-sm">
+            <slot name="moreActions" />
+            <QBtn
+                :label="tMobile(defaultButtons.reset.label)"
+                :color="defaultButtons.reset.color"
+                :icon="defaultButtons.reset.icon"
+                flat
+                @click="reset"
+                :disable="!hasChanges"
+                :title="t(defaultButtons.reset.label)"
+            />
+            <QBtnDropdown
+                v-if="$props.goTo"
+                @click="saveAndGo"
+                :label="tMobile('globals.saveAndContinue')"
+                :title="t('globals.saveAndContinue')"
+                :disable="!hasChanges"
+                color="primary"
+                icon="save"
+                split
+            >
+                <QList>
+                    <QItem
+                        clickable
+                        v-close-popup
+                        @click="save"
+                        :title="t('globals.save')"
+                    >
+                        <QItemSection>
+                            <QItemLabel>
+                                <QIcon
+                                    name="save"
+                                    color="white"
+                                    class="q-mr-sm"
+                                    size="sm"
+                                />
+                                {{ t('globals.save').toUpperCase() }}
+                            </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </QList>
+            </QBtnDropdown>
+            <QBtn
+                v-else
+                :label="tMobile('globals.save')"
+                color="primary"
+                icon="save"
+                @click="save"
+                :disable="!hasChanges"
+                :title="t(defaultButtons.save.label)"
+            />
+        </QBtnGroup>
     </Teleport>
-    
+
     <QInnerLoading
         :showing="isLoading"
         :label="t('globals.pleaseWait')"
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index 0f2b6cbf0..118c8f5f4 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -23,18 +23,15 @@ const formModelRef = ref(null);
 const closeButton = ref(null);
 
 const onDataSaved = (formData, requestResponse) => {
-    closeForm();
+    if (closeButton.value) closeButton.value.click();
     emit('onDataSaved', formData, requestResponse);
 };
 
 const isLoading = computed(() => formModelRef.value?.isLoading);
 
-const closeForm = async () => {
-    if (closeButton.value) closeButton.value.click();
-};
-
 defineExpose({
     isLoading,
+    onDataSaved,
 });
 </script>
 
diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue
index 0a8c1272e..f307aa1f4 100644
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@@ -8,7 +8,7 @@ import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import FormPopup from './FormPopup.vue';
-
+import { useDialogPluginComponent } from 'quasar';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
 
@@ -18,7 +18,7 @@ const $props = defineProps({
         default: () => {},
     },
 });
-
+const { dialogRef } = useDialogPluginComponent();
 const quasar = useQuasar();
 const { t } = useI18n();
 const router = useRouter();
@@ -116,90 +116,92 @@ const makeInvoice = async () => {
         @on-fetch="(data) => (invoiceCorrectionTypesOptions = data)"
         auto-load
     />
-    <FormPopup
+    <QDialog ref="dialogRef">
+        <FormPopup
         @on-submit="makeInvoice()"
         :title="t('Transfer invoice')"
         :custom-submit-button-label="t('Transfer client')"
         :default-cancel-button="false"
-    >
+        >
         <template #form-inputs>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <VnSelect
-                    :label="t('Client')"
-                    :options="clientsOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="transferInvoiceParams.newClientFk"
-                    :required="true"
-                    url="Clients"
-                    :fields="['id', 'name', 'hasToInvoiceByAddress']"
-                    auto-load
-                >
-                    <template #option="scope">
-                        <QItem
-                            v-bind="scope.itemProps"
-                            @click="selectedClient(scope.opt)"
-                        >
-                            <QItemSection>
-                                <QItemLabel>
-                                    #{{ scope.opt?.id }} - {{ scope.opt?.name }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-                <VnSelect
-                    :label="t('Rectificative type')"
-                    :options="rectificativeTypeOptions"
-                    hide-selected
-                    option-label="description"
-                    option-value="id"
-                    v-model="transferInvoiceParams.cplusRectificationTypeFk"
-                    :required="true"
-                />
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <VnSelect
-                    :label="t('Class')"
-                    :options="siiTypeInvoiceOutsOptions"
-                    hide-selected
-                    option-label="description"
-                    option-value="id"
-                    v-model="transferInvoiceParams.siiTypeInvoiceOutFk"
-                    :required="true"
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel>
-                                    {{ scope.opt?.code }} -
-                                    {{ scope.opt?.description }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-                <VnSelect
-                    :label="t('Type')"
-                    :options="invoiceCorrectionTypesOptions"
-                    hide-selected
-                    option-label="description"
-                    option-value="id"
-                    v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
-                    :required="true"
-                />
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div>
-                    <QCheckbox :label="t('Bill destination client')" v-model="checked" />
-                    <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
-                        <QTooltip>{{ t('transferInvoiceInfo') }}</QTooltip>
-                    </QIcon>
-                </div>
-            </VnRow>
-        </template>
-    </FormPopup>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelect
+                        :label="t('Client')"
+                        :options="clientsOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="transferInvoiceParams.newClientFk"
+                        :required="true"
+                        url="Clients"
+                        :fields="['id', 'name', 'hasToInvoiceByAddress']"
+                        auto-load
+                    >
+                        <template #option="scope">
+                            <QItem
+                                v-bind="scope.itemProps"
+                                @click="selectedClient(scope.opt)"
+                            >
+                                <QItemSection>
+                                    <QItemLabel>
+                                        #{{ scope.opt?.id }} - {{ scope.opt?.name }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        :label="t('Rectificative type')"
+                        :options="rectificativeTypeOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="id"
+                        v-model="transferInvoiceParams.cplusRectificationTypeFk"
+                        :required="true"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelect
+                        :label="t('Class')"
+                        :options="siiTypeInvoiceOutsOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="id"
+                        v-model="transferInvoiceParams.siiTypeInvoiceOutFk"
+                        :required="true"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>
+                                        {{ scope.opt?.code }} -
+                                        {{ scope.opt?.description }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                    <VnSelect
+                        :label="t('Type')"
+                        :options="invoiceCorrectionTypesOptions"
+                        hide-selected
+                        option-label="description"
+                        option-value="id"
+                        v-model="transferInvoiceParams.invoiceCorrectionTypeFk"
+                        :required="true"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div>
+                        <QCheckbox :label="t('Bill destination client')" v-model="checked" />
+                        <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
+                            <QTooltip>{{ t('transferInvoiceInfo') }}</QTooltip>
+                        </QIcon>
+                    </div>
+                </VnRow>
+            </template>
+        </FormPopup>
+    </QDialog>
 </template>
 
 <i18n>
diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index aeccdb2d6..da4687d32 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -5,8 +5,10 @@ import { dashIfEmpty } from 'src/filters';
 
 /* basic input */
 import VnSelect from 'components/common/VnSelect.vue';
+import VnSelectCache from 'components/common/VnSelectCache.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInputTime from 'components/common/VnInputTime.vue';
 import VnComponent from 'components/common/VnComponent.vue';
 
 const model = defineModel(undefined, { required: true });
@@ -41,6 +43,17 @@ const $props = defineProps({
     },
 });
 
+const defaultSelect = {
+    attrs: {
+        row: $props.row,
+        disable: !$props.isEditable,
+        class: 'fit',
+    },
+    forceAttrs: {
+        label: $props.showLabel && $props.column.label,
+    },
+};
+
 const defaultComponents = {
     input: {
         component: markRaw(VnInput),
@@ -74,6 +87,15 @@ const defaultComponents = {
             label: $props.showLabel && $props.column.label,
         },
     },
+    time: {
+        component: markRaw(VnInputTime),
+        attrs: {
+            disable: !$props.isEditable,
+        },
+        forceAttrs: {
+            label: $props.showLabel && $props.column.label,
+        },
+    },
     checkbox: {
         component: markRaw(QCheckbox),
         attrs: (prop) => {
@@ -94,14 +116,12 @@ const defaultComponents = {
         },
     },
     select: {
+        component: markRaw(VnSelectCache),
+        ...defaultSelect,
+    },
+    rawSelect: {
         component: markRaw(VnSelect),
-        attrs: {
-            disable: !$props.isEditable,
-            class: 'fit',
-        },
-        forceAttrs: {
-            label: $props.showLabel && $props.column.label,
-        },
+        ...defaultSelect,
     },
     icon: {
         component: markRaw(QIcon),
diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index b3386899f..15e1cc947 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -40,7 +40,7 @@ const enterEvent = {
 
 const defaultAttrs = {
     filled: !$props.showTitle,
-    class: 'q-px-sm q-pb-xs q-pt-none fit',
+    class: 'q-px-xs q-pb-xs q-pt-none fit',
     dense: true,
 };
 
@@ -101,7 +101,7 @@ const components = {
         component: markRaw(VnSelect),
         event: updateEvent,
         attrs: {
-            class: 'q-px-md q-pb-xs q-pt-none fit',
+            class: 'q-px-sm q-pb-xs q-pt-none fit',
             dense: true,
             filled: !$props.showTitle,
         },
@@ -139,14 +139,11 @@ const showFilter = computed(
 </script>
 <template>
     <div
-        v-if="showTitle"
-        class="q-pt-sm q-px-sm ellipsis"
-        :class="`text-${column?.align ?? 'left'}`"
-        :style="!showFilter ? { 'min-height': 72 + 'px' } : ''"
+        v-if="showFilter"
+        class="full-width"
+        :class="alignRow()"
+        style="max-height: 45px; overflow: hidden"
     >
-        {{ column?.label }}
-    </div>
-    <div v-if="showFilter" class="full-width" :class="alignRow()">
         <VnTableColumn
             :column="$props.column"
             default="input"
diff --git a/src/components/VnTable/VnOrder.vue b/src/components/VnTable/VnOrder.vue
new file mode 100644
index 000000000..1e1dc9e01
--- /dev/null
+++ b/src/components/VnTable/VnOrder.vue
@@ -0,0 +1,95 @@
+<script setup>
+import { ref } from 'vue';
+import { useArrayData } from 'composables/useArrayData';
+const model = defineModel({ type: Object, required: true });
+const $props = defineProps({
+    name: {
+        type: String,
+        default: '',
+    },
+    label: {
+        type: String,
+        default: undefined,
+    },
+    dataKey: {
+        type: String,
+        required: true,
+    },
+    searchUrl: {
+        type: String,
+        default: 'params',
+    },
+    vertical: {
+        type: Boolean,
+        default: false,
+    },
+});
+const hover = ref();
+const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
+
+async function orderBy(name, direction) {
+    if (!name) return;
+    switch (direction) {
+        case 'DESC':
+            direction = undefined;
+            break;
+        case undefined:
+            direction = 'ASC';
+            break;
+        case 'ASC':
+            direction = 'DESC';
+            break;
+    }
+    if (!direction) return await arrayData.deleteOrder(name);
+    await arrayData.addOrder(name, direction);
+}
+
+defineExpose({ orderBy });
+</script>
+<template>
+    <div
+        @mouseenter="hover = true"
+        @mouseleave="hover = false"
+        @click="orderBy(name, model?.direction)"
+        class="row items-center no-wrap cursor-pointer"
+    >
+        <span :title="label">{{ label }}</span>
+        <QChip
+            v-if="name"
+            :label="!vertical && model?.index"
+            :icon="
+                (model?.index || hover) && !vertical
+                    ? model?.direction == 'DESC'
+                        ? 'arrow_downward'
+                        : 'arrow_upward'
+                    : undefined
+            "
+            :size="vertical ? '' : 'sm'"
+            :class="[
+                model?.index ? 'color-vn-text' : 'bg-transparent',
+                vertical ? 'q-px-none' : '',
+            ]"
+            class="no-box-shadow"
+            :clickable="true"
+            style="min-width: 40px"
+        >
+            <div
+                class="column flex-center"
+                v-if="vertical"
+                :style="!model?.index && 'color: #5d5d5d'"
+            >
+                {{ model?.index }}
+                <QIcon
+                    :name="
+                        model?.index
+                            ? model?.direction == 'DESC'
+                                ? 'arrow_downward'
+                                : 'arrow_upward'
+                            : 'swap_vert'
+                    "
+                    size="xs"
+                />
+            </div>
+        </QChip>
+    </div>
+</template>
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 1610735a4..dc5410e93 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -3,16 +3,18 @@ import { ref, onMounted, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
-
 import { useStateStore } from 'stores/useStateStore';
-import FormModelPopup from 'components/FormModelPopup.vue';
-import CrudModel from 'src/components/CrudModel.vue';
-import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
-import VnLv from 'components/ui/VnLv.vue';
 
+import CrudModel from 'src/components/CrudModel.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+
+import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
 import VnTableFilter from 'components/VnTable/VnFilter.vue';
 import VnTableChip from 'components/VnTable/VnChip.vue';
+import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue';
+import VnLv from 'components/ui/VnLv.vue';
+import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
 
 const $props = defineProps({
     columns: {
@@ -21,7 +23,7 @@ const $props = defineProps({
     },
     defaultMode: {
         type: String,
-        default: 'card', // 'table', 'card'
+        default: 'table', // 'table', 'card'
     },
     columnSearch: {
         type: Boolean,
@@ -32,7 +34,7 @@ const $props = defineProps({
         default: true,
     },
     rowClick: {
-        type: Function,
+        type: [Function, Boolean],
         default: null,
     },
     redirect: {
@@ -67,6 +69,22 @@ const $props = defineProps({
         type: Object,
         default: () => ({ card: false, table: false }),
     },
+    withoutHeader: {
+        type: Boolean,
+        default: false,
+    },
+    tableCode: {
+        type: String,
+        default: null,
+    },
+    table: {
+        type: Object,
+        default: () => ({}),
+    },
+    tableHeight: {
+        type: String,
+        default: '90vh',
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -80,9 +98,11 @@ const mode = ref(DEFAULT_MODE);
 const selected = ref([]);
 const routeQuery = JSON.parse(route?.query[$props.searchUrl] ?? '{}');
 const params = ref({ ...routeQuery, ...routeQuery.filter?.where });
+const orders = ref(parseOrder(routeQuery.filter?.order));
 const CrudModelRef = ref({});
 const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
+const columnsVisibilitySkiped = ref();
 const tableModes = [
     {
         icon: 'view_column',
@@ -102,6 +122,12 @@ onMounted(() => {
     mode.value = quasar.platform.is.mobile ? DEFAULT_MODE : $props.defaultMode;
     stateStore.rightDrawer = true;
     setUserParams(route.query[$props.searchUrl]);
+    columnsVisibilitySkiped.value = [
+        ...splittedColumns.value.columns
+            .filter((c) => c.visible == false)
+            .map((c) => c.name),
+        ...['tableActions'],
+    ];
 });
 
 watch(
@@ -115,14 +141,21 @@ watch(
     (val) => setUserParams(val)
 );
 
+const isTableMode = computed(() => mode.value == TABLE_MODE);
+
 function setUserParams(watchedParams) {
     if (!watchedParams) return;
 
     if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
-    const where = JSON.parse(watchedParams?.filter)?.where;
+    const filter = JSON.parse(watchedParams?.filter);
+    const where = filter?.where;
+    const order = filter?.order;
+
     watchedParams = { ...watchedParams, ...where };
     delete watchedParams.filter;
+    delete params.value?.filter;
     params.value = { ...params.value, ...watchedParams };
+    orders.value = parseOrder(order);
 }
 
 function splitColumns(columns) {
@@ -130,7 +163,7 @@ function splitColumns(columns) {
         columns: [],
         chips: [],
         create: [],
-        visible: [],
+        cardVisible: [],
     };
 
     for (const col of columns) {
@@ -138,7 +171,7 @@ function splitColumns(columns) {
         if (col.chip) splittedColumns.value.chips.push(col);
         if (col.isTitle) splittedColumns.value.title = col;
         if (col.create) splittedColumns.value.create.push(col);
-        if (col.cardVisible) splittedColumns.value.visible.push(col);
+        if (col.cardVisible) splittedColumns.value.cardVisible.push(col);
         if ($props.isEditable && col.disable == null) col.disable = false;
         if ($props.useModel) col.columnFilter = { ...col.columnFilter, inWhere: true };
         splittedColumns.value.columns.push(col);
@@ -154,12 +187,13 @@ function splitColumns(columns) {
                 label: t('status'),
                 name: 'tableStatus',
                 columnFilter: false,
+                orderBy: false,
             });
     }
 }
 
 const rowClickFunction = computed(() => {
-    if ($props.rowClick) return $props.rowClick;
+    if ($props.rowClick != undefined) return $props.rowClick;
     if ($props.redirect) return ({ id }) => redirectFn(id);
     return () => {};
 });
@@ -188,6 +222,17 @@ function getColAlign(col) {
     return 'text-' + (col.align ?? 'left');
 }
 
+function parseOrder(urlOrders) {
+    const orderObject = {};
+    if (!urlOrders) return orderObject;
+    if (typeof urlOrders == 'string') urlOrders = [urlOrders];
+    for (const [index, orders] of urlOrders.entries()) {
+        const [name, direction] = orders.split(' ');
+        orderObject[name] = { direction, index: index + 1 };
+    }
+    return orderObject;
+}
+
 const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
 defineExpose({
     reload,
@@ -208,24 +253,35 @@ defineExpose({
                 :data-key="$attrs['data-key']"
                 :search-button="true"
                 v-model="params"
-                :disable-submit-event="true"
                 :search-url="searchUrl"
+                :redirect="!!redirect"
             >
                 <template #body>
-                    <VnTableFilter
-                        :column="col"
-                        :data-key="$attrs['data-key']"
+                    <div
+                        class="row no-wrap flex-center"
                         v-for="col of splittedColumns.columns"
                         :key="col.id"
-                        v-model="params[columnName(col)]"
-                        :search-url="searchUrl"
+                    >
+                        <VnTableFilter
+                            :column="col"
+                            :data-key="$attrs['data-key']"
+                            v-model="params[columnName(col)]"
+                            :search-url="searchUrl"
+                        />
+                        <VnTableOrder
+                            v-model="orders[col.name]"
+                            :name="col.orderBy ?? col.name"
+                            :data-key="$attrs['data-key']"
+                            :search-url="searchUrl"
+                            :vertical="true"
+                        />
+                    </div>
+                    <slot
+                        name="moreFilterPanel"
+                        :params="params"
+                        :columns="splittedColumns.columns"
                     />
                 </template>
-                <slot
-                    name="moreFilterPanel"
-                    :params="params"
-                    :columns="splittedColumns.columns"
-                />
             </VnFilterPanel>
         </QScrollArea>
     </QDrawer>
@@ -236,7 +292,7 @@ defineExpose({
             :limit="20"
             ref="CrudModelRef"
             :search-url="searchUrl"
-            :disable-infinite-scroll="mode == TABLE_MODE"
+            :disable-infinite-scroll="isTableMode"
             @save-changes="reload"
             :has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
         >
@@ -249,36 +305,35 @@ defineExpose({
             </template>
             <template #body="{ rows }">
                 <QTable
-                    v-bind="$attrs['q-table']"
+                    v-bind="table"
                     class="vnTable"
                     :columns="splittedColumns.columns"
                     :rows="rows"
                     v-model:selected="selected"
-                    :grid="mode != TABLE_MODE"
+                    :grid="!isTableMode"
                     table-header-class="bg-header"
                     card-container-class="grid-three"
                     flat
-                    :style="mode == TABLE_MODE && 'max-height: 90vh'"
+                    :style="isTableMode && `max-height: ${tableHeight}`"
                     virtual-scroll
                     @virtual-scroll="
                         (event) =>
                             event.index > rows.length - 2 &&
                             CrudModelRef.vnPaginateRef.paginate()
                     "
-                    @row-click="(_, row) => rowClickFunction(row)"
+                    @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
                     @update:selected="emit('update:selected', $event)"
                 >
-                    <template #top-left>
+                    <template #top-left v-if="!$props.withoutHeader">
                         <slot name="top-left"></slot>
                     </template>
                     <template #top-right>
-                        <!-- <QBtn
-                        icon="visibility"
-                        title="asd"
-                        class="bg-vn-section-color q-mr-md"
-                        dense
-                        v-if="mode == 'table'"
-                    /> -->
+                        <VnVisibleColumn
+                            v-if="isTableMode"
+                            v-model="splittedColumns.columns"
+                            :table-code="tableCode ?? route.name"
+                            :skip="columnsVisibilitySkiped"
+                        />
                         <QBtnToggle
                             v-model="mode"
                             toggle-color="primary"
@@ -287,6 +342,7 @@ defineExpose({
                             :options="tableModes"
                         />
                         <QBtn
+                            v-if="$props.rightSearch"
                             icon="filter_alt"
                             title="asd"
                             class="bg-vn-section-color q-ml-md"
@@ -295,18 +351,33 @@ defineExpose({
                         />
                     </template>
                     <template #header-cell="{ col }">
-                        <QTh
-                            auto-width
-                            style="min-width: 100px"
-                            v-if="$props.columnSearch"
-                        >
-                            <VnTableFilter
-                                :column="col"
-                                :show-title="true"
-                                :data-key="$attrs['data-key']"
-                                v-model="params[columnName(col)]"
-                                :search-url="searchUrl"
-                            />
+                        <QTh v-if="col.visible ?? true" auto-width>
+                            <div
+                                class="column self-start q-ml-xs ellipsis"
+                                :class="`text-${col?.align ?? 'left'}`"
+                                style="height: 75px"
+                            >
+                                <div
+                                    class="row items-center no-wrap"
+                                    style="height: 30px"
+                                >
+                                    <VnTableOrder
+                                        v-model="orders[col.name]"
+                                        :name="col.orderBy ?? col.name"
+                                        :label="col?.label"
+                                        :data-key="$attrs['data-key']"
+                                        :search-url="searchUrl"
+                                    />
+                                </div>
+                                <VnTableFilter
+                                    v-if="$props.columnSearch"
+                                    :column="col"
+                                    :show-title="true"
+                                    :data-key="$attrs['data-key']"
+                                    v-model="params[columnName(col)]"
+                                    :search-url="searchUrl"
+                                />
+                            </div>
                         </QTh>
                     </template>
                     <template #header-cell-tableActions>
@@ -329,7 +400,8 @@ defineExpose({
                         <QTd
                             auto-width
                             class="no-margin q-px-xs"
-                            :class="getColAlign(col)"
+                            :class="[getColAlign(col), col.class, col.columnField?.class]"
+                            v-if="col.visible ?? true"
                         >
                             <slot :name="`column-${col.name}`" :col="col" :row="row">
                                 <VnTableColumn
@@ -418,7 +490,7 @@ defineExpose({
                                         :class="$props.cardClass"
                                     >
                                         <div
-                                            v-for="col of splittedColumns.visible"
+                                            v-for="col of splittedColumns.cardVisible"
                                             :key="col.name"
                                             class="fields"
                                         >
@@ -517,8 +589,12 @@ defineExpose({
 <i18n>
 en:
     status: Status
+    table view: Table view
+    grid view: Grid view
 es:
     status: Estados
+    table view: Vista en tabla
+    grid view: Vista en cuadrícula
 </i18n>
 
 <style lang="scss">
@@ -528,7 +604,11 @@ es:
 }
 
 .bg-header {
-    background-color: #5d5d5d;
+    background-color: var(--vn-header-color);
+    color: var(--vn-text-color);
+}
+
+.color-vn-text {
     color: var(--vn-text-color);
 }
 
@@ -537,7 +617,7 @@ es:
 .q-table--dark tr,
 .q-table--dark th,
 .q-table--dark td {
-    border-color: #222222;
+    border-color: var(--vn-section-color);
 }
 
 .q-table__container > div:first-child {
@@ -607,7 +687,7 @@ es:
         right: 0;
     }
     td.sticky {
-        background-color: var(--q-dark);
+        background-color: var(--vn-section-color);
         z-index: 1;
     }
 }
diff --git a/src/components/VnTable/VnVisibleColumn.vue b/src/components/VnTable/VnVisibleColumn.vue
new file mode 100644
index 000000000..e3bb52637
--- /dev/null
+++ b/src/components/VnTable/VnVisibleColumn.vue
@@ -0,0 +1,189 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { ref, computed, onMounted } from 'vue';
+
+import { useState } from 'src/composables/useState';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const columns = defineModel({ type: Object, default: [] });
+const $props = defineProps({
+    tableCode: {
+        type: String,
+        default: '',
+    },
+    skip: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const { notify } = useNotify();
+const { t } = useI18n();
+const state = useState();
+const user = state.getUser();
+const popupProxyRef = ref();
+const initialUserConfigViewData = ref();
+const localColumns = ref([]);
+
+const areAllChecksMarked = computed(() => {
+    return localColumns.value.every((col) => col.visible);
+});
+
+function setUserConfigViewData(data, isLocal) {
+    if (!data) return;
+    // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
+    if (!isLocal) localColumns.value = [];
+    // Array to Object
+    const skippeds = $props.skip.reduce((a, v) => ({ ...a, [v]: v }), {});
+
+    for (let column of columns.value) {
+        const { label, name } = column;
+        if (skippeds[name]) continue;
+        column.visible = data[name] ?? true;
+        if (!isLocal) localColumns.value.push({ name, label, visible: column.visible });
+    }
+}
+
+function toggleMarkAll(val) {
+    localColumns.value.forEach((col) => (col.visible = val));
+}
+
+async function getConfig(url, filter) {
+    const response = await axios.get(url, {
+        params: { filter: filter },
+    });
+    return response.data && response.data.length > 0 ? response.data[0] : null;
+}
+
+async function fetchViewConfigData() {
+    try {
+        const defaultFilter = {
+            where: { tableCode: $props.tableCode },
+        };
+
+        const userConfig = await getConfig('UserConfigViews', {
+            where: {
+                ...defaultFilter.where,
+                ...{ userFk: user.id },
+            },
+        });
+
+        if (userConfig) {
+            initialUserConfigViewData.value = userConfig;
+            setUserConfigViewData(userConfig.configuration);
+            return;
+        }
+
+        const defaultConfig = await getConfig('DefaultViewConfigs', defaultFilter);
+        if (defaultConfig) {
+            setUserConfigViewData(defaultConfig.columns);
+            return;
+        }
+    } catch (err) {
+        console.err('Error fetching config view data', err);
+    }
+}
+
+async function saveConfig() {
+    const configuration = {};
+    for (const { name, visible } of localColumns.value)
+        configuration[name] = visible ?? true;
+    setUserConfigViewData(configuration, true);
+    if (!$props.tableCode) return popupProxyRef.value.hide();
+
+    try {
+        const params = {};
+        // Si existe una view config del usuario hacemos un update si no la creamos
+        if (initialUserConfigViewData.value) {
+            params.updates = [
+                {
+                    data: {
+                        configuration,
+                    },
+                    where: {
+                        id: initialUserConfigViewData.value.id,
+                    },
+                },
+            ];
+        } else {
+            params.creates = [
+                {
+                    userFk: user.value.id,
+                    tableCode: $props.tableCode,
+                    tableConfig: $props.tableCode,
+                    configuration,
+                },
+            ];
+        }
+
+        const response = await axios.post('UserConfigViews/crud', params);
+        if (response.data && response.data[0]) {
+            initialUserConfigViewData.value = response.data[0];
+        }
+        notify('globals.dataSaved', 'positive');
+        popupProxyRef.value.hide();
+    } catch (err) {
+        console.error('Error saving user view config', err);
+        notify('errors.writeRequest', 'negative');
+    }
+}
+
+onMounted(async () => {
+    setUserConfigViewData({});
+    await fetchViewConfigData();
+});
+</script>
+<template>
+    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-md q-px-sm" dense>
+        <QPopupProxy ref="popupProxyRef">
+            <QCard class="column q-pa-md">
+                <QIcon name="info" size="sm" class="info-icon">
+                    <QTooltip>{{ t('Check the columns you want to see') }}</QTooltip>
+                </QIcon>
+                <span class="text-body1 q-mb-sm">{{ t('Visible columns') }}</span>
+                <QCheckbox
+                    :label="t('Tick all')"
+                    :model-value="areAllChecksMarked"
+                    @update:model-value="toggleMarkAll($event)"
+                    class="q-mb-sm"
+                />
+                <div v-if="columns.length > 0" class="checks-layout">
+                    <QCheckbox
+                        v-for="col in localColumns"
+                        :key="col.name"
+                        :label="col.label"
+                        v-model="col.visible"
+                    />
+                </div>
+                <QBtn
+                    class="full-width q-mt-md"
+                    color="primary"
+                    @click="saveConfig()"
+                    :label="t('globals.save')"
+                />
+            </QCard>
+        </QPopupProxy>
+        <QTooltip>{{ t('Visible columns') }}</QTooltip>
+    </QBtn>
+</template>
+
+<style lang="scss" scoped>
+.info-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+}
+
+.checks-layout {
+    display: grid;
+    grid-template-columns: repeat(3, 200px);
+}
+</style>
+
+<i18n>
+    es:
+        Check the columns you want to see: Marca las columnas que quieres ver
+        Visible columns: Columnas visibles
+        Tick all: Marcar todas
+</i18n>
diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index 7aa696a07..a4e4afafe 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -52,7 +52,7 @@ const toggleMarkAll = (val) => {
 
 const getConfig = async (url, filter) => {
     const response = await axios.get(url, {
-        params: { filter: filter },
+        params: { filter: JSON.stringify(filter) },
     });
     return response.data && response.data.length > 0 ? response.data[0] : null;
 };
@@ -60,7 +60,7 @@ const getConfig = async (url, filter) => {
 const fetchViewConfigData = async () => {
     try {
         const userConfigFilter = {
-            where: { tableCode: $props.tableCode, userFk: user.id },
+            where: { tableCode: $props.tableCode, userFk: user.value.id },
         };
         const userConfig = await getConfig('UserConfigViews', userConfigFilter);
 
@@ -74,8 +74,14 @@ const fetchViewConfigData = async () => {
         const defaultConfig = await getConfig('DefaultViewConfigs', defaultConfigFilter);
 
         if (defaultConfig) {
+            // Si el backend devuelve una configuración por defecto la usamos
             setUserConfigViewData(defaultConfig.columns);
             return;
+        } else {
+            // Si no hay configuración por defecto mostramos todas las columnas
+            const defaultColumns = {};
+            $props.allColumns.forEach((col) => (defaultColumns[col] = true));
+            setUserConfigViewData(defaultColumns);
         }
     } catch (err) {
         console.err('Error fetching config view data', err);
diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 337507233..02226e497 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -18,7 +18,7 @@ watchEffect(() => {
         (matched) => Object.keys(matched.meta).length
     );
     breadcrumbs.value.length = 0;
-
+    if (!matched.value[0]) return;
     if (matched.value[0].name != 'Dashboard') {
         root.value = useCamelCase(matched.value[0].path.substring(1).toLowerCase());
 
diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 769ba9959..c42de6690 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -273,6 +273,10 @@ function shouldRenderButton(button, isExternal = false) {
     if (button.name == 'download') return true;
     return button.external === isExternal;
 }
+
+defineExpose({
+    dmsRef,
+});
 </script>
 <template>
     <VnPaginate
@@ -374,7 +378,11 @@ function shouldRenderButton(button, isExternal = false) {
         />
     </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="showFormDialog()" />
+        <QBtn fab color="primary" icon="add" @click="showFormDialog()" class="fill-icon">
+            <QTooltip>
+                {{ t('Upload file') }}
+            </QTooltip>
+        </QBtn>
     </QPageSticky>
 </template>
 <style scoped>
@@ -392,4 +400,5 @@ en:
 es:
     contentTypesInfo: Tipos de archivo permitidos {allowedContentTypes}
     Generate identifier for original file: Generar identificador para archivo original
+    Upload file: Subir fichero
 </i18n>
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 184f8a158..72898483f 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -119,6 +119,7 @@ watch(
             >
                 <QDate
                     v-model="popupDate"
+                    :landscape="true"
                     :today-btn="true"
                     @update:model-value="
                         (date) => {
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 9344ff869..def5dda51 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -43,7 +43,7 @@ const formattedTime = computed({
             if (time?.length > 5) time = dateToTime(time);
             if (!props.timeOnly) {
                 const hours = time.split(':');
-                const date = new Date();
+                const date = new Date(model.value);
                 date.setHours(hours[0], hours[1], 0);
                 time = date.toISOString();
             }
@@ -100,13 +100,7 @@ watch(
                 self="top start"
                 :no-focus="true"
             >
-                <QTime
-                    :format24h="false"
-                    v-model="formattedTime"
-                    mask="HH:mm"
-                    landscape
-                    now-btn
-                />
+                <QTime v-model="formattedTime" mask="HH:mm" landscape now-btn />
             </QMenu>
         </QInput>
     </div>
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 3e5cd4216..e3bda6c8e 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -75,6 +75,7 @@ const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
 const dataRef = ref();
+const lastVal = ref();
 
 const value = computed({
     get() {
@@ -85,14 +86,31 @@ const value = computed({
     },
 });
 
+watch(options, (newValue) => {
+    setOptions(newValue);
+});
+
+watch(modelValue, (newValue) => {
+    if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
+        fetchFilter(newValue);
+});
+
+onMounted(() => {
+    setOptions(options.value);
+    if ($props.url && $props.modelValue && !findKeyInOptions())
+        fetchFilter($props.modelValue);
+    if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
+});
+
+function findKeyInOptions() {
+    if (!$props.options) return;
+    return filter($props.modelValue, $props.options)?.length;
+}
+
 function setOptions(data) {
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
 }
-onMounted(() => {
-    setOptions(options.value);
-    if ($props.url && $props.modelValue) fetchFilter($props.modelValue);
-});
 
 function filter(val, options) {
     const search = val.toString().toLowerCase();
@@ -125,15 +143,21 @@ async function fetchFilter(val) {
     const defaultWhere = $props.useLike
         ? { [key]: { like: `%${val}%` } }
         : { [key]: val };
-    const where = { ...defaultWhere, ...$props.where };
+    const where = { ...(val ? defaultWhere : {}), ...$props.where };
     const fetchOptions = { where, order: sortBy, limit };
     if (fields) fetchOptions.fields = fields;
     return dataRef.value.fetch(fetchOptions);
 }
 
 async function filterHandler(val, update) {
-    if (!$props.defaultFilter) return update();
+    if (!val && lastVal.value === val) {
+        lastVal.value = val;
+        return update();
+    }
+    lastVal.value = val;
     let newOptions;
+
+    if (!$props.defaultFilter) return update();
     if ($props.url) {
         newOptions = await fetchFilter(val);
     } else newOptions = filter(val, myOptionsOriginal.value);
@@ -149,19 +173,6 @@ async function filterHandler(val, update) {
         }
     );
 }
-
-watch(options, (newValue) => {
-    setOptions(newValue);
-});
-
-watch(modelValue, (newValue) => {
-    if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
-        fetchFilter(newValue);
-});
-
-onMounted(async () => {
-    if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
-});
 </script>
 
 <template>
diff --git a/src/components/common/VnSelectCache.vue b/src/components/common/VnSelectCache.vue
new file mode 100644
index 000000000..51873ef6e
--- /dev/null
+++ b/src/components/common/VnSelectCache.vue
@@ -0,0 +1,25 @@
+<script setup>
+import { ref, onBeforeMount, useAttrs } from 'vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+
+const $props = defineProps({
+    row: {
+        type: [Object],
+        default: null,
+    },
+    find: {
+        type: String,
+        default: null,
+    },
+});
+const options = ref([]);
+onBeforeMount(async () => {
+    const { url } = useAttrs();
+    const findBy = $props.find ?? url?.charAt(0)?.toLocaleLowerCase() + url?.slice(1, -1);
+    if (findBy) options.value = [$props.row[findBy]];
+});
+</script>
+
+<template>
+    <VnSelect v-bind="$attrs" :options="$attrs.options ?? options" />
+</template>
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 2bb5234ad..7792ed2cd 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -56,7 +56,12 @@ onBeforeMount(async () => {
         skip: 0,
     });
     store = arrayData.store;
-    entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
+    entity = computed(() => {
+        const data = (Array.isArray(store.data) ? store.data[0] : store.data) ?? {};
+        if (data) emit('onFetch', data);
+        return data;
+    });
+
     // It enables to load data only once if the module is the same as the dataKey
     if (!isSameDataKey.value || !route.params.id) await getData();
     watch(
@@ -85,9 +90,9 @@ function getValueFromPath(path) {
     const keys = path.toString().split('.');
     let current = entity.value;
 
-    for (let i = 0; i < keys.length; i++) {
-        if (current[keys[i]] === undefined) return undefined;
-        else current = current[keys[i]];
+    for (const key of keys) {
+        if (current[key] === undefined) return undefined;
+        else current = current[key];
     }
     return current;
 }
@@ -165,9 +170,9 @@ const toModule = computed(() =>
                     <QTooltip>
                         {{ t('components.cardDescriptor.moreOptions') }}
                     </QTooltip>
-                    <QMenu>
+                    <QMenu ref="menuRef">
                         <QList>
-                            <slot name="menu" :entity="entity" />
+                            <slot name="menu" :entity="entity" :menu-ref="menuRef" />
                         </QList>
                     </QMenu>
                 </QBtn>
diff --git a/src/pages/Order/Card/OrderCatalogItem.vue b/src/components/ui/CatalogItem.vue
similarity index 86%
rename from src/pages/Order/Card/OrderCatalogItem.vue
rename to src/components/ui/CatalogItem.vue
index 8fa0bb5b9..5c5d71018 100644
--- a/src/pages/Order/Card/OrderCatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@@ -7,7 +7,7 @@ import VnImg from 'src/components/ui/VnImg.vue';
 import OrderCatalogItemDialog from 'pages/Order/Card/OrderCatalogItemDialog.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
-import toCurrency from '../../../filters/toCurrency';
+import { toCurrency } from 'filters/index';
 
 const DEFAULT_PRICE_KG = 0;
 
@@ -18,6 +18,10 @@ defineProps({
         type: Object,
         required: true,
     },
+    isCatalog: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const dialog = ref(null);
@@ -28,7 +32,7 @@ const dialog = ref(null);
         <QCard class="card shadow-6">
             <div class="img-wrapper">
                 <VnImg :id="item.id" zoom-size="lg" class="image" />
-                <div v-if="item.hex" class="item-color-container">
+                <div v-if="item.hex && isCatalog" class="item-color-container">
                     <div
                         class="item-color"
                         :style="{ backgroundColor: `#${item.hex}` }"
@@ -48,13 +52,18 @@ const dialog = ref(null);
                         :value="item?.[`value${index + 4}`]"
                     />
                 </template>
+                <div v-if="item.minQuantity" class="min-quantity">
+                    <QIcon name="production_quantity_limits" size="xs" />
+                    {{ item.minQuantity }}
+                </div>
                 <div class="footer">
                     <div class="price">
-                        <p>
+                        <p v-if="isCatalog">
                             {{ item.available }} {{ t('to') }}
                             {{ toCurrency(item.price) }}
                         </p>
-                        <QIcon name="add_circle" class="icon">
+                        <slot name="price" />
+                        <QIcon v-if="isCatalog" name="add_circle" class="icon">
                             <QTooltip>{{ t('globals.add') }}</QTooltip>
                             <QPopupProxy ref="dialog">
                                 <OrderCatalogItemDialog
@@ -128,6 +137,11 @@ const dialog = ref(null);
     }
 }
 
+.min-quantity {
+    text-align: right;
+    color: $negative !important;
+}
+
 .footer {
     .price {
         overflow: hidden;
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 2ea51ed8b..b93ca7121 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -18,19 +18,18 @@ const $props = defineProps({
     },
     searchButton: {
         type: Boolean,
-        required: false,
         default: false,
     },
     showAll: {
         type: Boolean,
         default: true,
     },
-    unremovableParams: {
+    unRemovableParams: {
         type: Array,
         required: false,
         default: () => [],
-        description:
-            'Algunos filtros vienen con parametros de búsqueda por default y necesitan tener si o si un valor, por eso de ser necesario, esta prop nos sirve para saber que filtros podemos remover y cuales no',
+        description: `Some filters come with default search parameters and require a value.
+            This prop helps us determine which filters can be removed and which cannot.`,
     },
     exprBuilder: {
         type: Function,
@@ -58,6 +57,7 @@ const $props = defineProps({
     },
 });
 
+defineExpose({ search });
 const emit = defineEmits([
     'update:modelValue',
     'refresh',
@@ -112,7 +112,6 @@ async function search(evt) {
     isLoading.value = true;
     const filter = { ...userParams.value };
     store.userParamsChanged = true;
-    arrayData.reset(['skip', 'filter.skip', 'page']);
     const { params: newParams } = await arrayData.addFilter({ params: userParams.value });
     userParams.value = newParams;
 
@@ -139,7 +138,7 @@ async function clearFilters() {
     arrayData.reset(['skip', 'filter.skip', 'page']);
     // Filtrar los params no removibles
     const removableFilters = Object.keys(userParams.value).filter((param) =>
-        $props.unremovableParams.includes(param)
+        $props.unRemovableParams.includes(param)
     );
     const newParams = {};
     // Conservar solo los params que no son removibles
@@ -192,6 +191,14 @@ function formatValue(value) {
 </script>
 
 <template>
+    <QBtn
+        class="q-mt-lg q-mr-xs q-mb-lg"
+        round
+        color="primary"
+        style="position: fixed; z-index: 1; right: 0; bottom: 0"
+        icon="search"
+        @click="search()"
+    ></QBtn>
     <QForm @submit="search" id="filterPanelForm">
         <QList dense>
             <QItem class="q-mt-xs">
@@ -240,7 +247,7 @@ function formatValue(value) {
                     <VnFilterPanelChip
                         v-for="chip of tags"
                         :key="chip.label"
-                        :removable="!unremovableParams.includes(chip.label)"
+                        :removable="!unRemovableParams.includes(chip.label)"
                         @remove="remove(chip.label)"
                     >
                         <slot name="tags" :tag="chip" :format-fn="formatValue">
@@ -265,23 +272,6 @@ function formatValue(value) {
         <QList dense class="list q-gutter-y-sm q-mt-sm">
             <slot name="body" :params="userParams" :search-fn="search"></slot>
         </QList>
-        <template v-if="$props.searchButton">
-            <QItem>
-                <QItemSection class="q-py-sm">
-                    <QBtn
-                        :label="t('Search')"
-                        class="full-width"
-                        color="primary"
-                        dense
-                        icon="search"
-                        rounded
-                        :type="disableSubmitEvent ? 'button' : 'submit'"
-                        unelevated
-                    />
-                </QItemSection>
-            </QItem>
-            <QSeparator />
-        </template>
     </QForm>
     <QInnerLoading
         :label="t('globals.pleaseWait')"
diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue
index 8d747963b..985c9cc53 100644
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@@ -28,7 +28,7 @@ const $props = defineProps({
 const show = ref(false);
 const token = useSession().getTokenMultimedia();
 const timeStamp = ref(`timestamp=${Date.now()}`);
-import noImage from '/public/no-user.png';
+import noImage from '/no-user.png';
 import { useRole } from 'src/composables/useRole';
 const url = computed(() => {
     const isEmployee = useRole().isEmployee();
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 8e426b471..fd903e759 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -26,6 +26,10 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    userFilter: {
+        type: Object,
+        default: null,
+    },
     where: {
         type: Object,
         default: null,
@@ -80,6 +84,7 @@ const pagination = ref({
 const arrayData = useArrayData(props.dataKey, {
     url: props.url,
     filter: props.filter,
+    userFilter: props.userFilter,
     where: props.where,
     limit: props.limit,
     order: props.order,
diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index df6fcbcb7..5e2412437 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, onBeforeUnmount, ref, nextTick } from 'vue';
+import { onMounted, onBeforeUnmount, ref } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
 
 const stateStore = useStateStore();
@@ -30,6 +30,7 @@ onBeforeUnmount(() => stateStore.toggleSubToolbar());
 
 <template>
     <QToolbar
+        id="subToolbar"
         class="justify-end sticky"
         v-show="hasContent || $slots['st-actions'] || $slots['st-data']"
     >
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 0fcbbbb48..8567a0409 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -24,10 +24,11 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         const searchUrl = store.searchUrl;
         if (query[searchUrl]) {
             const params = JSON.parse(query[searchUrl]);
-            const filter = params?.filter;
+            const filter = params?.filter && JSON.parse(params?.filter ?? '{}');
             delete params.filter;
             store.userParams = { ...params, ...store.userParams };
-            store.userFilter = { ...JSON.parse(filter ?? '{}'), ...store.userFilter };
+            store.userFilter = { ...filter, ...store.userFilter };
+            if (filter.order) store.order = filter.order;
         }
     });
 
@@ -69,12 +70,13 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         canceller = new AbortController();
 
         const filter = {
-            order: store.order,
             limit: store.limit,
         };
 
         let exprFilter;
+
         let userParams = { ...store.userParams };
+
         if (store?.exprBuilder) {
             const where = buildFilter(userParams, (param, value) => {
                 const res = store.exprBuilder(param, value);
@@ -94,6 +96,8 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         Object.assign(params, userParams);
         params.filter.skip = store.skip;
+        if (store.order && store.order.length) params.filter.order = store.order;
+        else delete params.filter.order;
 
         params.filter = JSON.stringify(params.filter);
         store.currentFilter = params;
@@ -147,7 +151,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         store.filter = {};
         if (params) store.userParams = { ...params };
 
-        const response = await fetch({ append: false });
+        const response = await fetch({});
         return response;
     }
 
@@ -155,12 +159,13 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         if (filter) store.filter = filter;
 
         let userParams = { ...store.userParams, ...params };
+
         userParams = sanitizerParams(userParams, store?.exprBuilder);
 
         store.userParams = userParams;
         arrayDataStore.reset(['skip', 'filter.skip', 'page']);
 
-        await fetch({ append: false });
+        await fetch({});
         return { filter, params };
     }
 
@@ -171,16 +176,57 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         await addFilter({ filter: { where } });
     }
 
+    async function addOrder(field, direction = 'ASC') {
+        const newOrder = field + ' ' + direction;
+        let order = store.order || [];
+        if (typeof order == 'string') order = [order];
+
+        let index = order.findIndex((o) => o.split(' ')[0] === field);
+        if (index > -1) {
+            order[index] = newOrder;
+        } else {
+            index = order.length;
+            order.push(newOrder);
+        }
+
+        store.order = order;
+        fetch({});
+        index++;
+
+        return { index, order };
+    }
+
+    async function deleteOrder(field) {
+        let order = store.order ?? [];
+        if (typeof order == 'string') order = [order];
+
+        const index = order.findIndex((o) => o.split(' ')[0] === field);
+        if (index > -1) order.splice(index, 1);
+
+        store.order = order;
+        fetch({});
+    }
+
     function sanitizerParams(params, exprBuilder) {
         for (const param in params) {
             if (params[param] === '' || params[param] === null) {
                 delete store.userParams[param];
                 delete params[param];
                 if (store.filter?.where) {
-                    const key = Object.keys(exprBuilder ? exprBuilder(param) : param);
-                    if (key[0]) delete store.filter.where[key[0]];
-                    if (Object.keys(store.filter.where).length === 0) {
-                        delete store.filter.where;
+                    let key;
+                    if (exprBuilder) {
+                        const result = exprBuilder(param);
+                        if (result !== undefined && result !== null)
+                            key = Object.keys(result);
+                    } else {
+                        if (typeof param === 'object' && param !== null)
+                            key = Object.keys(param);
+                    }
+                    if (key && key[0]) {
+                        delete store.filter.where[key[0]];
+                        if (Object.keys(store.filter.where).length === 0) {
+                            delete store.filter.where;
+                        }
                     }
                 }
             }
@@ -198,7 +244,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     }
 
     async function refresh() {
-        if (Object.values(store.userParams).length) await fetch({ append: false });
+        if (Object.values(store.userParams).length) await fetch({});
     }
 
     function updateStateParams() {
@@ -240,6 +286,8 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         applyFilter,
         addFilter,
         addFilterWhere,
+        addOrder,
+        deleteOrder,
         refresh,
         destroy,
         loadMore,
diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index ca2abef00..10791c9c8 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -58,31 +58,37 @@ export function useSession() {
             }
         }
     }
-    async function destroy() {
+    async function destroy(destroyTokens = true) {
         const tokens = {
             tokenMultimedia: 'Accounts/logout',
             token: 'VnUsers/logout',
         };
         const storage = keepLogin() ? localStorage : sessionStorage;
+        let destroyTokenPromises = [];
+        try {
+            if (destroyTokens) {
+                const { data: isValidToken } = await axios.get('VnUsers/validateToken');
+                if (isValidToken)
+                    destroyTokenPromises = Object.entries(tokens).map(([key, url]) =>
+                        destroyToken(url, storage, key)
+                    );
+            }
+        } finally {
+            localStorage.clear();
+            sessionStorage.clear();
+            await Promise.allSettled(destroyTokenPromises);
+            const { setUser } = useState();
 
-        for (const [key, url] of Object.entries(tokens)) {
-            await destroyToken(url, storage, key);
+            setUser({
+                id: 0,
+                name: '',
+                nickname: '',
+                lang: '',
+                darkMode: null,
+            });
+
+            stopRenewer();
         }
-
-        localStorage.clear();
-        sessionStorage.clear();
-
-        const { setUser } = useState();
-
-        setUser({
-            id: 0,
-            name: '',
-            nickname: '',
-            lang: '',
-            darkMode: null,
-        });
-
-        stopRenewer();
     }
 
     async function login(data) {
diff --git a/src/css/app.scss b/src/css/app.scss
index 27ed65534..504718ff5 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -4,9 +4,10 @@
 
 body.body--light {
     --font-color: black;
+    --vn-header-color: #cecece;
+    --vn-page-color: #ffffff;
     --vn-section-color: #e0e0e0;
     --vn-section-hover-color: #b9b9b9;
-    --vn-page-color: #ffffff;
     --vn-text-color: var(--font-color);
     --vn-label-color: #5f5f5f;
     --vn-accent-color: #e7e3e3;
@@ -18,6 +19,7 @@ body.body--light {
     }
 }
 body.body--dark {
+    --vn-header-color: #5d5d5d;
     --vn-page-color: #222;
     --vn-section-color: #3d3d3d;
     --vn-section-hover-color: #747474;
@@ -229,3 +231,29 @@ input::-webkit-inner-spin-button {
 *::-webkit-scrollbar-track {
     background: transparent;
 }
+
+.q-table {
+    thead,
+    tbody {
+        th {
+            .q-select {
+                max-width: 120px;
+            }
+        }
+        td {
+            padding: 1px 10px 1px 10px;
+            max-width: 100px;
+            div span {
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+            }
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+        .expand {
+            max-width: 400px;
+        }
+    }
+}
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 75b07801a..6943252c9 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -46,6 +46,7 @@ globals:
     noPinnedModules: You don't have any pinned modules
     summary:
         basicData: Basic data
+    daysOnward: Days onward
     today: Today
     yesterday: Yesterday
     dateFormat: en-GB
@@ -196,6 +197,12 @@ globals:
         autonomous: Autonomous
         suppliers: Suppliers
         supplier: Supplier
+        expedition: Expedition
+        services: Service
+        components: Components
+        pictures: Pictures
+        packages: Packages
+        tracking: Tracking
         labeler: Labeler
         supplierCreate: New supplier
         accounts: Accounts
@@ -232,6 +239,7 @@ globals:
         formation: Formation
         locations: Locations
         warehouses: Warehouses
+        saleTracking: Sale tracking
         roles: Roles
         connections: Connections
         acls: ACLs
@@ -546,14 +554,13 @@ ticket:
         sms: Sms
         notes: Notes
         sale: Sale
+        dms: File management
         volume: Volume
         observation: Notes
         ticketAdvance: Advance tickets
         futureTickets: Future tickets
         purchaseRequest: Purchase request
         weeklyTickets: Weekly tickets
-        services: Service
-        tracking: Tracking
     list:
         nickname: Nickname
         state: State
@@ -627,69 +634,6 @@ ticket:
         landed: Landed
         warehouse: Warehouse
         agency: Agency
-claim:
-    list:
-        customer: Customer
-        assignedTo: Assigned
-        created: Created
-        state: State
-    rmaList:
-        code: Code
-        records: records
-    card:
-        claimId: Claim ID
-        attendedBy: Attended by
-        created: Created
-        state: State
-        ticketId: Ticket ID
-        customerSummary: Customer summary
-        claimedTicket: Claimed ticket
-        saleTracking: Sale tracking
-        ticketTracking: Ticket tracking
-        commercial: Commercial
-        province: Province
-        zone: Zone
-        customerId: client ID
-    summary:
-        customer: Customer
-        assignedTo: Assigned
-        attendedBy: Attended by
-        created: Created
-        state: State
-        details: Details
-        item: Item
-        landed: Landed
-        quantity: Quantity
-        claimed: Claimed
-        price: Price
-        discount: Discount
-        total: Total
-        actions: Actions
-        responsibility: Responsibility
-        company: Company
-        person: Employee/Customer
-        notes: Notes
-        photos: Photos
-        development: Development
-        reason: Reason
-        result: Result
-        responsible: Responsible
-        worker: Worker
-        redelivery: Redelivery
-        changeState: Change state
-    basicData:
-        customer: Customer
-        assignedTo: Assigned
-        created: Created
-        state: State
-        pickup: Pick up
-        null: No
-        agency: Agency
-        delivery: Delivery
-    photo:
-        fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}'
-        noData: 'There are no images/videos, click here or drag and drop the file'
-        dragDrop: Drag and drop it here
 invoiceOut:
     list:
         ref: Reference
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 452e387c9..f32562313 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -45,6 +45,7 @@ globals:
     noPinnedModules: No has fijado ningún módulo
     summary:
         basicData: Datos básicos
+    daysOnward: Días adelante
     today: Hoy
     yesterday: Ayer
     dateFormat: es-ES
@@ -239,6 +240,14 @@ globals:
         mailForwarding: Reenvío de correo
         mailAlias: Alias de correo
         privileges: Privilegios
+        observation: Notas
+        expedition: Expedición
+        saleTracking: Líneas preparadas
+        services: Servicios
+        tracking: Estados
+        components: Componentes
+        pictures: Fotos
+        packages: Bultos
     created: Fecha creación
     worker: Trabajador
     now: Ahora
@@ -544,14 +553,20 @@ ticket:
         sms: Sms
         notes: Notas
         sale: Lineas del pedido
+        dms: Gestión documental
         volume: Volumen
         observation: Notas
         ticketAdvance: Adelantar tickets
         futureTickets: Tickets a futuro
+        expedition: Expedición
         purchaseRequest: Petición de compra
         weeklyTickets: Tickets programados
+        saleTracking: Líneas preparadas
         services: Servicios
         tracking: Estados
+        components: Componentes
+        pictures: Fotos
+        packages: Bultos
     list:
         nickname: Alias
         state: Estado
@@ -625,69 +640,6 @@ ticket:
         landed: F. entrega
         warehouse: Almacén
         agency: Agencia
-claim:
-    list:
-        customer: Cliente
-        assignedTo: Asignada a
-        created: Creada
-        state: Estado
-    rmaList:
-        code: Código
-        records: registros
-    card:
-        claimId: ID reclamación
-        attendedBy: Atendida por
-        created: Creada
-        state: Estado
-        ticketId: ID ticket
-        customerSummary: Resumen del cliente
-        claimedTicket: Ticket reclamado
-        saleTracking: Líneas preparadas
-        ticketTracking: Estados del ticket
-        commercial: Comercial
-        province: Provincia
-        zone: Zona
-        customerId: ID del cliente
-    summary:
-        customer: Cliente
-        assignedTo: Asignada a
-        attendedBy: Atendida por
-        created: Creada
-        state: Estado
-        details: Detalles
-        item: Artículo
-        landed: Entregado
-        quantity: Cantidad
-        claimed: Reclamado
-        price: Precio
-        discount: Descuento
-        total: Total
-        actions: Acciones
-        responsibility: Responsabilidad
-        company: Empresa
-        person: Comercial/Cliente
-        notes: Observaciones
-        photos: Fotos
-        development: Trazabilidad
-        reason: Motivo
-        result: Consecuencias
-        responsible: Responsable
-        worker: Trabajador
-        redelivery: Devolución
-        changeState: Cambiar estado
-    basicData:
-        customer: Cliente
-        assignedTo: Asignada a
-        created: Creada
-        state: Estado
-        pickup: Recogida
-        null: No
-        agency: Agencia
-        delivery: Reparto
-    photo:
-        fileDescription: 'Reclamacion ID {claimId} del cliente {clientName} id {clientId}'
-        noData: No hay imágenes/videos haz click aquí o arrastra y suelta el archivo
-        dragDrop: Arrástralo y sueltalo aquí
 invoiceOut:
     list:
         ref: Referencia
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index a24a2a15e..e64eab81d 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -33,8 +33,8 @@ const DEFAULT_MAX_RESPONSABILITY = 5;
 const DEFAULT_MIN_RESPONSABILITY = 1;
 const arrayData = useArrayData('claimData');
 const marker_labels = [
-    { value: DEFAULT_MIN_RESPONSABILITY, label: t('claim.summary.company') },
-    { value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.summary.person') },
+    { value: DEFAULT_MIN_RESPONSABILITY, label: t('claim.company') },
+    { value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.person') },
 ];
 const multiplicatorValue = ref();
 const loading = ref(false);
@@ -209,12 +209,12 @@ async function post(query, params) {
             <QItem class="justify-between">
                 <QItemLabel class="slider-container">
                     <p class="text-primary">
-                        {{ t('claim.summary.actions') }}
+                        {{ t('claim.actions') }}
                     </p>
                     <QSlider
                         class="responsibility { 'background-color:primary': quasar.platform.is.mobile }"
                         v-model="claim.responsibility"
-                        :label-value="t('claim.summary.responsibility')"
+                        :label-value="t('claim.responsibility')"
                         @change="(value) => save({ responsibility: value })"
                         label-always
                         color="primary"
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index 4656980d9..de0dc50c3 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -30,7 +30,7 @@ function setClaimStates(data) {
 }
 
 async function getEnumValues() {
-    optionsList.value = [{ id: null, description: t('claim.basicData.null') }];
+    optionsList.value = [{ id: null, description: t('claim.null') }];
     const { data } = await axios.get(`Applications/get-enum-values`, {
         params: {
             schema: 'vn',
@@ -39,7 +39,7 @@ async function getEnumValues() {
         },
     });
     for (let value of data)
-        optionsList.value.push({ id: value, description: t(`claim.basicData.${value}`) });
+        optionsList.value.push({ id: value, description: t(`claim.${value}`) });
 }
 
 getEnumValues();
@@ -77,17 +77,14 @@ const statesFilter = {
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput
                     v-model="data.client.name"
-                    :label="t('claim.basicData.customer')"
+                    :label="t('claim.customer')"
                     disable
                 />
-                <VnInputDate
-                    v-model="data.created"
-                    :label="t('claim.basicData.created')"
-                />
+                <VnInputDate v-model="data.created" :label="t('claim.created')" />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnSelect
-                    :label="t('claim.basicData.assignedTo')"
+                    :label="t('claim.assignedTo')"
                     v-model="data.workerFk"
                     :options="workersOptions"
                     option-value="id"
@@ -114,7 +111,7 @@ const statesFilter = {
                     option-value="id"
                     option-label="description"
                     emit-value
-                    :label="t('claim.basicData.state')"
+                    :label="t('claim.state')"
                     map-options
                     use-input
                     @filter="(value, update) => filter(value, update, statesFilter)"
@@ -136,7 +133,7 @@ const statesFilter = {
                     option-value="id"
                     option-label="description"
                     emit-value
-                    :label="t('claim.basicData.pickup')"
+                    :label="t('claim.pickup')"
                     map-options
                     use-input
                     :input-debounce="0"
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index ecf16f4c6..02b63dd8e 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -2,7 +2,7 @@
 import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { toDate, toPercentage } from 'src/filters';
+import { toDateHourMinSec, toPercentage } from 'src/filters';
 import { useState } from 'src/composables/useState';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
@@ -42,7 +42,7 @@ function stateColor(code) {
 const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
-    data.value = useCardDescription(entity.client.name, entity.id);
+    data.value = useCardDescription(entity?.client?.name, entity.id);
     state.set('ClaimDescriptor', entity);
 };
 onMounted(async () => {
@@ -52,7 +52,6 @@ onMounted(async () => {
 
 <template>
     <CardDescriptor
-        ref="descriptor"
         :url="`Claims/${entityId}`"
         :filter="filter"
         module="Claim"
@@ -64,7 +63,7 @@ onMounted(async () => {
             <ClaimDescriptorMenu :claim="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv v-if="entity.claimState" :label="t('claim.card.state')">
+            <VnLv v-if="entity.claimState" :label="t('claim.state')">
                 <template #value>
                     <QBadge
                         :color="stateColor(entity.claimState.code)"
@@ -75,8 +74,8 @@ onMounted(async () => {
                     </QBadge>
                 </template>
             </VnLv>
-            <VnLv :label="t('claim.card.created')" :value="toDate(entity.created)" />
-            <VnLv :label="t('claim.card.commercial')">
+            <VnLv :label="t('claim.created')" :value="toDateHourMinSec(entity.created)" />
+            <VnLv :label="t('claim.commercial')">
                 <template #value>
                     <VnUserLink
                         :name="entity.client?.salesPersonUser?.name"
@@ -86,17 +85,17 @@ onMounted(async () => {
             </VnLv>
             <VnLv
                 v-if="entity.worker"
-                :label="t('claim.card.attendedBy')"
+                :label="t('claim.attendedBy')"
                 :value="entity.worker.user.name"
             >
                 <template #value>
                     <VnUserLink
-                        :name="entity.worker.user.nickname"
+                        :name="entity.worker.user.name"
                         :worker-id="entity.worker.id"
                     />
                 </template>
             </VnLv>
-            <VnLv :label="t('claim.card.zone')">
+            <VnLv :label="t('claim.zone')">
                 <template #value>
                     <span class="link">
                         {{ entity.ticket?.zone?.name }}
@@ -105,10 +104,10 @@ onMounted(async () => {
                 </template>
             </VnLv>
             <VnLv
-                :label="t('claim.card.province')"
+                :label="t('claim.province')"
                 :value="entity.ticket?.address?.province?.name"
             />
-            <VnLv :label="t('claim.card.ticketId')">
+            <VnLv :label="t('claim.ticketId')">
                 <template #value>
                     <span class="link">
                         {{ entity.ticketFk }}
@@ -130,7 +129,7 @@ onMounted(async () => {
                     color="primary"
                     :to="{ name: 'CustomerCard', params: { id: entity.clientFk } }"
                 >
-                    <QTooltip>{{ t('claim.card.customerSummary') }}</QTooltip>
+                    <QTooltip>{{ t('claim.customerSummary') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -138,7 +137,7 @@ onMounted(async () => {
                     color="primary"
                     :to="{ name: 'TicketCard', params: { id: entity.ticketFk } }"
                 >
-                    <QTooltip>{{ t('claim.card.claimedTicket') }}</QTooltip>
+                    <QTooltip>{{ t('claim.claimedTicket') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -146,7 +145,7 @@ onMounted(async () => {
                     color="primary"
                     :href="salixUrl + 'ticket/' + entity.ticketFk + '/sale-tracking'"
                 >
-                    <QTooltip>{{ t('claim.card.saleTracking') }}</QTooltip>
+                    <QTooltip>{{ t('claim.saleTracking') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -154,7 +153,7 @@ onMounted(async () => {
                     color="primary"
                     :href="salixUrl + 'ticket/' + entity.ticketFk + '/tracking/index'"
                 >
-                    <QTooltip>{{ t('claim.card.ticketTracking') }}</QTooltip>
+                    <QTooltip>{{ t('claim.ticketTracking') }}</QTooltip>
                 </QBtn>
             </QCardActions>
         </template>
diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index 8aa6e1d62..83e144e97 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -9,7 +9,7 @@ const state = useState();
 const user = state.getUser();
 
 const $props = defineProps({
-    id: { type: Number, default: null },
+    id: { type: [Number, String], default: null },
     addNote: { type: Boolean, default: true },
 });
 const claimId = computed(() => $props.id || route.params.id);
diff --git a/src/pages/Claim/Card/ClaimPhoto.vue b/src/pages/Claim/Card/ClaimPhoto.vue
index dd97b60df..076f8d092 100644
--- a/src/pages/Claim/Card/ClaimPhoto.vue
+++ b/src/pages/Claim/Card/ClaimPhoto.vue
@@ -18,7 +18,7 @@ const claimId = computed(() => router.currentRoute.value.params.id);
 
 const claimDms = ref([
     {
-        dmsFk: 1,
+        dmsFk: claimId,
     },
 ]);
 const client = ref({});
@@ -113,7 +113,7 @@ async function create() {
         warehouseId: config.value.warehouseFk,
         companyId: config.value.companyFk,
         dmsTypeId: dmsType.value.id,
-        description: t('claim.photo.fileDescription', {
+        description: t('claim.fileDescription', {
             claimId: claimId.value,
             clientName: client.value.name,
             clientId: client.value.id,
@@ -177,7 +177,7 @@ function onDrag() {
         >
             <QIcon size="xl" name="file_download" />
             <h5>
-                {{ t('claim.photo.dragDrop') }}
+                {{ t('claim.dragDrop') }}
             </h5>
         </div>
         <div
@@ -188,7 +188,7 @@ function onDrag() {
             <QIcon size="xl" name="image"></QIcon>
             <QIcon size="xl" name="movie"></QIcon>
             <h5>
-                {{ t('claim.photo.noData') }}
+                {{ t('claim.noData') }}
             </h5>
         </div>
         <div class="multimediaParent bg-transparent" v-if="claimDms?.length && !dragFile">
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 55d59822d..a34830631 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -1,20 +1,25 @@
 <script setup>
+import axios from 'axios';
 import { onMounted, ref, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate, toCurrency } from 'src/filters';
-import CardSummary from 'components/ui/CardSummary.vue';
-import FetchData from 'components/FetchData.vue';
+import dashIfEmpty from 'src/filters/dashIfEmpty';
 import { getUrl } from 'src/composables/getUrl';
 import { useSession } from 'src/composables/useSession';
+
 import VnLv from 'src/components/ui/VnLv.vue';
-import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
-import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import FetchData from 'components/FetchData.vue';
+import CardSummary from 'components/ui/CardSummary.vue';
+
+import ClaimSummaryAction from 'src/pages/Claim/Card/ClaimSummaryAction.vue';
+import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue';
+
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
-import axios from 'axios';
-import dashIfEmpty from 'src/filters/dashIfEmpty';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -34,6 +39,9 @@ const ClaimStates = ref([]);
 const claimUrl = ref();
 const salixUrl = ref();
 const claimDmsRef = ref();
+const claimDms = ref([]);
+const multimediaDialog = ref();
+const multimediaSlide = ref();
 const claimDmsFilter = ref({
     include: [
         {
@@ -42,34 +50,29 @@ const claimDmsFilter = ref({
     ],
 });
 
-onMounted(async () => {
-    salixUrl.value = await getUrl('');
-    claimUrl.value = salixUrl.value + `claim/${entityId.value}/`;
-});
-
 const detailsColumns = ref([
     {
         name: 'item',
-        label: 'claim.summary.item',
+        label: 'claim.item',
         field: (row) => row.sale.itemFk,
         sortable: true,
     },
     {
         name: 'landed',
-        label: 'claim.summary.landed',
+        label: 'claim.landed',
         field: (row) => row.sale.ticket.landed,
         format: (value) => toDate(value),
         sortable: true,
     },
     {
         name: 'quantity',
-        label: 'claim.summary.quantity',
+        label: 'claim.quantity',
         field: (row) => row.sale.quantity,
         sortable: true,
     },
     {
         name: 'claimed',
-        label: 'claim.summary.claimed',
+        label: 'claim.claimed',
         field: (row) => row.quantity,
         sortable: true,
     },
@@ -80,32 +83,38 @@ const detailsColumns = ref([
     },
     {
         name: 'price',
-        label: 'claim.summary.price',
+        label: 'claim.price',
         field: (row) => row.sale.price,
         sortable: true,
     },
     {
         name: 'discount',
-        label: 'claim.summary.discount',
+        label: 'claim.discount',
         field: (row) => row.sale.discount,
         format: (value) => `${value} %`,
         sortable: true,
     },
     {
         name: 'total',
-        label: 'claim.summary.total',
+        label: 'claim.total',
         field: ({ sale }) =>
             toCurrency(sale.quantity * sale.price * ((100 - sale.discount) / 100)),
         sortable: true,
     },
 ]);
 
+const markerLabels = [
+    { value: 1, label: t('claim.company') },
+    { value: 5, label: t('claim.person') },
+];
+
 const STATE_COLOR = {
     pending: 'warning',
     incomplete: 'info',
     resolved: 'positive',
     canceled: 'negative',
 };
+
 function stateColor(code) {
     return STATE_COLOR[code];
 }
@@ -113,38 +122,40 @@ function stateColor(code) {
 const developmentColumns = ref([
     {
         name: 'claimReason',
-        label: 'claim.summary.reason',
+        label: 'claim.reason',
         field: (row) => row.claimReason.description,
         sortable: true,
     },
     {
         name: 'claimResult',
-        label: 'claim.summary.result',
+        label: 'claim.result',
         field: (row) => row.claimResult.description,
         sortable: true,
     },
     {
         name: 'claimResponsible',
-        label: 'claim.summary.responsible',
+        label: 'claim.responsible',
         field: (row) => row.claimResponsible.description,
         sortable: true,
     },
     {
         name: 'worker',
-        label: 'claim.summary.worker',
+        label: 'claim.worker',
         field: (row) => row.worker?.user.nickname,
         sortable: true,
     },
     {
         name: 'claimRedelivery',
-        label: 'claim.summary.redelivery',
+        label: 'claim.redelivery',
         field: (row) => row.claimRedelivery.description,
         sortable: true,
     },
 ]);
-const claimDms = ref([]);
-const multimediaDialog = ref();
-const multimediaSlide = ref();
+
+onMounted(async () => {
+    salixUrl.value = await getUrl('');
+    claimUrl.value = salixUrl.value + `claim/${entityId.value}/`;
+});
 
 async function getClaimDms() {
     claimDmsFilter.value.where = { claimFk: entityId.value };
@@ -200,7 +211,7 @@ async function changeState(value) {
             >
                 <QList>
                     <QVirtualScroll
-                        style="max-height: 300px"
+                        class="max-container-height"
                         :items="ClaimStates"
                         separator
                         v-slot="{ item, index }"
@@ -221,16 +232,13 @@ async function changeState(value) {
             </QBtnDropdown>
         </template>
         <template #body="{ entity: { claim, salesClaimed, developments } }">
-            <QCard class="vn-one">
+            <QCard class="vn-one" v-if="$route.name != 'ClaimSummary'">
                 <VnTitle
                     :url="`#/claim/${entityId}/basic-data`"
                     :text="t('globals.pageTitles.basicData')"
                 />
-                <VnLv
-                    :label="t('claim.summary.created')"
-                    :value="toDate(claim.created)"
-                />
-                <VnLv :label="t('claim.summary.state')">
+                <VnLv :label="t('claim.created')" :value="toDate(claim.created)" />
+                <VnLv :label="t('claim.state')">
                     <template #value>
                         <QChip :color="stateColor(claim.claimState.code)" dense>
                             {{ claim.claimState.description }}
@@ -245,7 +253,7 @@ async function changeState(value) {
                         />
                     </template>
                 </VnLv>
-                <VnLv :label="t('claim.summary.attendedBy')">
+                <VnLv :label="t('claim.attendedBy')">
                     <template #value>
                         <VnUserLink
                             :name="claim.worker?.user?.nickname"
@@ -253,7 +261,7 @@ async function changeState(value) {
                         />
                     </template>
                 </VnLv>
-                <VnLv :label="t('claim.summary.customer')">
+                <VnLv :label="t('claim.customer')">
                     <template #value>
                         <span class="link cursor-pointer">
                             {{ claim.client?.name }}
@@ -262,27 +270,63 @@ async function changeState(value) {
                     </template>
                 </VnLv>
                 <VnLv
-                    :label="t('claim.basicData.pickup')"
+                    :label="t('claim.pickup')"
                     :value="`${dashIfEmpty(claim.pickup)}`"
                 />
             </QCard>
-            <QCard class="vn-three">
-                <VnTitle
-                    :url="`#/claim/${entityId}/notes`"
-                    :text="t('claim.summary.notes')"
-                />
+            <QCard class="vn-two">
+                <VnTitle :url="`#/claim/${entityId}/notes`" :text="t('claim.notes')" />
                 <ClaimNotes
                     :id="entityId"
                     :add-note="false"
-                    style="max-height: 300px"
+                    class="max-container-height"
                     order="created ASC"
                 />
             </QCard>
-            <QCard class="vn-two" v-if="salesClaimed.length > 0">
-                <VnTitle
-                    :url="`#/claim/${entityId}/lines`"
-                    :text="t('claim.summary.details')"
-                />
+            <QCard class="vn-two" v-if="claimDms?.length">
+                <VnTitle :url="`#/claim/${entityId}/photos`" :text="t('claim.photos')" />
+                <div class="container max-container-height" style="overflow: auto">
+                    <div
+                        class="multimedia-container"
+                        v-for="(media, index) of claimDms"
+                        :key="index"
+                    >
+                        <div class="relative-position">
+                            <QIcon
+                                name="play_circle"
+                                color="primary"
+                                size="xl"
+                                class="absolute-center zindex"
+                                v-if="media.isVideo"
+                                @click.stop="openDialog(media.dmsFk)"
+                            >
+                                <QTooltip>Video</QTooltip>
+                            </QIcon>
+                            <QCard
+                                class="multimedia relative-position"
+                                style="max-height: 128px"
+                            >
+                                <QImg
+                                    :src="media.url"
+                                    class="rounded-borders cursor-pointer fit"
+                                    @click="openDialog(media.dmsFk)"
+                                    v-if="!media.isVideo"
+                                >
+                                </QImg>
+                                <video
+                                    :src="media.url"
+                                    class="rounded-borders cursor-pointer fit"
+                                    muted="muted"
+                                    v-if="media.isVideo"
+                                    @click="openDialog(media.dmsFk)"
+                                />
+                            </QCard>
+                        </div>
+                    </div>
+                </div>
+            </QCard>
+            <QCard class="vn-max" v-if="salesClaimed.length > 0">
+                <VnTitle :url="`#/claim/${entityId}/lines`" :text="t('claim.details')" />
                 <QTable
                     :columns="detailsColumns"
                     :rows="salesClaimed"
@@ -320,53 +364,8 @@ async function changeState(value) {
                     </template>
                 </QTable>
             </QCard>
-            <QCard class="vn-two" v-if="claimDms.length > 0">
-                <VnTitle
-                    :url="`#/claim/${entityId}/photos`"
-                    :text="t('claim.summary.photos')"
-                />
-                <div class="container">
-                    <div
-                        class="multimedia-container"
-                        v-for="(media, index) of claimDms"
-                        :key="index"
-                    >
-                        <div class="relative-position">
-                            <QIcon
-                                name="play_circle"
-                                color="primary"
-                                size="xl"
-                                class="absolute-center zindex"
-                                v-if="media.isVideo"
-                                @click.stop="openDialog(media.dmsFk)"
-                            >
-                                <QTooltip>Video</QTooltip>
-                            </QIcon>
-                            <QCard class="multimedia relative-position">
-                                <QImg
-                                    :src="media.url"
-                                    class="rounded-borders cursor-pointer fit"
-                                    @click="openDialog(media.dmsFk)"
-                                    v-if="!media.isVideo"
-                                >
-                                </QImg>
-                                <video
-                                    :src="media.url"
-                                    class="rounded-borders cursor-pointer fit"
-                                    muted="muted"
-                                    v-if="media.isVideo"
-                                    @click="openDialog(media.dmsFk)"
-                                />
-                            </QCard>
-                        </div>
-                    </div>
-                </div>
-            </QCard>
-            <QCard class="vn-two" v-if="developments.length > 0">
-                <VnTitle
-                    :url="claimUrl + 'development'"
-                    :text="t('claim.summary.development')"
-                />
+            <QCard class="vn-max" v-if="developments.length > 0">
+                <VnTitle :url="claimUrl + 'development'" :text="t('claim.development')" />
                 <QTable
                     :columns="developmentColumns"
                     :rows="developments"
@@ -382,27 +381,31 @@ async function changeState(value) {
                             </QTh>
                         </QTr>
                     </template>
+                    <template #body-cell-worker="props">
+                        <QTd :props="props" class="link">
+                            {{ props.value }}
+                            <WorkerDescriptorProxy :id="props.row.worker.id" />
+                        </QTd>
+                    </template>
                 </QTable>
             </QCard>
             <QCard class="vn-max">
-                <VnTitle :url="claimUrl + 'action'" :text="t('claim.summary.actions')" />
+                <VnTitle :url="claimUrl + 'action'" :text="t('claim.actions')" />
                 <div id="slider-container" class="q-px-xl q-py-md">
                     <QSlider
                         v-model="claim.responsibility"
                         label
-                        :label-value="t('claim.summary.responsibility')"
+                        :label-value="t('claim.responsibility')"
                         label-always
                         color="var()"
                         markers
-                        :marker-labels="[
-                            { value: 1, label: t('claim.summary.company') },
-                            { value: 5, label: t('claim.summary.person') },
-                        ]"
+                        :marker-labels="markerLabels"
                         :min="1"
                         :max="5"
                         readonly
                     />
                 </div>
+                <ClaimSummaryAction :id="entityId" />
             </QCard>
             <QDialog
                 v-model="multimediaDialog"
@@ -458,7 +461,7 @@ async function changeState(value) {
     gap: 15px;
 }
 .multimedia-container {
-    flex: 1 0 21%;
+    flex: 0 0 128px;
 }
 .multimedia {
     transition: all 0.5s;
@@ -491,4 +494,8 @@ async function changeState(value) {
 .change-state {
     width: 10%;
 }
+
+.max-container-height {
+    max-height: 300px;
+}
 </style>
diff --git a/src/pages/Claim/Card/ClaimSummaryAction.vue b/src/pages/Claim/Card/ClaimSummaryAction.vue
new file mode 100644
index 000000000..d875126cb
--- /dev/null
+++ b/src/pages/Claim/Card/ClaimSummaryAction.vue
@@ -0,0 +1,97 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { toDate, toPercentage } from 'filters/index';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: [Number, String],
+        required: true,
+    },
+});
+
+const columns = [
+    {
+        name: 'itemFk',
+        label: t('Id item'),
+        columnFilter: false,
+        align: 'left',
+    },
+    {
+        name: 'ticketFk',
+        label: t('Ticket'),
+        columnFilter: false,
+        align: 'left',
+    },
+    {
+        name: 'claimDestinationFk',
+        label: t('Destination'),
+        columnFilter: false,
+        align: 'left',
+    },
+    {
+        name: 'landed',
+        label: t('Landed'),
+        format: (row) => toDate(row.landed),
+        align: 'left',
+    },
+    {
+        name: 'quantity',
+        label: t('Quantity'),
+        align: 'left',
+    },
+    {
+        name: 'concept',
+        label: t('Description'),
+        align: 'left',
+    },
+    {
+        name: 'price',
+        label: t('Price'),
+        align: 'left',
+    },
+    {
+        name: 'discount',
+        label: t('Discount'),
+        format: ({ discount }) => toPercentage(discount / 100),
+        align: 'left',
+    },
+    {
+        name: 'total',
+        label: t('Total'),
+        align: 'left',
+    },
+];
+</script>
+<template>
+    <VnTable
+        data-key="ClaimEndsTable"
+        url="ClaimEnds/filter"
+        :right-search="false"
+        :column-search="false"
+        :disable-option="{ card: true, table: true }"
+        search-url="actions"
+        :filter="{ where: { claimFk: $props.id } }"
+        :columns="columns"
+        :limit="0"
+        :without-header="true"
+        auto-load
+    >
+        <template #column-itemFk="{ row }">
+            <span class="link">
+                {{ row.itemFk }}
+                <ItemDescriptorProxy :id="row.itemFk" />
+            </span>
+        </template>
+        <template #column-ticketFk="{ row }">
+            <span class="link">
+                {{ row.ticketFk }}
+                <TicketDescriptorProxy :id="row.ticketFk" />
+            </span>
+        </template>
+    </VnTable>
+</template>
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index 6b9e92d97..8878040f6 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -16,19 +16,14 @@ const props = defineProps({
     },
 });
 
-const workers = ref();
-const states = ref();
+const states = ref([]);
+
+defineExpose({ states });
 </script>
 
 <template>
     <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -36,156 +31,110 @@ const states = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QItem class="q-my-sm">
-                <QItemSection>
-                    <VnInput
-                        :label="t('Customer ID')"
-                        v-model="params.clientFk"
-                        lazy-rules
-                        is-outlined
-                    >
-                        <template #prepend>
-                            <QIcon name="badge" size="xs"></QIcon> </template
-                    ></VnInput>
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection>
-                    <VnInput
-                        :label="t('Client Name')"
-                        v-model="params.clientName"
-                        lazy-rules
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
-                    <VnSelect
-                        :label="t('Salesperson')"
-                        v-model="params.salesPersonFk"
-                        @update:model-value="searchFn()"
-                        :options="workers"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                        :input-debounce="0"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
-                    <VnSelect
-                        :label="t('Attender')"
-                        v-model="params.attenderFk"
-                        @update:model-value="searchFn()"
-                        :options="workers"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                        :input-debounce="0"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
-                    <VnSelect
-                        :label="t('Responsible')"
-                        v-model="params.claimResponsibleFk"
-                        @update:model-value="searchFn()"
-                        :options="workers"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                        :input-debounce="0"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!states">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="states">
-                    <VnSelect
-                        :label="t('State')"
-                        v-model="params.claimStateFk"
-                        @update:model-value="searchFn()"
-                        :options="states"
-                        option-value="id"
-                        option-label="description"
-                        emit-value
-                        map-options
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <QCheckbox
-                        v-model="params.myTeam"
-                        :label="t('myTeam')"
-                        toggle-indeterminate
-                    />
-                </QItemSection>
-            </QItem>
-            <QSeparator />
-            <QExpansionItem :label="t('More options')" expand-separator>
-                <!-- <QItem>
-                        <QItemSection>
-                            <qSelect
-                                :label="t('Item')"
-                                v-model="params.itemFk"
-                                :options="items"
-                                :loading="loading"
-                                @filter="filterFn"
-                                @virtual-scroll="onScroll"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                map-options
-                            />
-                        </QItemSection>
-                    </QItem> -->
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.created"
-                            :label="t('Created')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-            </QExpansionItem>
+            <div class="q-pa-sm q-gutter-y-sm">
+                <VnInput
+                    :label="t('claim.customerId')"
+                    v-model="params.clientFk"
+                    lazy-rules
+                    is-outlined
+                >
+                    <template #prepend> <QIcon name="badge" size="xs" /></template>
+                </VnInput>
+                <VnInput
+                    :label="t('Client Name')"
+                    v-model="params.clientName"
+                    lazy-rules
+                    is-outlined
+                />
+                <VnSelect
+                    :label="t('Salesperson')"
+                    v-model="params.salesPersonFk"
+                    @update:model-value="searchFn()"
+                    url="Workers/activeWithInheritedRole"
+                    :filter="{ where: { role: 'salesPerson' } }"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="firstName"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnSelect
+                    :label="t('claim.attendedBy')"
+                    v-model="params.attenderFk"
+                    @update:model-value="searchFn()"
+                    url="Workers/activeWithInheritedRole"
+                    :filter="{ where: { role: 'salesPerson' } }"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="firstName"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnSelect
+                    :label="t('claim.state')"
+                    v-model="params.claimStateFk"
+                    @update:model-value="searchFn()"
+                    :options="states"
+                    option-value="id"
+                    option-label="description"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnInputDate
+                    v-model="params.created"
+                    @update:model-value="searchFn()"
+                    :label="t('claim.created')"
+                    outlined
+                    rounded
+                    dense
+                />
+                <VnSelect
+                    :label="t('Item')"
+                    v-model="params.itemFk"
+                    @update:model-value="searchFn()"
+                    url="Items/withName"
+                    option-value="id"
+                    option-label="name"
+                    sort-by="id DESC"
+                    outlined
+                    rounded
+                    dense
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnSelect
+                    :label="t('claim.responsible')"
+                    v-model="params.claimResponsibleFk"
+                    @update:model-value="searchFn()"
+                    url="Workers/activeWithInheritedRole"
+                    :filter="{ where: { role: 'salesPerson' } }"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="firstName"
+                    dense
+                    outlined
+                    rounded
+                />
+                <QCheckbox
+                    v-model="params.myTeam"
+                    :label="t('params.myTeam')"
+                    @update:model-value="searchFn()"
+                    toggle-indeterminate
+                />
+            </div>
         </template>
     </VnFilterPanel>
 </template>
@@ -201,7 +150,8 @@ en:
         claimResponsibleFk: Responsible
         claimStateFk: State
         created: Created
-    myTeam: My team
+        myTeam: My team
+        itemFk: Item
 es:
     params:
         search: Contiene
@@ -212,14 +162,9 @@ es:
         claimResponsibleFk: Responsable
         claimStateFk: Estado
         created: Creada
-    Customer ID: ID cliente
+        myTeam: Mi equipo
+        itemFk: Artículo
     Client Name: Nombre del cliente
     Salesperson: Comercial
-    Attender: Asistente
-    Responsible: Responsable
-    State: Estado
     Item: Artículo
-    Created: Creada
-    More options: Más opciones
-    myTeam: Mi equipo
 </i18n>
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index eee2713d3..05698debe 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -1,38 +1,114 @@
 <script setup>
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
 import { toDate } from 'filters/index';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import ClaimFilter from './ClaimFilter.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import CardList from 'src/components/ui/CardList.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import ClaimSummary from './Card/ClaimSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
-const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 
+const claimFilterRef = ref();
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('customer.extendedList.tableVisibleColumns.id'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.name'),
+        name: 'clientName',
+        isTitle: true,
+        visible: false,
+    },
+    {
+        align: 'left',
+        label: t('claim.customer'),
+        name: 'clientFk',
+        cardVisible: true,
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Clients',
+                fields: ['id', 'name'],
+            },
+        },
+        class: 'expand',
+    },
+    {
+        align: 'left',
+        label: t('claim.attendedBy'),
+        name: 'attendedBy',
+        cardVisible: true,
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Workers/activeWithInheritedRole',
+                fields: ['id', 'name'],
+                where: { role: 'salesPerson' },
+                useLike: false,
+                optionValue: 'id',
+                optionLabel: 'name',
+                optionFilter: 'firstName',
+            },
+        },
+    },
+    {
+        align: 'left',
+        label: t('claim.created'),
+        name: 'created',
+        format: ({ created }) => toDate(created),
+        cardVisible: true,
+        columnFilter: {
+            component: 'date',
+        },
+    },
+    {
+        align: 'left',
+        label: t('claim.state'),
+        name: 'stateCode',
+        chip: {
+            condition: () => true,
+            color: ({ stateCode }) => STATE_COLOR[stateCode] ?? 'bg-grey',
+        },
+        columnFilter: {
+            name: 'claimStateFk',
+            component: 'select',
+            attrs: {
+                options: claimFilterRef.value?.states,
+                optionLabel: 'description',
+            },
+        },
+    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('Client ticket list'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, ClaimSummary),
+            },
+        ],
+    },
+]);
+
 const STATE_COLOR = {
-    pending: 'warning',
-    managed: 'info',
-    resolved: 'positive',
+    pending: 'bg-warning',
+    managed: 'bg-info',
+    resolved: 'bg-positive',
 };
-function getApiUrl() {
-    return new URL(window.location).origin;
-}
-function stateColor(code) {
-    return STATE_COLOR[code];
-}
-function navigate(event, id) {
-    if (event.ctrlKey || event.metaKey)
-        return window.open(`${getApiUrl()}/#/claim/${id}/summary`);
-    router.push({ path: `/claim/${id}` });
-}
 </script>
 
 <template>
@@ -43,85 +119,39 @@ function navigate(event, id) {
     />
     <RightMenu>
         <template #right-panel>
-            <ClaimFilter data-key="ClaimList" />
+            <ClaimFilter data-key="ClaimList" ref="claimFilterRef" />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="ClaimList"
-                url="Claims/filter"
-                :order="['priority ASC', 'created DESC']"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        :id="row.id"
-                        :key="row.id"
-                        :title="row.clientName"
-                        @click="navigate($event, row.id)"
-                        v-for="row of rows"
-                    >
-                        <template #list-items>
-                            <VnLv :label="t('claim.list.customer')">
-                                <template #value>
-                                    <span class="link" @click.stop>
-                                        {{ row.clientName }}
-                                        <CustomerDescriptorProxy :id="row.clientFk" />
-                                    </span>
-                                </template>
-                            </VnLv>
-                            <VnLv :label="t('claim.list.assignedTo')">
-                                <template #value>
-                                    <span @click.stop>
-                                        <VnUserLink
-                                            :name="row.workerName"
-                                            :worker-id="row.workerFk"
-                                        />
-                                    </span>
-                                </template>
-                            </VnLv>
-                            <VnLv
-                                :label="t('claim.list.created')"
-                                :value="toDate(row.created)"
-                            />
-                            <VnLv :label="t('claim.list.state')">
-                                <template #value>
-                                    <QBadge
-                                        text-color="black"
-                                        :color="stateColor(row.stateCode)"
-                                        dense
-                                    >
-                                        {{ row.stateDescription }}
-                                    </QBadge>
-                                </template>
-                            </VnLv>
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('globals.description')"
-                                @click.stop
-                                outline
-                                style="margin-top: 15px"
-                            >
-                                <CustomerDescriptorProxy :id="row.clientFk" />
-                            </QBtn>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, ClaimSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-    </QPage>
+    <VnTable
+        data-key="ClaimList"
+        url="Claims/filter"
+        :order="['priority ASC', 'created DESC']"
+        :columns="columns"
+        redirect="claim"
+        :right-search="false"
+        auto-load
+    >
+        <template #column-clientFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.clientName }}
+                <CustomerDescriptorProxy :id="row.clientFk" />
+            </span>
+        </template>
+        <template #column-attendedBy="{ row }">
+            <span @click.stop>
+                <VnUserLink :name="row.workerName" :worker-id="row.workerFk" />
+            </span>
+        </template>
+    </VnTable>
 </template>
 
 <i18n>
 es:
     Search claim: Buscar reclamación
     You can search by claim id or customer name: Puedes buscar por id de la reclamación o nombre del cliente
+    params:
+        stateCode: Estado
+en:
+    params:
+        stateCode: State
 </i18n>
diff --git a/src/pages/Claim/locale/en.yml b/src/pages/Claim/locale/en.yml
new file mode 100644
index 000000000..ffcb44df6
--- /dev/null
+++ b/src/pages/Claim/locale/en.yml
@@ -0,0 +1,46 @@
+claim:
+    customer: Customer
+    code: Code
+    records: records
+    claimId: Claim ID
+    attendedBy: Attended by
+    ticketId: Ticket ID
+    customerSummary: Customer summary
+    claimedTicket: Claimed ticket
+    saleTracking: Sale tracking
+    ticketTracking: Ticket tracking
+    commercial: Commercial
+    province: Province
+    zone: Zone
+    customerId: client ID
+    assignedTo: Assigned
+    created: Created
+    details: Details
+    item: Item
+    landed: Landed
+    quantity: Quantity
+    claimed: Claimed
+    price: Price
+    discount: Discount
+    total: Total
+    actions: Actions
+    responsibility: Responsibility
+    company: Company
+    person: Employee/Customer
+    notes: Notes
+    photos: Photos
+    development: Development
+    reason: Reason
+    result: Result
+    responsible: Responsible
+    worker: Worker
+    redelivery: Redelivery
+    changeState: Change state
+    state: State
+    pickup: Pick up
+    null: No
+    agency: Agency
+    delivery: Delivery
+    fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}'
+    noData: 'There are no images/videos, click here or drag and drop the file'
+    dragDrop: Drag and drop it here
diff --git a/src/pages/Claim/locale/es.yml b/src/pages/Claim/locale/es.yml
index 710d3485d..90bef8e66 100644
--- a/src/pages/Claim/locale/es.yml
+++ b/src/pages/Claim/locale/es.yml
@@ -1,2 +1,48 @@
 Search claim: Buscar reclamación
 You can search by claim id or customer name: Puedes buscar por id de la reclamación o nombre del cliente
+claim:
+    customer: Cliente
+    code: Código
+    records: Registros
+    claimId: ID de reclamación
+    attendedBy: Atendido por
+    ticketId: ID de ticket
+    customerSummary: Resumen del cliente
+    claimedTicket: Ticket reclamado
+    saleTracking: Seguimiento de ventas
+    ticketTracking: Seguimiento de tickets
+    commercial: Comercial
+    province: Provincia
+    zone: Zona
+    customerId: ID de cliente
+    assignedTo: Asignado a
+    created: Creado
+    details: Detalles
+    item: Artículo
+    landed: Llegado
+    quantity: Cantidad
+    claimed: Reclamado
+    price: Precio
+    discount: Descuento
+    total: Total
+    actions: Acciones
+    responsibility: Responsabilidad
+    company: Empresa
+    person: Empleado/Cliente
+    notes: Notas
+    photos: Fotos
+    development: Trazabilidad
+    reason: Razón
+    result: Resultado
+    responsible: Responsable
+    worker: Trabajador
+    redelivery: Reentrega
+    changeState: Cambiar estado
+    state: Estado
+    pickup: Recoger
+    null: No
+    agency: Agencia
+    delivery: Entrega
+    fileDescription: 'ID de reclamación {claimId} del cliente {clientName} con ID {clientId}'
+    noData: 'No hay imágenes/videos, haz clic aquí o arrastra y suelta el archivo'
+    dragDrop: Arrastra y suelta aquí
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 5e688076a..938d90ab1 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -32,7 +32,7 @@ const entityId = computed(() => {
 });
 
 const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
+const setData = (entity) => (data.value = useCardDescription(entity?.name, entity?.id));
 </script>
 
 <template>
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index d8592421f..a7cdfafc5 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -147,6 +147,7 @@ function handleLocation(data, location) {
                     :label="t('Electronic invoice')"
                     v-model="data.hasElectronicInvoice"
                 />
+                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
             </VnRow>
         </template>
     </FormModel>
@@ -176,6 +177,7 @@ es:
     onlyLetters: Sólo se pueden usar letras, números y espacios
     whenActivatingIt: Al activarlo, no informar el código del país en el campo nif
     inOrderToInvoice: Para facturar no se consulta este campo, sino el RE de consignatario. Al modificar este campo si no esta marcada la casilla Facturar por consignatario, se propagará automaticamente el cambio a todos lo consignatarios, en caso contrario preguntará al usuario si quiere o no propagar
+    Daily invoice: Facturación diaria
 en:
     onlyLetters: Only letters, numbers and spaces can be used
     whenActivatingIt: When activating it, do not enter the country code in the ID field
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 58aaf2bf0..a9e4d978e 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -42,6 +42,9 @@ const columns = computed(() => [
         name: 'name',
         isTitle: true,
         create: true,
+        columnField: {
+            class: 'expand',
+        },
     },
     {
         align: 'left',
@@ -49,6 +52,9 @@ const columns = computed(() => [
         label: t('customer.extendedList.tableVisibleColumns.socialName'),
         isTitle: true,
         create: true,
+        columnField: {
+            class: 'expand',
+        },
     },
     {
         align: 'left',
@@ -78,8 +84,8 @@ const columns = computed(() => [
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.credit'),
         name: 'credit',
-        component: 'number',
         columnFilter: {
+            component: 'number',
             inWhere: true,
         },
     },
@@ -87,8 +93,8 @@ const columns = computed(() => [
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
         name: 'creditInsurance',
-        component: 'number',
         columnFilter: {
+            component: 'number',
             inWhere: true,
         },
     },
@@ -130,6 +136,9 @@ const columns = computed(() => [
         columnFilter: {
             inWhere: true,
         },
+        columnField: {
+            class: 'expand',
+        },
     },
     {
         align: 'left',
@@ -179,8 +188,8 @@ const columns = computed(() => [
         label: t('customer.extendedList.tableVisibleColumns.created'),
         name: 'created',
         format: ({ created }) => toDate(created),
-        component: 'date',
         columnFilter: {
+            component: 'date',
             alias: 'c',
             inWhere: true,
         },
@@ -405,10 +414,8 @@ function handleLocation(data, location) {
         }"
         order="id DESC"
         :columns="columns"
-        default-mode="table"
         redirect="customer"
         auto-load
-        :disable-option="{ card: true }"
     >
         <template #more-create-dialog="{ data }">
             <VnLocation
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index a55ad67cd..3efdf1bf7 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -73,7 +73,7 @@ onMounted(async () => {
 
 const data = ref(useCardDescription());
 const setData = (entity) =>
-    (data.value = useCardDescription(entity.supplier.nickname, entity.id));
+    (data.value = useCardDescription(entity.supplier?.nickname, entity.id));
 
 const currentEntry = computed(() => state.get('entry'));
 
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 7b92b29d4..fe530795c 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, onUpdated } from 'vue';
+import { onMounted, ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index dca32c08d..3f199314d 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, reactive, onUnmounted } from 'vue';
+import { onMounted, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
@@ -191,7 +191,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         order="id DESC"
         :columns="columns"
         redirect="entry"
-        default-mode="table"
         auto-load
         :right-search="false"
     />
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index fe719db6e..4272ce10e 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -1,8 +1,6 @@
 <script setup>
 import { onMounted, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import { useRoute } from 'vue-router';
 import EntryFilter from './EntryFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
@@ -12,8 +10,6 @@ import { toDate } from 'src/filters';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
-const route = useRoute();
-const entityId = computed(() => route.params.id);
 const tableRef = ref();
 
 const entryFilter = {
@@ -203,7 +199,6 @@ onMounted(async () => {
         order="id DESC"
         :columns="columns"
         redirect="entry"
-        default-mode="table"
         auto-load
         :right-search="false"
     />
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 58a69f70c..d4b73b479 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -7,6 +7,7 @@ import { toDate } from 'src/filters/index';
 import { useQuasar } from 'quasar';
 import EntryBuysTableDialog from './EntryBuysTableDialog.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -34,6 +35,10 @@ const columns = computed(() => [
         isTitle: false,
         create: true,
         cardVisible: true,
+        component: 'date',
+        columnField: {
+            component: null,
+        },
         format: ({ shipped }) => toDate(shipped),
     },
     {
@@ -43,6 +48,10 @@ const columns = computed(() => [
         isTitle: false,
         create: true,
         cardVisible: false,
+        component: 'date',
+        columnField: {
+            component: null,
+        },
         format: ({ landed }) => toDate(landed),
     },
     {
@@ -93,14 +102,23 @@ const printBuys = (rowId) => {
                 :columns="columns"
                 default-mode="card"
                 auto-load
+                :right-search="true"
             >
+                <template #moreFilterPanel="{ params }">
+                    <VnInput
+                        :label="t('globals.daysOnward')"
+                        v-model="params.days"
+                        class="q-px-xs row"
+                        dense
+                        filled
+                        outlined
+                    ></VnInput>
+                </template>
             </VnTable>
         </div>
     </QPage>
 </template>
 
 <i18n>
-es:
-    Search entries: Buscar entradas
     You can search by entry reference: Puedes buscar por referencia de la entrada
 </i18n>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
index e01706e84..42b8d92d9 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
@@ -63,8 +63,8 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         @on-fetch="setData"
         data-key="invoiceOutData"
     >
-        <template #menu="{ entity }">
-            <InvoiceOutDescriptorMenu :invoice-out-data="entity" />
+        <template #menu="{ entity, menuRef }">
+            <InvoiceOutDescriptorMenu :invoice-out-data="entity" :menu-ref="menuRef" />
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('invoiceOut.card.issued')" :value="toDate(entity.issued)" />
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index 10af631bc..e524faa24 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
@@ -11,13 +11,20 @@ import useNotify from 'src/composables/useNotify';
 import { useSession } from 'src/composables/useSession';
 import { usePrintService } from 'composables/usePrintService';
 import { useVnConfirm } from 'composables/useVnConfirm';
+import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 
+onBeforeMount(async () => (salixUrl.value = await getUrl('')));
+
 const $props = defineProps({
     invoiceOutData: {
         type: Object,
         default: () => {},
     },
+    menuRef: {
+        type: Object,
+        default: () => {},
+    },
 });
 
 const { notify } = useNotify();
@@ -28,8 +35,7 @@ const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const { openConfirmationModal } = useVnConfirm();
 const quasar = useQuasar();
-
-const transferInvoiceDialogRef = ref();
+const salixUrl = ref();
 const invoiceFormType = ref('pdf');
 const defaultEmailAddress = ref($props.invoiceOutData.client?.email);
 
@@ -115,6 +121,7 @@ const refundInvoice = async (withWarehouse) => {
     try {
         const params = { ref: $props.invoiceOutData.ref, withWarehouse: withWarehouse };
         const { data } = await axios.post('InvoiceOuts/refund', params);
+        location.href = window.origin + `/#/ticket/${data[0].id}/sale`;
         notify(
             t('refundInvoiceSuccessMessage', {
                 refundTicket: data[0].id,
@@ -125,11 +132,22 @@ const refundInvoice = async (withWarehouse) => {
         console.error('Error generating invoice out pdf', err);
     }
 };
+
+const showTransferInvoiceForm = async () => {
+    quasar.dialog({
+        component: TransferInvoiceForm,
+        componentProps: {
+            invoiceOutData: $props.invoiceOutData,
+        },
+    });
+};
 </script>
 
 <template>
-    <QItem v-ripple clickable @click="transferInvoiceDialogRef.show()">
-        <QItemSection>{{ t('Transfer invoice to...') }}</QItemSection>
+    <QItem v-ripple clickable>
+        <QItemSection @click="showTransferInvoiceForm()">{{
+            t('Transfer invoice to...')
+        }}</QItemSection>
     </QItem>
     <QItem v-ripple clickable>
         <QItemSection>{{ t('Show invoice...') }}</QItemSection>
@@ -222,10 +240,6 @@ const refundInvoice = async (withWarehouse) => {
             {{ t('Create a single ticket with all the content of the current invoice') }}
         </QTooltip>
     </QItem>
-
-    <QDialog ref="transferInvoiceDialogRef">
-        <TransferInvoiceForm :invoice-out-data="invoiceOutData" />
-    </QDialog>
 </template>
 
 <i18n>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index c773c43cf..e9d5a2f1f 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -3,7 +3,7 @@ import { onMounted, ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
-import { toCurrency, toDate } from 'src/filters';
+import { toCurrency, toDate, toPercentage } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import { getUrl } from 'src/composables/getUrl';
@@ -57,12 +57,14 @@ const taxColumns = ref([
         name: 'quantity',
         label: 'invoiceOut.summary.rate',
         field: (row) => row.rate,
+        format: (value) => toPercentage(value / 100),
         sortable: true,
     },
     {
         name: 'invoiceOuted',
         label: 'invoiceOut.summary.fee',
         field: (row) => row.vat,
+        format: (value) => toCurrency(value),
         sortable: true,
     },
 ]);
@@ -113,7 +115,7 @@ const ticketsColumns = ref([
         </template>
         <template #body="{ entity: { invoiceOut } }">
             <QCard class="vn-one">
-                <VnTitle :text="t('invoiceOut.pageTitles.basicData')" />
+                <VnTitle :text="t('globals.pageTitles.basicData')" />
                 <VnLv
                     :label="t('invoiceOut.summary.issued')"
                     :value="toDate(invoiceOut.issued)"
@@ -164,7 +166,7 @@ const ticketsColumns = ref([
                     </template>
                     <template #body-cell-item="{ value }">
                         <QTd>
-                            <QBtn flat color="primary">
+                            <QBtn flat class="link">
                                 {{ value }}
                                 <TicketDescriptorProxy :id="value" />
                             </QBtn>
@@ -172,7 +174,7 @@ const ticketsColumns = ref([
                     </template>
                     <template #body-cell-quantity="{ value, row }">
                         <QTd>
-                            <QBtn class="no-uppercase" flat color="primary" dense>
+                            <QBtn class="no-uppercase link" flat dense>
                                 {{ value }}
                                 <CustomerDescriptorProxy :id="row.id" />
                             </QBtn>
diff --git a/src/pages/InvoiceOut/InvoiceOutFilter.vue b/src/pages/InvoiceOut/InvoiceOutFilter.vue
index 985bfb085..103e175ec 100644
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@@ -41,7 +41,7 @@ function setWorkers(data) {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params, searchFn }">
+        <template #body="{ params }">
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -93,7 +93,6 @@ function setWorkers(data) {
                 <QItemSection>
                     <QCheckbox
                         :label="t('Has PDF')"
-                        @update:model-value="searchFn()"
                         toggle-indeterminate
                         v-model="params.hasPdf"
                     />
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobal.vue b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
index a01af6b4b..eecc61bc2 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
@@ -30,7 +30,7 @@ const selectedCustomerId = ref(null);
 const tableColumnComponents = {
     clientId: {
         component: QBtn,
-        props: { flat: true, color: 'blue' },
+        props: { flat: true, class: 'link' },
         event: (prop) => selectCustomerId(prop.value),
     },
     clientName: {
@@ -52,7 +52,12 @@ const tableColumnComponents = {
 };
 
 const columns = computed(() => [
-    { label: 'Id', field: 'clientId', name: 'clientId', align: 'left' },
+    {
+        align: 'left',
+        name: 'clientId',
+        label: 'Id',
+        field: 'clientId',
+    },
     {
         label: t('invoiceOut.globalInvoices.table.client'),
         field: 'clientName',
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 78ec03a16..23c63ee6a 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -48,7 +48,7 @@ const getStatus = computed({
 
 onMounted(async () => {
     await invoiceOutGlobalStore.init();
-    formData.value = { ...formInitialData.value };
+    formData.value = formInitialData.value.invoiceDate;
 });
 </script>
 
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 536ee4971..5a611d388 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -1,96 +1,177 @@
 <script setup>
-import { onMounted, onUnmounted, ref } from 'vue';
+import { onMounted, onUnmounted, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import CardList from 'src/components/ui/CardList.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
-import CreateManualInvoiceForm from 'src/components/CreateManualInvoiceForm.vue';
-
-import InvoiceOutFilter from './InvoiceOutFilter.vue';
-import { toDate, toCurrency } from 'src/filters/index';
-import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { useSession } from 'src/composables/useSession';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import { usePrintService } from 'composables/usePrintService';
+import VnTable from 'components/VnTable/VnTable.vue';
+import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
+import { toCurrency, toDate } from 'src/filters/index';
+import { useStateStore } from 'stores/useStateStore';
+import { QBtn } from 'quasar';
+import { watchEffect } from 'vue';
 
 const { t } = useI18n();
-const router = useRouter();
 const stateStore = useStateStore();
-const session = useSession();
-const tokenMultimedia = session.getTokenMultimedia();
 const { viewSummary } = useSummaryDialog();
+const tableRef = ref();
+const invoiceOutSerialsOptions = ref([]);
+const ticketsOptions = ref([]);
+const customerOptions = ref([]);
+const selectedRows = ref([]);
+const hasSelectedCards = computed(() => selectedRows.value.length > 0);
+const MODEL = 'InvoiceOuts';
+const { openReport } = usePrintService();
 
-const manualInvoiceDialogRef = ref(null);
-const selectedCards = ref(new Map());
-
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('invoiceOutList.tableVisibleColumns.id'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+    },
+    {
+        align: 'left',
+        name: 'ref',
+        label: t('invoiceOutList.tableVisibleColumns.ref'),
+        isTitle: true,
+        component: 'select',
+        attrs: {
+            url: MODEL,
+            optionLabel: 'ref',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'Issued',
+        label: t('invoiceOutList.tableVisibleColumns.issued'),
+        component: 'date',
+        format: (row) => toDate(row.issued),
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'clientSocialName',
+        label: t('invoiceOutModule.customer'),
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'Clients',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'companyCode',
+        label: t('invoiceOutModule.company'),
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'Companies',
+            optionLabel: 'code',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'amount',
+        label: t('invoiceOutModule.amount'),
+        cardVisible: true,
+        format: (row) => toCurrency(row.amount),
+    },
+    {
+        align: 'left',
+        name: 'created',
+        label: t('invoiceOutList.tableVisibleColumns.created'),
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: (row) => toDate(row.created),
+    },
+    {
+        align: 'left',
+        name: 'dued',
+        label: t('invoiceOutList.tableVisibleColumns.dueDate'),
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: (row) => toDate(row.dued),
+    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('InvoiceOutSummary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, InvoiceOutSummary),
+            },
+            {
+                title: t('DownloadPdf'),
+                icon: 'vn:ticket',
+                isPrimary: true,
+                action: (row) => openPdf(row.id),
+            },
+        ],
+    },
+]);
 onMounted(() => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
 
-function navigate(id) {
-    router.push({ path: `/invoice-out/${id}` });
+function openPdf(id) {
+    try {
+        openReport(`${MODEL}/${id}/download`);
+    } catch (err) {
+        console.error('Error opening PDF', err);
+    }
 }
 
-const toggleIndividualCard = (cardData) => {
-    if (selectedCards.value.has(cardData.id)) {
-        selectedCards.value.delete(cardData.id);
-        return;
-    }
-    selectedCards.value.set(cardData.id, cardData);
-};
-
-const toggleAllCards = (cardsData) => {
-    const allSelected = selectedCards.value.size === cardsData.length;
-
-    if (!allSelected) {
-        // Si no todas las tarjetas están seleccionadas, selecciónalas todas
-        cardsData.forEach((data) => {
-            if (!selectedCards.value.has(data.id)) {
-                selectedCards.value.set(data.id, data);
-            }
-        });
-    } else {
-        // Si todas las tarjetas están seleccionadas, deselecciónalas todas
-        selectedCards.value.clear();
-    }
-};
-
-const openPdf = () => {
+function downloadPdf() {
     try {
-        if (selectedCards.value.size === 0) return;
-        const selectedCardsArray = Array.from(selectedCards.value.values());
+        if (selectedRows.value.size === 0) return;
+        const selectedCardsArray = Array.from(selectedRows.value.values());
 
-        if (selectedCards.value.size === 1) {
+        if (selectedRows.value.size === 1) {
             const [invoiceOut] = selectedCardsArray;
-            const url = `api/InvoiceOuts/${invoiceOut.id}/download?access_token=${tokenMultimedia}`;
-            window.open(url, '_blank');
+            openPdf(invoiceOut.id);
         } else {
             const invoiceOutIdsArray = selectedCardsArray.map(
                 (invoiceOut) => invoiceOut.id
             );
             const invoiceOutIds = invoiceOutIdsArray.join(',');
 
-            const params = new URLSearchParams({
-                access_token: tokenMultimedia,
+            const params = {
                 ids: invoiceOutIds,
-            });
+            };
 
-            const url = `api/InvoiceOuts/downloadZip?${params}`;
-            window.open(url, '_blank');
+            openReport(`${MODEL}/downloadZip`, params);
         }
     } catch (err) {
         console.error('Error opening PDF');
     }
-};
+}
 
-const openCreateInvoiceModal = () => {
-    manualInvoiceDialogRef.value.show();
-};
+watchEffect(selectedRows);
 </script>
 
 <template>
@@ -99,115 +180,83 @@ const openCreateInvoiceModal = () => {
         :label="t('searchInvoice')"
         data-key="InvoiceOutList"
     />
-    <RightMenu>
-        <template #right-panel>
-            <InvoiceOutFilter data-key="InvoiceOutList" />
+    <VnSubToolbar>
+        <template #st-actions>
+            <QBtn
+                color="primary"
+                icon-right="cloud_download"
+                @click="downloadPdf()"
+                :disable="!hasSelectedCards"
+            >
+                <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
+            </QBtn>
         </template>
-    </RightMenu>
-    <QPage>
-        <VnPaginate
-            auto-load
-            data-key="InvoiceOutList"
-            :order="['issued DESC', 'id DESC']"
-            url="InvoiceOuts/filter"
-        >
-            <template #body="{ rows }">
-                <VnSubToolbar class="justify-end">
-                    <template #st-actions>
-                        <QBtn
-                            @click="openPdf()"
-                            class="q-mr-md"
-                            color="primary"
-                            icon="cloud_download"
-                            :disable="selectedCards.size === 0"
-                        >
-                            <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
-                        </QBtn>
-                        <QCheckbox
-                            left-label
-                            :label="t('globals.markAll')"
-                            @click="toggleAllCards(rows)"
-                            :model-value="selectedCards.size === rows.length"
-                            class="q-mr-md"
-                        />
-                    </template>
-                </VnSubToolbar>
-                <div class="flex flex-center q-pa-md">
-                    <div class="vn-card-list">
-                        <CardList
-                            :element="row"
-                            :id="row.id"
-                            :show-checkbox="true"
-                            :is-selected="selectedCards.has(row.id)"
-                            :key="row.id"
-                            :title="row.ref"
-                            @click="navigate(row.id)"
-                            @toggle-card-check="toggleIndividualCard(row)"
-                            v-for="row of rows"
-                        >
-                            <template #list-items>
-                                <VnLv
-                                    :label="t('invoiceOut.list.issued')"
-                                    :value="toDate(row.issued)"
-                                />
-                                <VnLv
-                                    :label="t('invoiceOut.list.amount')"
-                                    :value="toCurrency(row.amount)"
-                                />
-                                <VnLv :label="t('invoiceOut.list.client')">
-                                    <template #value>
-                                        <span class="link" @click.stop>
-                                            {{ row?.clientSocialName }}
-                                            <CustomerDescriptorProxy
-                                                :id="row?.clientFk"
-                                            />
-                                        </span>
-                                    </template>
-                                </VnLv>
-                                <VnLv
-                                    :label="t('invoiceOut.list.shortCreated')"
-                                    :title-label="t('invoiceOut.list.created')"
-                                    :value="toDate(row.created)"
-                                />
-                                <VnLv
-                                    :label="t('invoiceOut.list.company')"
-                                    :value="row.companyCode"
-                                />
-                                <VnLv
-                                    :label="t('invoiceOut.list.shortDued')"
-                                    :title-label="t('invoiceOut.list.dued')"
-                                    :value="toDate(row.dued)"
-                                />
-                            </template>
-                            <template #actions>
-                                <QBtn
-                                    :label="t('components.smartCard.openSummary')"
-                                    @click.stop="viewSummary(row.id, InvoiceOutSummary)"
-                                    color="primary"
-                                    style="margin-top: 15px"
-                                    type="submit"
-                                />
-                            </template>
-                        </CardList>
-                    </div>
-                </div>
-            </template>
-        </VnPaginate>
-        <QPageSticky :offset="[20, 20]">
-            <QBtn fab icon="add" color="primary" @click="openCreateInvoiceModal()" />
-            <QTooltip>
-                {{ t('createInvoice') }}
-            </QTooltip>
-        </QPageSticky>
-
-        <QDialog
-            ref="manualInvoiceDialogRef"
-            transition-show="scale"
-            transition-hide="scale"
-        >
-            <CreateManualInvoiceForm />
-        </QDialog>
-    </QPage>
+    </VnSubToolbar>
+    <VnTable
+        ref="tableRef"
+        data-key="invoiceOut"
+        :url="`${MODEL}/filter`"
+        :create="{
+            urlCreate: 'InvoiceOuts/createManualInvoice',
+            title: t('Create Manual Invoice'),
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {
+                active: true,
+            },
+        }"
+        v-model:selected="selectedRows"
+        order="id DESC"
+        :columns="columns"
+        redirect="invoice-out"
+        auto-load
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
+    >
+        <template #more-create-dialog="{ data }">
+            <VnSelect
+                url="Tickets"
+                v-model="data.ticketFk"
+                :label="t('invoiceOutList.tableVisibleColumns.ticket')"
+                :options="ticketsOptions"
+                option-label="nickname"
+                option-value="id"
+            />
+            <VnSelect
+                url="Clients"
+                v-model="data.clientFk"
+                :label="t('invoiceOutModule.customer')"
+                :options="customerOptions"
+                option-label="name"
+                option-value="id"
+            />
+            <VnInputDate
+                :label="t('invoiceOutList.tableVisibleColumns.dueDate')"
+                v-model="data.maxShipped"
+            />
+            <VnSelect
+                url="InvoiceOutSerials"
+                v-model="data.invoiceOutSerial"
+                :label="t('invoiceOutList.tableVisibleColumns.invoiceOutSerial')"
+                :options="invoiceOutSerialsOptions"
+                option-label="description"
+                option-value="code"
+            />
+            <VnSelect
+                url="TaxAreas"
+                v-model="data.area"
+                :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
+                :options="taxAreasOptions"
+                option-label="code"
+                option-value="code"
+            />
+            <QInput
+                v-model="data.reference"
+                :label="t('invoiceOutList.tableVisibleColumns.ref')"
+            />
+        </template>
+    </VnTable>
 </template>
 
 <i18n>
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 84a79661e..dfc051563 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -1,200 +1,176 @@
 <script setup>
-import { computed, onBeforeMount } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
-import InvoiceOutNegativeFilter from './InvoiceOutNegativeBasesFilter.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import { toCurrency } from 'src/filters';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
-import { useStateStore } from 'stores/useStateStore';
-import { useArrayData } from 'composables/useArrayData';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
-const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
-const stateStore = useStateStore();
 const { t } = useI18n();
-
-const arrayData = useArrayData('InvoiceOutNegative', {
-    url: 'InvoiceOuts/negativeBases',
-    limit: 0,
-    userParams: {
-        from: Date.vnFirstDayOfMonth().toISOString(),
-        to: Date.vnLastDayOfMonth().toISOString(),
-    },
-    exprBuilder: (param, value) => {
-        switch (param) {
-            case 'from':
-            case 'to':
-                return;
-            default:
-                return { [param]: value };
-        }
-    },
-});
-
-onBeforeMount(async () => {
-    await arrayData.fetch({ append: false });
-    stateStore.rightDrawer = true;
-});
+const tableRef = ref();
+const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
+const userParams = {
+    from: Date.vnFirstDayOfMonth().toISOString(),
+    to: Date.vnLastDayOfMonth().toISOString(),
+};
+useArrayData('InvoiceOutNegative', { userParams });
 
 const columns = computed(() => [
     {
-        label: t('invoiceOut.negativeBases.company'),
-        field: 'company',
+        align: 'left',
         name: 'company',
-        align: 'left',
+        label: t('invoiceOutModule.company'),
+        component: 'select',
+        cardVisible: true,
+        attrs: {
+            url: 'Companies',
+            optionLabel: 'code',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        },
     },
     {
-        label: t('invoiceOut.negativeBases.country'),
-        field: 'country',
+        align: 'left',
         name: 'country',
-        align: 'left',
+        label: t('negativeBases.country'),
+        component: 'select',
+        attrs: {
+            url: 'Countries',
+            optionLabel: 'name',
+            optionValue: 'id',
+        },
+        columnField: {
+            component: null,
+        },
     },
     {
-        label: t('invoiceOut.negativeBases.clientId'),
-        field: 'clientId',
+        align: 'left',
         name: 'clientId',
-        align: 'left',
+        label: t('negativeBases.clientId'),
+        cardVisible: true,
     },
     {
-        label: t('invoiceOut.negativeBases.client'),
-        field: 'clientSocialName',
-        name: 'client',
         align: 'left',
+        name: 'clientSocialName',
+        label: t('invoiceOutModule.customer'),
+        component: 'select',
+        isTitle: true,
+        cardVisible: true,
+        attrs: {
+            url: 'Clients',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        },
     },
     {
-        label: t('invoiceOut.negativeBases.amount'),
-        field: 'amount',
+        align: 'left',
         name: 'amount',
-        align: 'left',
-        format: (value) => toCurrency(value),
+        label: t('invoiceOutModule.amount'),
+        format: (row) => toCurrency(row.amount),
+        cardVisible: true,
     },
     {
-        label: t('invoiceOut.negativeBases.base'),
-        field: 'taxableBase',
-        name: 'base',
         align: 'left',
+        name: 'taxableBase',
+        label: t('negativeBases.base'),
     },
     {
-        label: t('invoiceOut.negativeBases.ticketId'),
-        field: 'ticketFk',
-        name: 'ticketId',
         align: 'left',
+        name: 'ticketFk',
+        label: t('negativeBases.ticketId'),
+        cardVisible: true,
     },
     {
-        label: t('invoiceOut.negativeBases.active'),
-        field: 'isActive',
-        name: 'active',
         align: 'left',
+        name: 'isActive',
+        label: t('negativeBases.active'),
     },
     {
-        label: t('invoiceOut.negativeBases.hasToInvoice'),
-        field: 'hasToInvoice',
+        align: 'left',
         name: 'hasToInvoice',
-        align: 'left',
+        label: t('negativeBases.hasToInvoice'),
     },
     {
-        label: t('invoiceOut.negativeBases.verifiedData'),
-        field: 'isTaxDataChecked',
-        name: 'verifiedData',
         align: 'left',
+        name: 'hasVerifiedData',
+        label: t('negativeBases.verifiedData'),
     },
     {
-        label: t('invoiceOut.negativeBases.comercial'),
-        field: 'workerName',
-        name: 'worker',
         align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
+        name: 'workerName',
+        component: 'select',
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            where: { role: 'salesPerson' },
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row, dashIfEmpty) => dashIfEmpty(row.workerName),
     },
 ]);
 
 const downloadCSV = async () => {
-    const params = {}; // filter.value;
     const filterParams = {
         limit: 20,
         where: {
             and: [],
         },
     };
-    for (const param in params) {
-        if (params[param]) filterParams.where.and.push({ [param]: params[param] });
+
+    for (const [key, value] of Object.entries(userParams)) {
+        if (value) {
+            filterParams.where.and.push({ [key]: value });
+        }
     }
 
     await invoiceOutGlobalStore.getNegativeBasesCsv(
-        arrayData.value.store.userParams.from,
-        arrayData.value.store.userParams.to,
-        params
+        userParams.from,
+        userParams.to,
+        filterParams
     );
 };
 </script>
 <template>
     <VnSubToolbar>
         <template #st-actions>
-            <QBtn color="primary" icon-right="download" no-caps @click="downloadCSV()">
+            <QBtn color="primary" icon-right="download" @click="downloadCSV()">
                 <QTooltip>{{ t('Download as CSV') }}</QTooltip>
             </QBtn>
         </template>
     </VnSubToolbar>
-    <RightMenu>
-        <template #right-panel>
-            <InvoiceOutNegativeFilter data-key="InvoiceOutNegative" />
-        </template>
-    </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <QTable
-            :columns="columns"
-            :rows="arrayData.store.data"
-            row-key="clientId"
-            class="full-width q-mt-md"
-        >
-            <template #body-cell-clientId="{ row }">
-                <QTd>
-                    <QBtn flat dense class="link"> {{ row.clientId }}</QBtn>
-                    <CustomerDescriptorProxy :id="row.clientId" />
-                </QTd>
-            </template>
-            <template #body-cell-ticketId="{ row }">
-                <QTd>
-                    <QBtn flat dense class="link"> {{ row.ticketFk }}</QBtn>
-                    <TicketDescriptorProxy :id="row.ticketFk" />
-                </QTd>
-            </template>
-            <template #body-cell-worker="{ row }">
-                <QTd>
-                    <QBtn class="no-uppercase link" flat dense>{{ row.workerName }}</QBtn>
-                    <WorkerDescriptorProxy :id="row.comercialId" />
-                </QTd>
-            </template>
-            <template #body-cell-active="{ row }">
-                <QTd>
-                    <QCheckbox :model-value="!!row.isActive" disable />
-                </QTd>
-            </template>
-            <template #body-cell-hasToInvoice="{ row }">
-                <QTd>
-                    <QCheckbox :model-value="!!row.hasToInvoice" disable />
-                </QTd>
-            </template>
-            <template #body-cell-verifiedData="{ row }">
-                <QTd>
-                    <QCheckbox :model-value="!!row.isTaxDataChecked" disable />
-                </QTd>
-            </template>
-        </QTable>
-    </QPage>
+    <VnTable
+        ref="tableRef"
+        data-key="negativeFilter"
+        url="InvoiceOuts/negativeBases"
+        :user-params="userParams"
+        :expr-builder="
+            (param, value) => {
+                switch (param) {
+                    case 'from':
+                    case 'to':
+                        return;
+                    default:
+                        return { [param]: value };
+                }
+            }
+        "
+        :limit="0"
+        :columns="columns"
+        auto-load
+        :is-editable="false"
+        :use-model="true"
+    >
+    </VnTable>
 </template>
 
-<style lang="scss" scoped>
-.col-content {
-    border-radius: 4px;
-    padding: 6px;
-}
-.no-uppercase {
-    text-transform: none;
-}
-</style>
-
 <i18n>
 es:
     Download as CSV: Descargar como CSV
diff --git a/src/pages/InvoiceOut/locale/en.yml b/src/pages/InvoiceOut/locale/en.yml
new file mode 100644
index 000000000..5ad92ed09
--- /dev/null
+++ b/src/pages/InvoiceOut/locale/en.yml
@@ -0,0 +1,25 @@
+invoiceOutModule:
+    customer: Client
+    amount: Amount
+    company: Company
+invoiceOutList:
+    tableVisibleColumns:
+        id: ID
+        ref: Reference
+        issued: Issued
+        created: Created
+        dueDate: Max date
+        invoiceOutSerial: Serial
+        ticket: Ticket
+        taxArea: Tax area
+DownloadPdf: Download PDF
+InvoiceOutSummary: Summary
+negativeBases:
+        country: Country
+        clientId: Client ID
+        base: Base
+        ticketId: Ticket
+        active: Active
+        hasToInvoice: Has to invoice
+        verifiedData: Verified data
+        commercial: Commercial
\ No newline at end of file
diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml
index b936c7b7e..a05125630 100644
--- a/src/pages/InvoiceOut/locale/es.yml
+++ b/src/pages/InvoiceOut/locale/es.yml
@@ -1,2 +1,31 @@
 Search invoice: Buscar factura emitida
 You can search by invoice reference: Puedes buscar por referencia de la factura
+invoiceOutModule:
+    customer: Cliente
+    amount: Importe
+    company: Empresa
+invoiceOutList:
+    tableVisibleColumns:
+        id: ID
+        ref: Referencia
+        issued: Fecha emisión
+        customer: Cliente
+        company: Empresa
+        amount: Importe
+        created: F. creación
+        dueDate: F. máxima
+        invoiceOutSerial: Serial
+        ticket: Ticket
+        taxArea: Area
+DownloadPdf: Descargar PDF
+InvoiceOutSummary: Resumen
+negativeBases:
+        country: País
+        clientId: ID del cliente
+        client: Cliente
+        base: Base
+        ticketId: Ticket
+        active: Activo
+        hasToInvoice: Debe facturar
+        verifiedData: Datos verificados
+        commercial: Comercial
\ No newline at end of file
diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index c2687e0fd..4c0959153 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -5,7 +5,9 @@ import { useRoute } from 'vue-router';
 
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
+import OrderDescriptorProxy from 'src/pages/Order/Card/OrderDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
@@ -45,8 +47,8 @@ const columns = computed(() => [
         align: 'left',
     },
     {
-        label: t('itemDiary.id'),
-        name: 'id',
+        label: t('itemDiary.origin'),
+        name: 'originId',
         align: 'left',
     },
     {
@@ -65,8 +67,8 @@ const columns = computed(() => [
     },
 
     {
-        label: t('itemDiary.client'),
-        name: 'client',
+        label: t('itemDiary.entity'),
+        name: 'entityId',
         align: 'left',
         format: (val) => dashIfEmpty(val),
     },
@@ -111,10 +113,28 @@ const getBadgeAttrs = (_date) => {
     return attrs;
 };
 
-const getIdDescriptor = (row) => {
-    let descriptor = EntryDescriptorProxy;
-    if (row.isTicket) descriptor = TicketDescriptorProxy;
-    return descriptor;
+const originTypeMap = {
+    entry: {
+        descriptor: EntryDescriptorProxy,
+        icon: 'vn:entry',
+    },
+    ticket: {
+        descriptor: TicketDescriptorProxy,
+        icon: 'vn:ticket',
+    },
+    order: {
+        descriptor: OrderDescriptorProxy,
+        icon: 'vn:basket',
+    },
+};
+
+const entityTypeMap = {
+    client: {
+        descriptor: CustomerDescriptorProxy,
+    },
+    supplier: {
+        descriptor: SupplierDescriptorProxy,
+    },
 };
 
 onMounted(async () => {
@@ -206,21 +226,28 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </QBadge>
                 </QTd>
             </template>
-            <template #body-cell-id="{ row }">
+            <template #body-cell-originId="{ row }">
                 <QTd @click.stop>
                     <component
-                        :is="getIdDescriptor(row)"
-                        :id="row.origin"
+                        :is="originTypeMap[row.originType]?.descriptor"
+                        :id="row.originId"
                         class="q-ma-none"
                         dense
                         style="font-size: 14px"
                     >
-                        {{ row.origin }}
+                        {{ row.originId }}
                     </component>
-                    <span class="link">{{ row.origin }}</span>
+                    <span class="link">
+                        <QIcon
+                            :name="originTypeMap[row.originType]?.icon"
+                            class="fill-icon q-mr-sm"
+                            size="xs"
+                        />
+                        {{ row.originId }}
+                    </span>
                 </QTd>
             </template>
-            <template #body-cell-client="{ row }">
+            <template #body-cell-entityId="{ row }">
                 <QTd @click.stop>
                     <QBadge
                         :color="row.highlighted ? 'warning' : 'transparent'"
@@ -228,11 +255,18 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         dense
                         style="font-size: 14px"
                     >
-                        <span v-if="row.isTicket" class="link">
-                            {{ dashIfEmpty(row.name) }}
-                            <CustomerDescriptorProxy :id="row.clientFk" />
+                        <component
+                            :is="entityTypeMap[row.entityType]?.descriptor"
+                            :id="row.entityId"
+                            class="q-ma-none"
+                            dense
+                            style="font-size: 14px"
+                        >
+                            {{ row.entityId }}
+                        </component>
+                        <span class="link">
+                            {{ dashIfEmpty(row.entityName) }}
                         </span>
-                        <span v-else>{{ dashIfEmpty(row.name) }}</span>
                     </QBadge>
                 </QTd>
             </template>
diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
index 103b3af59..7af3e0fa0 100644
--- a/src/pages/Item/Card/ItemSummary.vue
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -135,10 +135,6 @@ const isAdministrative = computed(() => {
                     :label="t('item.summary.nonRecycledPlastic')"
                     :value="item.nonRecycledPlastic"
                 />
-                <VnLv
-                    :label="t('item.summary.minSalesQuantity')"
-                    :value="item.minQuantity"
-                />
             </QCard>
             <QCard class="vn-one">
                 <component
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index 2fbe849d1..c9340dc1f 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -209,7 +209,7 @@ const decrement = (paramsObj, key) => {
                     <QItemSection>
                         <VnInput
                             v-model="params.scopeDays"
-                            :label="t('params.scopeDays')"
+                            :label="t('globals.daysOnward')"
                             type="number"
                             dense
                             outlined
@@ -281,7 +281,6 @@ en:
         requesterFk: Salesperson
         from: From
         to: To
-        scopeDays: Days onward
         mine: For me
         state: State
     dateFiltersTooltip: Cannot choose a range of dates and days onward at the same time
@@ -299,7 +298,6 @@ es:
         requesterFk: Comercial
         from: Desde
         to: Hasta
-        scopeDays: Días adelante
         mine: Para mi
         state: Estado
     dateFiltersTooltip: No se puede seleccionar un rango de fechas y días en adelante a la vez
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
index 363e9fcbe..0e855523c 100644
--- a/src/pages/Item/locale/en.yml
+++ b/src/pages/Item/locale/en.yml
@@ -14,10 +14,10 @@ shelvings:
     removeConfirmSubtitle: Are you sure you want to continue?
 itemDiary:
     date: Date
-    id: Id
+    origin: Origin
     state: State
     reference: Reference
-    client: Client
+    entity: Entity
     in: In
     out: Out
     balance: Balance
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
index 3ef040098..451b75698 100644
--- a/src/pages/Item/locale/es.yml
+++ b/src/pages/Item/locale/es.yml
@@ -14,10 +14,10 @@ shelvings:
     removeConfirmSubtitle: ¿Seguro que quieres continuar?
 itemDiary:
     date: Fecha
-    id: Id
+    origin: Origen
     state: Estado
     reference: Referencia
-    client: Cliente
+    entity: Entidad
     in: Entrada
     out: Salida
     balance: Balance
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 60e86d04e..4d84a32fc 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -60,7 +60,7 @@ const filter = {
 const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
-    data.value = useCardDescription(entity.client.name, entity.id);
+    data.value = useCardDescription(entity?.client?.name, entity?.id);
     state.set('OrderDescriptor', entity);
 };
 
@@ -131,7 +131,7 @@ const total = ref(null);
                     color="primary"
                     :to="{ name: 'CustomerCard', params: { id: entity.clientFk } }"
                 >
-                    <QTooltip>{{ t('claim.card.customerSummary') }}</QTooltip>
+                    <QTooltip>{{ t('claim.customerSummary') }}</QTooltip>
                 </QBtn>
             </QCardActions>
         </template>
diff --git a/src/pages/Order/Card/OrderDescriptorProxy.vue b/src/pages/Order/Card/OrderDescriptorProxy.vue
new file mode 100644
index 000000000..04ebb054a
--- /dev/null
+++ b/src/pages/Order/Card/OrderDescriptorProxy.vue
@@ -0,0 +1,17 @@
+<script setup>
+import OrderDescriptor from './OrderDescriptor.vue';
+import OrderSummary from './OrderSummary.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+</script>
+
+<template>
+    <QPopupProxy>
+        <OrderDescriptor v-if="$props.id" :id="$props.id" :summary="OrderSummary" />
+    </QPopupProxy>
+</template>
diff --git a/src/pages/Order/Card/OrderForm.vue b/src/pages/Order/Card/OrderForm.vue
index 98bcf4d3a..e4dfcd0e0 100644
--- a/src/pages/Order/Card/OrderForm.vue
+++ b/src/pages/Order/Card/OrderForm.vue
@@ -1,11 +1,10 @@
 <script setup>
 import { useRoute, useRouter } from 'vue-router';
-import { reactive, ref } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { useState } from 'composables/useState';
 import FormModel from 'components/FormModel.vue';
-import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
@@ -18,29 +17,9 @@ const ORDER_MODEL = 'order';
 
 const router = useRouter();
 const isNew = Boolean(!route.params.id);
-const initialFormState = reactive({
-    clientFk: null,
-    addressFk: null,
-    agencyModeFk: null,
-    landed: null,
-});
 const clientList = ref([]);
 const agencyList = ref([]);
 const addressList = ref([]);
-const clientId = ref(null);
-
-const onClientsFetched = (data) => {
-    clientList.value = data;
-    initialFormState.clientFk = Number(route.query?.clientFk) || null;
-    clientId.value = initialFormState.clientFk;
-
-    const client = clientList.value.find(
-        (client) => client.id === initialFormState.clientFk
-    );
-    if (!client?.defaultAddressFk)
-        throw new Error(t(`No default address found for the client`));
-    fetchAddressList(client.defaultAddressFk);
-};
 
 const fetchAddressList = async (addressId) => {
     try {
@@ -128,28 +107,19 @@ const onClientChange = async (clientId) => {
     }
 };
 
-async function onDataSaved(data) {
-    await router.push({ path: `/order/${data}/catalog` });
+async function onDataSaved({ id }) {
+    await router.push({ path: `/order/${id}/catalog` });
 }
 </script>
 
 <template>
-    <FetchData
-        url="Clients"
-        @on-fetch="(data) => onClientsFetched(data)"
-        :filter="{ fields: ['id', 'name', 'defaultAddressFk'] }"
-        auto-load
-    />
     <VnSubToolbar v-if="isNew" />
     <div class="q-pa-md">
         <FormModel
-            :url="!isNew ? `Orders/${route.params.id}` : null"
-            url-create="Orders/new"
+            :url="`Orders/${route.params.id}`"
             @on-data-saved="onDataSaved"
             :model="ORDER_MODEL"
-            :form-initial-data="isNew ? initialFormState : null"
-            :observe-form-changes="!isNew"
-            :mapper="isNew ? orderMapper : null"
+            :mapper="orderMapper"
             :filter="orderFilter"
             @on-fetch="fetchOrderDetails"
             auto-load
@@ -157,11 +127,15 @@ async function onDataSaved(data) {
             <template #form="{ data }">
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnSelect
+                        url="Clients"
                         :label="t('order.form.clientFk')"
                         v-model="data.clientFk"
                         :options="clientList"
                         option-value="id"
                         option-label="name"
+                        :filter="{
+                            fields: ['id', 'name', 'defaultAddressFk'],
+                        }"
                         hide-selected
                         @update:model-value="onClientChange"
                     >
@@ -183,7 +157,6 @@ async function onDataSaved(data) {
                         option-label="street"
                         hide-selected
                         :disable="!addressList?.length"
-                        @update:model-value="onAddressChange"
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 7961b250e..cb708fb1d 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -196,7 +196,7 @@ const detailsColumns = ref([
                                     {{ props.row.quantity }}
                                 </QTd>
                                 <QTd key="price" :props="props">
-                                    {{ props.row.price }}
+                                    {{ toCurrency(props.row.price) }}
                                 </QTd>
                                 <QTd key="amount" :props="props">
                                     {{
diff --git a/src/pages/Order/OrderCatalog.vue b/src/pages/Order/OrderCatalog.vue
index 081a2cd2f..2cf6e1c29 100644
--- a/src/pages/Order/OrderCatalog.vue
+++ b/src/pages/Order/OrderCatalog.vue
@@ -4,7 +4,7 @@ import { useRoute } from 'vue-router';
 import { onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'components/ui/VnPaginate.vue';
-import OrderCatalogItem from 'pages/Order/Card/OrderCatalogItem.vue';
+import CatalogItem from 'components/ui/CatalogItem.vue';
 import OrderCatalogFilter from 'pages/Order/Card/OrderCatalogFilter.vue';
 
 const route = useRoute();
@@ -77,7 +77,12 @@ function extractValueTags(items) {
                         <div v-if="rows && !rows?.length" class="no-result">
                             {{ t('globals.noResults') }}
                         </div>
-                        <OrderCatalogItem v-for="row in rows" :key="row.id" :item="row" />
+                        <CatalogItem
+                            v-for="row in rows"
+                            :key="row.id"
+                            :item="row"
+                            is-catalog
+                        />
                     </div>
                 </template>
             </VnPaginate>
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
index 6758fb170..21b4efb9d 100644
--- a/src/pages/Order/OrderLines.vue
+++ b/src/pages/Order/OrderLines.vue
@@ -1,33 +1,168 @@
 <script setup>
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import { useQuasar } from 'quasar';
 
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import FetchData from 'components/FetchData.vue';
-import VnLv from 'components/ui/VnLv.vue';
-import FetchedTags from 'components/ui/FetchedTags.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
-import VnImg from 'components/ui/VnImg.vue';
-
 import { toCurrency, toDate } from 'src/filters';
 import axios from 'axios';
-import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import FetchedTags from 'src/components/ui/FetchedTags.vue';
+import { useStateStore } from 'stores/useStateStore';
 
+const stateStore = useStateStore();
 const route = useRoute();
 const { t } = useI18n();
 const quasar = useQuasar();
+const componentKey = ref(0);
+const tableLinesRef = ref();
+const order = ref();
 const orderSummary = ref({
     total: null,
     vat: null,
 });
-const componentKey = ref(0);
-const order = ref(0);
 
-const refresh = () => {
-    componentKey.value += 1;
-};
+const lineFilter = ref({
+    include: [
+        {
+            relation: 'item',
+            scope: {
+                fields: [
+                    'id',
+                    'name',
+                    'subName',
+                    'image',
+                    'tag4',
+                    'value4',
+                    'tag5',
+                    'value5',
+                    'tag6',
+                    'value6',
+                    'tag7',
+                    'value7',
+                    'tag8',
+                    'value8',
+                    'tag9',
+                    'value9',
+                    'tag10',
+                    'value10',
+                ],
+            },
+        },
+        {
+            relation: 'warehouse',
+            scope: {
+                fields: ['id', 'name'],
+            },
+        },
+    ],
+    where: { orderFk: route.params.id },
+});
+
+const columns = computed(() => [
+    {
+        align: 'center',
+        label: t('lines.image'),
+        name: 'image',
+        columnField: {
+            component: VnImg,
+            attrs: (id) => {
+                return {
+                    id,
+                    width: '50px',
+                };
+            },
+        },
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        name: 'id',
+        label: t('lines.item'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+        format: (row) => row?.item?.id,
+    },
+    {
+        align: 'left',
+        name: 'itemFk',
+        label: t('globals.description'),
+        isTitle: true,
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'Items',
+            fields: ['id', 'name', 'subName'],
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row) => row?.item?.name,
+    },
+    {
+        align: 'left',
+        name: 'warehouseFk',
+        label: t('lines.warehouse'),
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'Warehouses',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row) => row?.warehouse?.name,
+    },
+    {
+        align: 'left',
+        name: 'shipped',
+        label: t('lines.shipped'),
+        cardVisible: true,
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: (row) => toDate(row.shipped),
+    },
+    {
+        align: 'left',
+        name: 'quantity',
+        label: t('lines.quantity'),
+    },
+    {
+        align: 'left',
+        name: 'price',
+        label: t('lines.price'),
+        cardVisible: true,
+        format: (row) => toCurrency(row.price),
+    },
+    {
+        align: 'left',
+        name: 'amount',
+        label: t('lines.amount'),
+        format: (row) => toCurrency(row.amount),
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: (row) => confirmRemove(row),
+                isPrimary: true,
+            },
+        ],
+    },
+]);
 
 function confirmRemove(item) {
     quasar.dialog({
@@ -41,6 +176,8 @@ function confirmRemove(item) {
 }
 
 async function remove(item) {
+    console.log('item: ', item);
+    console.log('id: ', route.params.id);
     await axios.post('OrderRows/removes', {
         actualOrderId: route.params.id,
         rows: [item.id],
@@ -49,7 +186,7 @@ async function remove(item) {
         message: t('globals.dataDeleted'),
         type: 'positive',
     });
-    refresh();
+    tableLinesRef.value.reload();
 }
 
 async function confirmOrder() {
@@ -59,56 +196,6 @@ async function confirmOrder() {
         type: 'positive',
     });
 }
-
-const detailsColumns = ref([
-    {
-        name: 'img',
-        label: '',
-        field: (row) => row?.item?.id,
-    },
-    {
-        name: 'item',
-        label: t('order.summary.item'),
-        field: (row) => row?.item?.id,
-        sortable: true,
-    },
-    {
-        name: 'description',
-        label: t('globals.description'),
-        field: (row) => row?.item?.name,
-    },
-    {
-        name: 'warehouse',
-        label: t('warehouse'),
-        field: (row) => row?.warehouse?.name,
-        sortable: true,
-    },
-    {
-        name: 'shipped',
-        label: t('shipped'),
-        field: (row) => toDate(row?.shipped),
-    },
-    {
-        name: 'quantity',
-        label: t('order.summary.quantity'),
-        field: (row) => row?.quantity,
-    },
-    {
-        name: 'price',
-        label: t('order.summary.price'),
-        field: (row) => toCurrency(row?.price),
-    },
-    {
-        name: 'amount',
-        label: t('order.summary.amount'),
-        field: (row) => toCurrency(row?.quantity * row?.price),
-    },
-    {
-        name: 'actions',
-        label: '',
-        field: (row) => row?.id,
-    },
-]);
 </script>
 
 <template>
@@ -130,122 +217,61 @@ const detailsColumns = ref([
         @on-fetch="(data) => (orderSummary.vat = data)"
         auto-load
     />
-    <QPage :key="componentKey" class="column items-center q-pa-md">
+    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+        <QCard class="order-lines-summary q-pa-lg">
+            <p class="header text-right block">
+                {{ t('summary') }}
+            </p>
+            <VnLv
+                v-if="orderSummary.vat && orderSummary.total"
+                :label="t('subtotal') + ': '"
+                :value="toCurrency(orderSummary.total - orderSummary.vat)"
+            />
+            <VnLv
+                v-if="orderSummary.vat"
+                :label="t('VAT') + ': '"
+                :value="toCurrency(orderSummary?.vat)"
+            />
+            <VnLv
+                v-if="orderSummary.total"
+                :label="t('total') + ': '"
+                :value="toCurrency(orderSummary?.total)"
+            />
+        </QCard>
+    </QDrawer>
+    <QPage :key="componentKey" class="column items-center">
         <div class="order-list full-width">
             <div v-if="!orderSummary.total" class="no-result">
                 {{ t('globals.noResults') }}
             </div>
-
-            <QDrawer side="right" :width="270" show-if-above>
-                <QCard class="order-lines-summary q-pa-lg">
-                    <p class="header text-right block">
-                        {{ t('summary') }}
-                    </p>
-                    <VnLv
-                        v-if="orderSummary.vat && orderSummary.total"
-                        :label="t('subtotal')"
-                        :value="toCurrency(orderSummary.total - orderSummary.vat)"
-                    />
-                    <VnLv
-                        v-if="orderSummary.vat"
-                        :label="t('VAT')"
-                        :value="toCurrency(orderSummary?.vat)"
-                    />
-                    <VnLv
-                        v-if="orderSummary.total"
-                        :label="t('total')"
-                        :value="toCurrency(orderSummary?.total)"
-                    />
-                </QCard>
-            </QDrawer>
-            <VnPaginate
+            <VnTable
+                ref="tableLinesRef"
                 data-key="OrderLines"
                 url="OrderRows"
-                :limit="20"
+                :columns="columns"
+                :right-search="false"
+                :use-model="true"
                 auto-load
-                :filter="{
-                    include: [
-                        {
-                            relation: 'item',
-                        },
-                        {
-                            relation: 'warehouse',
-                        },
-                    ],
-                    where: { orderFk: route.params.id },
-                }"
+                :user-filter="lineFilter"
             >
-                <template #body="{ rows }">
-                    <div class="q-pa-md">
-                        <QTable
-                            :columns="detailsColumns"
-                            :rows="rows"
-                            flat
-                            class="full-width"
-                            style="text-align: center"
-                        >
-                            <template #header="props">
-                                <QTr class="tr-header" :props="props">
-                                    <QTh
-                                        v-for="col in props.cols"
-                                        :key="col.name"
-                                        :props="props"
-                                        style="text-align: center"
-                                    >
-                                        {{ t(col.label) }}
-                                    </QTh>
-                                </QTr>
-                            </template>
-                            <template #body-cell-img="{ value }">
-                                <QTd>
-                                    <div class="image-wrapper">
-                                        <VnImg :id="value" class="rounded" />
-                                    </div>
-                                </QTd>
-                            </template>
-                            <template #body-cell-item="{ value }">
-                                <QTd class="item">
-                                    <span class="link">
-                                        <QBtn flat>
-                                            {{ value }}
-                                        </QBtn>
-                                        <ItemDescriptorProxy :id="value" />
-                                    </span>
-                                </QTd>
-                            </template>
-                            <template #body-cell-description="{ row, value }">
-                                <QTd>
-                                    <div
-                                        class="row column full-width justify-between items-start"
-                                    >
-                                        {{ value }}
-                                        <div v-if="value" class="subName">
-                                            {{ value.toUpperCase() }}
-                                        </div>
-                                    </div>
-                                    <FetchedTags :item="row.item" :max-length="6" />
-                                </QTd>
-                            </template>
-
-                            <template #body-cell-actions="{ value }">
-                                <QTd>
-                                    <QIcon
-                                        name="delete"
-                                        color="primary"
-                                        size="sm"
-                                        class="cursor-pointer"
-                                        @click.stop="confirmRemove(value)"
-                                    >
-                                        <QTooltip>{{ t('Remove thermograph') }}</QTooltip>
-                                    </QIcon>
-                                </QTd>
-                            </template>
-                        </QTable>
+                <template #column-image="{ row }">
+                    <div class="image-wrapper">
+                        <VnImg :id="parseInt(row?.item?.image)" class="rounded" />
                     </div>
                 </template>
-            </VnPaginate>
+
+                <template #column-itemFk="{ row }">
+                    <div class="row column full-width justify-between items-start">
+                        {{ row?.item?.name }}
+                        <div v-if="row?.item?.subName" class="subName">
+                            {{ row?.item?.subName.toUpperCase() }}
+                        </div>
+                    </div>
+                    <FetchedTags :item="row?.item" :max-length="6" />
+                </template>
+            </VnTable>
         </div>
-        <QPageSticky :offset="[20, 20]" v-if="!order?.isConfirmed">
+        <QPageSticky :offset="[20, 20]" v-if="!order?.isConfirmed" style="z-index: 2">
             <QBtn fab icon="check" color="primary" @click="confirmOrder()" />
             <QTooltip>
                 {{ t('confirm') }}
@@ -253,7 +279,8 @@ const detailsColumns = ref([
         </QPageSticky>
     </QPage>
 </template>
-<style lang="scss">
+
+<style lang="scss" scoped>
 .order-lines-summary {
     .vn-label-value {
         display: flex;
@@ -274,8 +301,13 @@ const detailsColumns = ref([
         }
     }
 }
-</style>
-<style lang="scss" scoped>
+
+.image-wrapper {
+    height: 50px;
+    width: 50px;
+    margin-left: 30%;
+}
+
 .header {
     color: $primary;
     font-weight: bold;
@@ -284,12 +316,6 @@ const detailsColumns = ref([
     display: inline-block;
 }
 
-.image-wrapper {
-    height: 50px;
-    width: 50px;
-    margin-left: 30%;
-}
-
 .no-result {
     font-size: 24px;
     font-weight: bold;
@@ -302,6 +328,7 @@ const detailsColumns = ref([
     color: var(--vn-label-color);
 }
 </style>
+
 <i18n>
 en:
     summary: Summary
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 0e6e11482..68c4e57a7 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -1,30 +1,135 @@
 <script setup>
+import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import { onMounted, onUnmounted } from 'vue';
-import { useRouter } from 'vue-router';
-import { useStateStore } from 'stores/useStateStore';
-import { toCurrency, toDate } from 'src/filters';
-import CardList from 'components/ui/CardList.vue';
-import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
-import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import VnLv from 'components/ui/VnLv.vue';
+import { computed, ref } from 'vue';
+import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import OrderFilter from 'pages/Order/Card/OrderFilter.vue';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
-const stateStore = useStateStore();
-const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
+const tableRef = ref();
+const clientList = ref([]);
+const agencyList = ref([]);
+const selectedAddress = ref();
 
-onMounted(() => (stateStore.rightDrawer = true));
-onUnmounted(() => (stateStore.rightDrawer = false));
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('module.id'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+    },
+    {
+        align: 'left',
+        name: 'clientName',
+        label: t('module.customer'),
+        isTitle: true,
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'Clients',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'name',
+        label: t('module.salesPerson'),
+        component: 'select',
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            where: { role: 'salesPerson' },
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'isConfirmed',
+        label: t('module.isConfirmed'),
+    },
+    {
+        align: 'left',
+        name: 'created',
+        label: t('module.created'),
+        component: 'date',
+        cardVisible: true,
+        format: (row) => toDate(row?.landed),
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'landed',
+        label: t('module.landed'),
+        component: 'date',
+        format: (row) => toDate(row?.landed),
+        columnField: {
+            component: null,
+        },
+        style: 'color="positive"',
+    },
+    {
+        align: 'left',
+        name: 'hour',
+        label: t('module.hour'),
+        format: ({ hourTheoretical, hourEffective }) =>
+            dashIfEmpty(hourTheoretical || hourEffective),
+    },
+    {
+        align: 'left',
+        name: 'agencyName',
+        label: t('module.agency'),
+        component: 'select',
+        cardVisible: true,
+        attrs: {
+            url: 'Agencies',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'total',
+        label: t('module.total'),
+        format: ({ total }) => toCurrency(total),
+        cardVisible: true,
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('InvoiceOutSummary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, OrderSummary),
+            },
+        ],
+    },
+]);
 
-function navigate(id) {
-    router.push({ path: `/order/${id}` });
+async function fetchClientAddress(id, data) {
+    console.log('data: ', data);
+    const clientData = await axios.get(`Clients/${id}`);
+    selectedAddress.value = clientData.data.defaultAddressFk;
+    data.addressId = selectedAddress.value;
 }
 </script>
 <template>
@@ -33,100 +138,52 @@ function navigate(id) {
         :label="t('Search order')"
         :info="t('You can search orders by reference')"
     />
-    <RightMenu>
-        <template #right-panel>
-            <OrderFilter data-key="OrderList" />
+    <VnTable
+        ref="tableRef"
+        data-key="OrderList"
+        url="Orders/filter"
+        :create="{
+            urlCreate: 'Orders/new',
+            title: 'Create Order',
+            onDataSaved: (url) => {
+                tableRef.redirect(url);
+            },
+            formInitialData: {
+                active: true,
+                addressId: null,
+            },
+        }"
+        :columns="columns"
+        redirect="order"
+        auto-load
+    >
+        <template #more-create-dialog="{ data }">
+            <VnSelect
+                url="Clients"
+                v-model="data.id"
+                :label="t('module.customer')"
+                :options="clientList"
+                option-value="id"
+                option-label="name"
+                @update:model-value="(id) => fetchClientAddress(id, data)"
+            />
+            <VnSelect
+                url="Clients"
+                v-model="selectedAddress"
+                :label="t('module.address')"
+                :options="selectedAddress"
+                option-value="defaultAddressFk"
+                option-label="street"
+            />
+            <VnInputDate v-model="data.landed" :label="t('module.landed')" />
+            <VnSelect
+                url="Agencies"
+                v-model="data.agencyModeId"
+                :label="t('module.agency')"
+                :options="agencyList"
+                option-value="id"
+                option-label="name"
+            />
         </template>
-    </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="OrderList"
-                url="Orders/filter"
-                :limit="20"
-                :order="['landed DESC', 'clientFk', 'id DESC']"
-                :user-params="{ showEmpty: false }"
-                :keep-opts="['userParams']"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :id="row.id"
-                        :title="`${row?.clientName} (${row?.clientFk})`"
-                        @click="navigate(row.id)"
-                    >
-                        <template #list-items>
-                            <VnLv
-                                :label="t('order.field.salesPersonFk')"
-                                :title-label="t('order.field.salesPersonFk')"
-                            >
-                                <template #value>
-                                    <span class="link" @click.stop>
-                                        {{ row?.name || '-' }}
-                                        <WorkerDescriptorProxy :id="row?.salesPersonFk" />
-                                    </span>
-                                </template>
-                            </VnLv>
-                            <VnLv
-                                :label="t('order.field.clientFk')"
-                                :title-label="t('order.field.clientFk')"
-                            >
-                                <template #value>
-                                    <span class="link" @click.stop>
-                                        {{ row?.clientName || '-' }}
-                                        <CustomerDescriptorProxy :id="row?.clientFk" />
-                                    </span>
-                                </template>
-                            </VnLv>
-                            <VnLv
-                                :label="t('order.field.isConfirmed')"
-                                :value="row?.isConfirmed === 1"
-                            />
-                            <VnLv
-                                :label="t('order.field.created')"
-                                :value="toDate(row?.created)"
-                            />
-                            <VnLv :label="t('order.field.landed')">
-                                <template #value>
-                                    <QBadge text-color="black" color="positive" dense>
-                                        {{ toDate(row?.landed) }}
-                                    </QBadge>
-                                </template>
-                            </VnLv>
-                            <VnLv
-                                :label="t('order.field.hour')"
-                                :value="row.hourTheoretical || row.hourEffective"
-                            />
-                            <VnLv
-                                :label="t('order.field.agency')"
-                                :value="row?.agencyName"
-                            />
-                            <VnLv
-                                :label="t('order.field.total')"
-                                :value="toCurrency(row?.total)"
-                            />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, OrderSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky :offset="[20, 20]">
-            <RouterLink :to="{ name: 'OrderCreate' }">
-                <QBtn fab icon="add" color="primary" />
-                <QTooltip>
-                    {{ t('order.list.newOrder') }}
-                </QTooltip>
-            </RouterLink>
-        </QPageSticky>
-    </QPage>
+    </VnTable>
 </template>
diff --git a/src/pages/Order/locale/en.yml b/src/pages/Order/locale/en.yml
new file mode 100644
index 000000000..b630a18ed
--- /dev/null
+++ b/src/pages/Order/locale/en.yml
@@ -0,0 +1,22 @@
+module:
+    id: ID
+    name: Name
+    customer: Client
+    isConfirmed: Confirmed
+    created: Created
+    landed: Landed
+    hour: Hour
+    agency: Agency
+    total: Total
+    salesPerson: Sales Person
+    address: Address
+lines:
+    item: Item
+    warehouse: Warehouse
+    shipped: Shipped
+    quantity: Quantity
+    price: Price
+    amount: Amount
+    image: Image
+params:
+    tagGroups: Tags
diff --git a/src/pages/Order/locale/es.yml b/src/pages/Order/locale/es.yml
new file mode 100644
index 000000000..055d22719
--- /dev/null
+++ b/src/pages/Order/locale/es.yml
@@ -0,0 +1,22 @@
+module:
+    id: ID
+    name: Nombre
+    customer: Cliente
+    isConfirmed: Confirmado
+    created: Creado
+    landed: F. Entrega
+    hour: Hora
+    agency: Agencia
+    total: Total
+    salesPerson: Comercial
+    address: Dirección
+lines:
+    item: Artículo
+    warehouse: Almacén
+    shipped: Envío
+    quantity: Cantidad
+    price: Precio
+    amount: Importe
+    image: Imagen
+params:
+    tagGroups: Tags
diff --git a/src/pages/Route/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue
index eb301c9ba..42aede8a0 100644
--- a/src/pages/Route/Agency/AgencyList.vue
+++ b/src/pages/Route/Agency/AgencyList.vue
@@ -78,10 +78,12 @@ const columns = computed(() => [
         :columns="columns"
         :right-search="false"
         :use-model="true"
+        redirect="agency"
+        default-mode="card"
     />
 </template>
 <i18n>
-    es: 
+    es:
         isOwn: Tiene propietario
         isAnyVolumeAllowed: Permite cualquier volumen
         Search agency: Buscar agencia
diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue
deleted file mode 100644
index bea58b2d8..000000000
--- a/src/pages/Route/Cmr/CmrFilter.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-
-const { t } = useI18n();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
-
-const countries = ref();
-const warehouses = ref();
-</script>
-<template>
-    <FetchData url="Countries" @on-fetch="(data) => (countries = data)" auto-load />
-    <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params }">
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('route.cmr.list.cmrFk')"
-                        v-model="params.cmrFk"
-                        is-outlined
-                    >
-                        <template #prepend>
-                            <QIcon name="article" size="sm"></QIcon>
-                        </template>
-                    </VnInput>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <QCheckbox
-                        :label="t('route.cmr.list.hasCmrDms')"
-                        v-model="params.hasCmrDms"
-                        lazy-rules
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('route.cmr.list.ticketFk')"
-                        v-model="params.ticketFk"
-                        is-outlined
-                    >
-                        <template #prepend>
-                            <QIcon name="vn:ticket" size="sm"></QIcon>
-                        </template>
-                    </VnInput>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('route.cmr.list.routeFk')"
-                        v-model="params.routeFk"
-                        is-outlined
-                    >
-                        <template #prepend>
-                            <QIcon name="vn:delivery" size="sm"></QIcon>
-                        </template>
-                    </VnInput>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('route.cmr.list.clientFk')"
-                        v-model="params.clientFk"
-                        is-outlined
-                    >
-                        <template #prepend>
-                            <QIcon name="vn:client" size="sm"></QIcon>
-                        </template>
-                    </VnInput>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection v-if="!countries">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="countries">
-                    <VnSelect
-                        :label="t('route.cmr.list.country')"
-                        v-model="params.country"
-                        :options="countries"
-                        option-label="name"
-                        option-value="id"
-                        transition-show="jump-down"
-                        transition-hide="jump-up"
-                        emit-value
-                        map-options
-                        dense
-                        outlined
-                        rounded
-                    >
-                        <template #prepend>
-                            <QIcon name="flag" size="sm"></QIcon>
-                        </template>
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <VnSelect
-                    :label="t('globals.warehouse')"
-                    :options="warehouses"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="params.warehouseFk"
-                    rounded
-                    dense
-                    outlined
-                >
-                </VnSelect>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        v-model="params.shipped"
-                        :label="t('route.cmr.list.shipped')"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-<i18n>
-    en:
-        params:
-            cmrFk: Cmr id
-            hasCmrDms: Attached in gestdoc
-            ticketFk: Ticketd id
-            country: Country
-            clientFk: Client id
-            shipped: Preparation date
-
-    es:
-        params:
-            cmrFk: Id cmr
-            hasCmrDms: Gestdoc
-            ticketFk: Id ticket
-            country: País
-            clientFk: Id cliente
-            shipped: Fecha preparación
-</i18n>
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 74a070cbf..6dfd3a1e5 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -2,82 +2,93 @@
 import { onBeforeMount, onMounted, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { Notify } from 'quasar';
-import axios from 'axios';
-import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useSession } from 'src/composables/useSession';
 import { toDate } from 'filters/index';
-import CmrFilter from './CmrFilter.vue';
-import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
-import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import { useStateStore } from 'src/stores/useStateStore';
 
+import axios from 'axios';
+import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
+
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 const state = useStateStore();
-const selected = ref([]);
 const warehouses = ref([]);
-
+const selectedRows = ref([]);
 const columns = computed(() => [
     {
+        align: 'left',
         name: 'cmrFk',
         label: t('route.cmr.list.cmrFk'),
-        field: (row) => row.cmrFk,
-        sortable: true,
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
     },
     {
+        align: 'left',
         name: 'hasCmrDms',
         label: t('route.cmr.list.hasCmrDms'),
-        field: (row) => row.hasCmrDms,
-        align: 'center',
-        sortable: true,
+        component: 'checkbox',
+        cardVisible: true,
     },
     {
-        name: 'ticketFk',
         label: t('route.cmr.list.ticketFk'),
-        field: (row) => row.ticketFk,
-        sortable: true,
+        name: 'ticketFk',
     },
     {
-        name: 'routeFkFk',
         label: t('route.cmr.list.routeFk'),
-        field: (row) => row.routeFk,
-        sortable: true,
+        name: 'routeFk',
     },
     {
-        name: 'clientFk',
         label: t('route.cmr.list.clientFk'),
-        field: (row) => row.clientFk,
-        sortable: true,
+        name: 'clientFk',
     },
     {
-        name: 'country',
-        label: t('route.cmr.list.country'),
-        field: (row) => row.country,
         align: 'left',
-        sortable: true,
+        label: t('route.cmr.list.country'),
+        name: 'country',
+        cardVisible: true,
     },
     {
-        name: 'shipped',
-        label: t('route.cmr.list.shipped'),
-        field: (row) => toDate(row.shipped),
         align: 'center',
-        sortable: true,
+        label: t('route.cmr.list.shipped'),
+        name: 'shipped',
+        cardVisible: true,
+        component: 'date',
+        columnFilter: {
+            alias: 'c',
+            inWhere: true,
+        },
+        format: ({ date }) => toDate(date),
     },
     {
+        align: 'center',
         name: 'warehouseFk',
         label: t('globals.warehouse'),
-        field: ({ warehouseFk }) => warehouseFk,
-        align: 'center',
-        sortable: true,
+        component: 'select',
+        attrs: {
+            url: 'warehouses',
+            fields: ['id', 'name'],
+            optionLabel: 'name',
+            optionValue: 'id',
+        },
     },
     {
-        name: 'icons',
-        align: 'center',
-        field: (row) => row.cmrFk,
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('Ver cmr'),
+                icon: 'visibility',
+                isPrimary: true,
+                action: (row) => window.open(getCmrUrl(row?.cmrFk), '_blank'),
+            },
+        ],
     },
 ]);
 
@@ -95,7 +106,7 @@ function getCmrUrl(value) {
     return `${getApiUrl()}/api/Routes/${value}/cmr?access_token=${token}`;
 }
 function downloadPdfs() {
-    if (!selected.value.length) {
+    if (!selectedRows.value.length) {
         Notify.create({
             message: t('globals.noSelectedRows'),
             type: 'warning',
@@ -103,42 +114,51 @@ function downloadPdfs() {
         return;
     }
     let cmrs = [];
-    for (let value of selected.value) cmrs.push(value.cmrFk);
+    for (let value of selectedRows.value) cmrs.push(value.cmrFk);
     // prettier-ignore
     return window.open(`${getApiUrl()}/api/Routes/downloadCmrsZip?ids=${cmrs.join(',')}&access_token=${token}`);
 }
 </script>
 <template>
+    <VnSubToolbar>
+        <template #st-actions>
+            <QBtn
+                icon="cloud_download"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows?.length"
+                @click="downloadPdfs"
+            >
+                <QTooltip>{{ t('route.cmr.list.downloadCmrs') }}</QTooltip>
+            </QBtn>
+        </template>
+    </VnSubToolbar>
     <VnTable
         ref="tableRef"
         data-key="CmrList"
         url="Routes/cmrs"
-        order="cmrFk DESC"
         :columns="columns"
         :right-search="true"
-        :use-model="true"
-    />
+        default-mode="table"
+        v-model:selected="selectedRows"
+        table-height="85vh"
+        :table="{
+            'row-key': 'cmrFk',
+            selection: 'multiple',
+        }"
+        :disable-option="{ card: true }"
+    >
+        <template #column-ticketFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.ticketFk }}
+                <TicketDescriptorProxy :id="row.ticketFk" />
+            </span>
+        </template>
+        <template #column-clientFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.ticketFk }}
+                <CustomerDescriptorProxy :id="row.clientFk" />
+            </span>
+        </template>
+    </VnTable>
 </template>
-<style lang="scss" scoped>
-.list {
-    padding-top: 15px;
-    padding-bottom: 15px;
-    max-width: 1000px;
-    width: 100%;
-}
-.grid-style-transition {
-    transition: transform 0.28s, background-color 0.28s;
-}
-#true {
-    background-color: $positive;
-}
-#false {
-    background-color: $negative;
-}
-:deep(.q-table th) {
-    max-width: 80px;
-}
-:deep(.q-table th:nth-child(3)) {
-    max-width: 100px;
-}
-</style>
diff --git a/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue b/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
deleted file mode 100644
index f20619033..000000000
--- a/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-<script setup>
-import { useDialogPluginComponent } from 'quasar';
-import { useI18n } from 'vue-i18n';
-import { reactive, ref } from 'vue';
-import axios from 'axios';
-import FetchData from 'components/FetchData.vue';
-import RoadmapAddStopForm from 'pages/Route/Roadmap/RoadmapAddStopForm.vue';
-
-const emit = defineEmits([...useDialogPluginComponent.emits]);
-const { dialogRef, onDialogHide } = useDialogPluginComponent();
-
-const { t } = useI18n();
-const props = defineProps({
-    roadmapFk: {
-        type: Number,
-        required: true,
-    },
-});
-
-const isLoading = ref(false);
-const roadmapStopForm = reactive({
-    roadmapFk: Number(props.roadmapFk) || 0,
-    warehouseFk: null,
-    eta: new Date().toISOString(),
-    description: '',
-});
-
-const updateDefaultStop = (data) => {
-    const eta = new Date(data.etd);
-    eta.setDate(eta.getDate() + 1);
-    roadmapStopForm.eta = eta.toISOString();
-};
-
-const onSave = async () => {
-    isLoading.value = true;
-    try {
-        await axios.post('RoadmapStops', { ...roadmapStopForm });
-        emit('ok');
-    } finally {
-        isLoading.value = false;
-        emit('hide');
-    }
-};
-</script>
-<template>
-    <FetchData
-        :url="`Roadmaps/${roadmapFk}`"
-        auto-load
-        :filter="{ fields: ['etd'] }"
-        @on-fetch="updateDefaultStop"
-    />
-    <QDialog ref="dialogRef" @hide="onDialogHide">
-        <QCard class="q-pa-lg">
-            <QCardSection class="row absolute absolute-top z-fullscreen">
-                <QSpace />
-                <QBtn icon="close" flat round dense v-close-popup />
-            </QCardSection>
-            <RoadmapAddStopForm
-                :roadmap-fk="roadmapFk"
-                :form-data="roadmapStopForm"
-                layout="dialog"
-            />
-            <QCardActions align="right">
-                <QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
-                <QBtn
-                    :label="t('globals.confirm')"
-                    color="primary"
-                    :loading="isLoading"
-                    @click="onSave"
-                    unelevated
-                />
-            </QCardActions>
-        </QCard>
-    </QDialog>
-</template>
-<style lang="scss" scoped>
-.card-section {
-    gap: 16px;
-}
-</style>
-
-<i18n>
-es:
-    Warehouse: Almacén
-    ETA date: Fecha ETA
-    ETA time: Hora ETA
-    Description: Descripción
-</i18n>
diff --git a/src/pages/Route/Roadmap/RoadmapCreate.vue b/src/pages/Route/Roadmap/RoadmapCreate.vue
deleted file mode 100644
index fb3b29f33..000000000
--- a/src/pages/Route/Roadmap/RoadmapCreate.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import VnRow from 'components/ui/VnRow.vue';
-import FormModel from 'components/FormModel.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInput from 'components/common/VnInput.vue';
-import VnInputTime from 'components/common/VnInputTime.vue';
-
-const { t } = useI18n();
-const router = useRouter();
-const defaultInitialData = {
-    etd: Date.vnNew().toISOString(),
-};
-const onSave = (data, response) => {
-    router.push({ name: 'RoadmapSummary', params: { id: response?.id } });
-};
-</script>
-<template>
-    <VnSubToolbar />
-    <FormModel
-        :url="null"
-        url-create="Roadmaps"
-        model="roadmap"
-        :observe-form-changes="false"
-        :auto-load="false"
-        :form-initial-data="defaultInitialData"
-        @on-data-saved="onSave"
-    >
-        <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput v-model="data.name" :label="t('Roadmap')" clearable />
-                <VnInputDate v-model="data.etd" :label="t('ETD date')" />
-                <VnInputTime v-model="data.etd" :label="t('ETD hour')" />
-            </VnRow>
-        </template>
-    </FormModel>
-</template>
-<i18n>
-es:
-    Roadmap: Troncal
-    ETD date: Fecha ETD
-    ETD hour: Hora ETD
-</i18n>
diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue
index 6c397bcc1..7f8b7107b 100644
--- a/src/pages/Route/Roadmap/RoadmapSummary.vue
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@@ -2,14 +2,14 @@
 import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { QIcon, useQuasar } from 'quasar';
+import { QIcon } from 'quasar';
 import { dashIfEmpty, toDateHourMin } from 'src/filters';
 import { useStateStore } from 'stores/useStateStore';
 import VnLv from 'components/ui/VnLv.vue';
+import VnTitle from 'src/components/common/VnTitle.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import VnLinkPhone from 'components/ui/VnLinkPhone.vue';
-import RoadmapAddStopDialog from 'pages/Route/Roadmap/RoadmapAddStopDialog.vue';
 
 const $props = defineProps({
     id: {
@@ -20,7 +20,6 @@ const $props = defineProps({
 const route = useRoute();
 const stateStore = useStateStore();
 const { t } = useI18n();
-const quasar = useQuasar();
 
 const summary = ref(null);
 const entityId = computed(() => $props.id || route.params.id);
@@ -37,7 +36,7 @@ const columns = ref([
     {
         name: 'address',
         label: t('Address'),
-        field: (row) => dashIfEmpty(row?.address?.nickname),
+        field: (row) => dashIfEmpty(row?.address?.addressFk),
         sortable: true,
         align: 'left',
     },
@@ -69,15 +68,6 @@ const filter = {
     ],
     where: { id: entityId },
 };
-
-const openAddStopDialog = () => {
-    quasar
-        .dialog({
-            component: RoadmapAddStopDialog,
-            componentProps: { roadmapFk: entityId.value },
-        })
-        .onOk(() => summary.value.fetch());
-};
 </script>
 
 <template>
@@ -98,6 +88,10 @@ const openAddStopDialog = () => {
             </template>
             <template #body="{ entity }">
                 <QCard class="vn-one">
+                    <VnTitle
+                        :url="`#/route/roadmap/${entityId}/basic-data`"
+                        :text="t('Basic Data')"
+                    />
                     <VnLv :label="t('Carrier')">
                         <template #value>
                             <span class="link" v-if="entity?.supplier?.id">
@@ -115,8 +109,6 @@ const openAddStopDialog = () => {
                         :label="t('Trailer Plate')"
                         :value="dashIfEmpty(entity?.trailerPlate)"
                     />
-                </QCard>
-                <QCard class="vn-one">
                     <VnLv :label="t('Phone')" :value="dashIfEmpty(entity?.phone)">
                         <template #value>
                             <span>
@@ -139,26 +131,10 @@ const openAddStopDialog = () => {
                     />
                 </QCard>
                 <QCard class="vn-max">
-                    <div class="flex items-center">
-                        <a class="header" :href="`#/route/roadmap/${entityId}/stops`">
-                            {{ t('Stops') }}
-                            <QIcon name="open_in_new" color="primary">
-                                <QTooltip>
-                                    {{ t('Go to stops') }}
-                                </QTooltip>
-                            </QIcon>
-                        </a>
-                        <QIcon
-                            name="add_circle"
-                            color="primary"
-                            class="q-ml-lg header cursor-pointer"
-                            @click.stop="openAddStopDialog"
-                        >
-                            <QTooltip>
-                                {{ t('Add stop') }}
-                            </QTooltip>
-                        </QIcon>
-                    </div>
+                    <VnTitle
+                        :url="`#/route/roadmap/${entityId}/stops`"
+                        :text="t('Stops')"
+                    />
                     <QTable
                         :columns="columns"
                         :rows="entity?.roadmapStop"
diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index daffcb3f2..83bc3b7c5 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -1,33 +1,29 @@
 <script setup>
-import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { computed, onMounted, onUnmounted, ref } from 'vue';
-import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import { toCurrency, toDate } from 'src/filters';
+import { useSummaryDialog } from 'composables/useSummaryDialog';
+import { useState } from 'composables/useState';
+
+import useNotify from 'composables/useNotify';
+import axios from 'axios';
+import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
+
 import RouteDescriptorProxy from 'pages/Route/Card/RouteDescriptorProxy.vue';
 import InvoiceInDescriptorProxy from 'pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue';
 import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
-import VnLv from 'components/ui/VnLv.vue';
-import useNotify from 'composables/useNotify';
-import RouteAutonomousFilter from 'pages/Route/Card/RouteAutonomousFilter.vue';
-import { useRouter } from 'vue-router';
-import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
-import { useSummaryDialog } from 'composables/useSummaryDialog';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnDms from 'components/common/VnDms.vue';
-import { useState } from 'composables/useState';
-import axios from 'axios';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnLv from 'components/ui/VnLv.vue';
+
+const { viewSummary } = useSummaryDialog();
+const { notify } = useNotify();
+const { t } = useI18n();
 
 const stateStore = useStateStore();
-const { t } = useI18n();
-const { notify } = useNotify();
-const router = useRouter();
-const { viewSummary } = useSummaryDialog();
-
-onMounted(() => (stateStore.rightDrawer = true));
-onUnmounted(() => (stateStore.rightDrawer = false));
-
+const refreshKey = ref(0);
 const state = useState();
 const user = state.getUser();
 const dmsDialog = ref({
@@ -36,87 +32,89 @@ const dmsDialog = ref({
     rowsToCreateInvoiceIn: [],
 });
 const selectedRows = ref([]);
+const tableRef = ref();
 const columns = computed(() => [
     {
-        name: 'ID',
+        align: 'left',
+        name: 'id',
         label: 'Id',
-        field: (row) => row.routeFk,
-        sortable: true,
-        align: 'left',
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
     },
     {
-        name: 'date',
+        align: 'left',
+        name: 'created',
         label: t('Date'),
-        field: (row) => toDate(row.created),
-        sortable: true,
-        align: 'left',
+        component: 'date',
+        columnFilter: {
+            alias: 'c',
+            inWhere: true,
+        },
+        format: ({ date }) => toDate(date),
     },
     {
-        name: 'agency-route',
+        align: 'left',
+        name: 'agencyModeName',
         label: t('Agency route'),
-        field: (row) => row?.agencyModeName,
-        sortable: true,
-        align: 'left',
+        cardVisible: true,
     },
     {
-        name: 'agency-agreement',
+        align: 'left',
+        name: 'agencyAgreement',
         label: t('Agency agreement'),
-        field: (row) => row?.agencyAgreement,
-        sortable: true,
-        align: 'left',
+        cardVisible: true,
     },
     {
+        align: 'left',
         name: 'packages',
         label: t('Packages'),
-        field: (row) => dashIfEmpty(row.packages),
-        sortable: true,
-        align: 'left',
     },
     {
-        name: 'volume',
+        align: 'left',
+        name: 'm3',
         label: 'm³',
-        field: (row) => dashIfEmpty(row.m3),
-        sortable: true,
-        align: 'left',
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
-        name: 'km',
+        align: 'left',
+        name: 'kmTotal',
         label: t('Km'),
-        field: (row) => dashIfEmpty(row?.kmTotal),
-        sortable: true,
-        align: 'left',
+        cardVisible: true,
     },
     {
+        align: 'left',
         name: 'price',
         label: t('Price'),
-        field: (row) => (row?.price ? toCurrency(row.price) : '-'),
-        sortable: true,
-        align: 'left',
     },
     {
-        name: 'received',
+        align: 'left',
+        name: 'invoiceInFk',
         label: t('Received'),
-        field: (row) => row?.invoiceInFk,
-        sortable: true,
-        align: 'left',
     },
     {
-        name: 'autonomous',
+        align: 'left',
+        name: 'supplierName',
         label: t('Autonomous'),
-        field: (row) => row?.supplierName,
-        sortable: true,
-        align: 'left',
     },
     {
-        name: 'actions',
-        label: '',
-        sortable: false,
         align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('Preview'),
+                icon: 'preview',
+                isPrimary: true,
+                action: (row) => viewSummary(row?.routeFk, RouteSummary),
+            },
+        ],
     },
 ]);
 
-const refreshKey = ref(0);
-
 const total = computed(() => {
     return selectedRows.value.reduce((sum, item) => sum + item.price, 0);
 });
@@ -169,9 +167,8 @@ const onDmsSaved = async (dms, response) => {
     refreshKey.value++;
 };
 
-function navigateToRouteSummary(event, row) {
-    router.push({ name: 'RouteSummary', params: { id: row.routeFk } });
-}
+onMounted(() => (stateStore.rightDrawer = true));
+onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
@@ -180,109 +177,63 @@ function navigateToRouteSummary(event, row) {
         :label="t('Search autonomous')"
         :info="t('You can search by autonomous reference')"
     />
-    <RightMenu>
-        <template #right-panel>
-            <RouteAutonomousFilter data-key="RouteAutonomousList" />
-        </template>
-    </RightMenu>
-    <QPage class="column items-center">
-        <div class="route-list">
-            <div class="q-pa-md">
-                <QCard class="vn-one q-py-sm q-px-lg flex justify-between">
-                    <VnLv class="flex">
-                        <template #label>
-                            <span class="text-h6">{{ t('Total') }}</span>
-                        </template>
-                        <template #value>
-                            <span class="text-h6 q-ml-md">{{ toCurrency(total) }}</span>
-                        </template>
-                    </VnLv>
-                    <QBtn
-                        icon="vn:invoice-in-create"
-                        color="primary"
-                        :disable="!selectedRows?.length"
-                        @click="openDmsUploadDialog"
-                    >
-                        <QTooltip>
-                            {{ t('Create invoiceIn') }}
-                        </QTooltip>
-                    </QBtn>
-                </QCard>
-            </div>
-            <VnPaginate
-                :key="refreshKey"
-                data-key="RouteAutonomousList"
-                url="AgencyTerms/filter"
-                :limit="20"
-            >
-                <template #body="{ rows }">
-                    <div class="q-pa-md">
-                        <QTable
-                            v-model:selected="selectedRows"
-                            :columns="columns"
-                            :rows="rows"
-                            flat
-                            row-key="routeFk"
-                            selection="multiple"
-                            :rows-per-page-options="[0]"
-                            hide-pagination
-                            @row-click="navigateToRouteSummary"
-                        >
-                            <template #body-cell-ID="props">
-                                <QTd :props="props">
-                                    <span class="link" @click.stop>
-                                        {{ props.value }}
-                                        <RouteDescriptorProxy :id="props.value" />
-                                    </span>
-                                </QTd>
-                            </template>
-                            <template #body-cell-received="props">
-                                <QTd :props="props">
-                                    <span :class="props.value && 'link'" @click.stop>
-                                        {{ dashIfEmpty(props.value) }}
-                                        <InvoiceInDescriptorProxy
-                                            v-if="props.value"
-                                            :id="props.value"
-                                        />
-                                    </span>
-                                </QTd>
-                            </template>
-                            <template #body-cell-autonomous="props">
-                                <QTd :props="props">
-                                    <span class="link" @click.stop>
-                                        {{ props.value }}
-                                        <SupplierDescriptorProxy
-                                            v-if="props.row?.supplierFk"
-                                            :id="props.row?.supplierFk"
-                                        />
-                                    </span>
-                                </QTd>
-                            </template>
-                            <template #body-cell-actions="props">
-                                <QTd :props="props">
-                                    <div class="table-actions">
-                                        <QIcon
-                                            name="preview"
-                                            size="sm"
-                                            color="primary"
-                                            @click.stop="
-                                                viewSummary(
-                                                    props?.row?.routeFk,
-                                                    RouteSummary
-                                                )
-                                            "
-                                        >
-                                            <QTooltip>{{ t('Preview') }}</QTooltip>
-                                        </QIcon>
-                                    </div>
-                                </QTd>
-                            </template>
-                        </QTable>
-                    </div>
+    <div class="q-pa-md">
+        <QCard class="vn-one q-py-sm q-px-lg flex justify-between">
+            <VnLv class="flex">
+                <template #label>
+                    <span class="text-h6">{{ t('Total') }}</span>
                 </template>
-            </VnPaginate>
-        </div>
-    </QPage>
+                <template #value>
+                    <span class="text-h6 q-ml-md">{{ toCurrency(total) }}</span>
+                </template>
+            </VnLv>
+            <QBtn
+                icon="vn:invoice-in-create"
+                color="primary"
+                :disable="!selectedRows?.length"
+                @click="openDmsUploadDialog"
+            >
+                <QTooltip>
+                    {{ t('Create invoiceIn') }}
+                </QTooltip>
+            </QBtn>
+        </QCard>
+    </div>
+    <VnTable
+        ref="tableRef"
+        data-key="RouteAutonomousList"
+        url="AgencyTerms/filter"
+        :columns="columns"
+        :right-search="true"
+        default-mode="table"
+        v-model:selected="selectedRows"
+        table-height="85vh"
+        redirect="route"
+        :row-click="({ routeFk }) => tableRef.redirect(routeFk)"
+        :table="{
+            'row-key': '$index',
+            selection: 'multiple',
+        }"
+    >
+        <template #column-id="{ row }">
+            <span class="link" @click.stop>
+                {{ row.routeFk }}
+                <RouteDescriptorProxy :id="row.route.id" />
+            </span>
+        </template>
+        <template #column-invoiceInFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.invoiceInFk }}
+                <InvoiceInDescriptorProxy v-if="row.invoiceInFk" :id="row.invoiceInFk" />
+            </span>
+        </template>
+        <template #column-supplierName="{ row }">
+            <span class="link" @click.stop>
+                {{ row.supplierName }}
+                <SupplierDescriptorProxy :id="row.supplierFk" />
+            </span>
+        </template>
+    </VnTable>
     <QDialog v-model="dmsDialog.show">
         <VnDms
             url="dms/uploadFile"
@@ -292,29 +243,6 @@ function navigateToRouteSummary(event, row) {
         />
     </QDialog>
 </template>
-
-<style lang="scss" scoped>
-.route-list {
-    width: 100%;
-}
-
-.table-actions {
-    display: flex;
-    align-items: center;
-    gap: 12px;
-
-    i {
-        cursor: pointer;
-    }
-}
-
-th:last-child,
-td:last-child {
-    background-color: var(--vn-section-color);
-    position: sticky;
-    right: 0;
-}
-</style>
 <i18n>
 es:
     Search autonomous: Buscar autónomos
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index e116fd823..55bcdabb0 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -1,50 +1,41 @@
 <script setup>
-import { useArrayData } from 'composables/useArrayData';
-import { dashIfEmpty, toHour } from 'src/filters';
-import { computed, onMounted, ref } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useValidator } from 'composables/useValidator';
 import { useSession } from 'composables/useSession';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useQuasar } from 'quasar';
+import { toDate } from 'src/filters';
+import { useRouter } from 'vue-router';
 
 import axios from 'axios';
 import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
-import FetchData from 'components/FetchData.vue';
 import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
-import { useRouter } from 'vue-router';
-import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
-import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import VnInput from 'components/common/VnInput.vue';
-import VnInputTime from 'components/common/VnInputTime.vue';
-import VnSelect from 'components/common/VnSelect.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
-import { useStateStore } from 'src/stores/useStateStore';
 
 const { t } = useI18n();
-const { validate } = useValidator();
 const { viewSummary } = useSummaryDialog();
 const quasar = useQuasar();
 const session = useSession();
-const paginate = ref();
-const visibleColumns = ref([]);
 const selectedRows = ref([]);
-const workers = ref([]);
-const agencyList = ref([]);
-const vehicleList = ref([]);
-const allColumnNames = ref([]);
+const tableRef = ref([]);
 const confirmationDialog = ref(false);
 const startingDate = ref(null);
 const refreshKey = ref(0);
 const router = useRouter();
-const stateStore = useStateStore();
+const routeFilter = {
+    include: [
+        {
+            relation: 'workers',
+            scope: {
+                fields: ['id', 'firstName'],
+            },
+        },
+    ],
+};
 const columns = computed(() => [
     {
         align: 'left',
@@ -60,75 +51,114 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'worker',
+        name: 'workerFk',
         label: t('Worker'),
         create: true,
         component: 'select',
         attrs: {
-            url: 'payrollComponents',
-            fields: ['id', 'name'],
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'nickname'],
+            optionValue: 'id',
+            optionLabel: 'nickname',
         },
+        useLike: false,
         cardVisible: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
     },
     {
-        name: 'agency',
-        label: t('Agency'),
         align: 'left',
+        name: 'agencyModeFk',
+        label: t('Agency'),
         isTitle: true,
         cardVisible: true,
         create: true,
+        component: 'select',
+        attrs: {
+            url: 'agencyModes',
+            fields: ['id', 'name'],
+            optionLabel: 'name',
+            optionValue: 'id',
+        },
     },
     {
-        name: 'vehicle',
+        align: 'left',
+        name: 'vehicleFk',
         label: t('Vehicle'),
-        align: 'left',
         cardVisible: true,
         create: true,
+        component: 'select',
+        attrs: {
+            url: 'vehicles',
+            fields: ['id', 'numberPlate'],
+            optionLabel: 'numberPlate',
+            optionValue: 'id',
+        },
     },
     {
-        name: 'date',
+        align: 'left',
+        name: 'created',
         label: t('Date'),
-        align: 'left',
         cardVisible: true,
         create: true,
+        component: 'date',
+        columnFilter: {
+            alias: 'c',
+            inWhere: true,
+        },
+        format: ({ date }) => toDate(date),
     },
     {
-        name: 'volume',
-        label: 'm³',
         align: 'center',
+        name: 'm3',
+        label: 'volume',
         cardVisible: true,
     },
     {
+        align: 'left',
         name: 'description',
         label: t('Description'),
-        align: 'left',
         isTitle: true,
         create: true,
+        component: 'input',
+        field: 'description',
     },
     {
+        align: 'left',
         name: 'started',
         label: t('hourStarted'),
-        align: 'left',
+        component: 'time',
     },
     {
+        align: 'left',
         name: 'finished',
         label: t('hourFinished'),
-        align: 'left',
+        component: 'time',
     },
     {
-        name: 'isServed',
-        label: t('Served'),
         align: 'left',
+        name: 'isOk',
+        label: t('Served'),
+        component: 'checkbox',
     },
     {
         align: 'right',
-        label: 'asdasd',
         name: 'tableActions',
         actions: [
             {
-                title: t('Client ticket list'),
+                title: t('Add tickets'),
+                icon: 'vn:ticketAdd',
+                action: (row) => openTicketsDialog(row?.id),
+            },
+            {
+                title: t('Preview'),
                 icon: 'preview',
-                action: (row) => navigate(row.id),
+                action: (row) => viewSummary(row?.id, RouteSummary),
+            },
+            {
+                title: t('Route summary'),
+                icon: 'arrow_forward',
+                isPrimary: true,
+                action: (row) => navigate(row?.id),
             },
         ],
     },
@@ -138,22 +168,14 @@ function navigate(id) {
     router.push({ path: `/route/${id}` });
 }
 
-const updateRoute = async (route) => {
-    try {
-        return await axios.patch(`Routes/${route.id}`, route);
-    } catch (err) {
-        return err;
-    }
-};
-
 const cloneRoutes = () => {
+    if (!selectedRows.value.length || !startingDate.value) return;
     axios.post('Routes/clone', {
         created: startingDate.value,
         ids: selectedRows.value.map((row) => row?.id),
     });
-    refreshKey.value++;
+    tableRef.value.reload();
     startingDate.value = null;
-    paginate.value.fetch();
 };
 
 const showRouteReport = () => {
@@ -175,16 +197,13 @@ const showRouteReport = () => {
 
 function markAsServed() {
     selectedRows.value.forEach(async (row) => {
-        if (row?.id) await axios.patch(`Routes/${row?.id}`, { isOk: true });
+        await axios.patch(`Routes/${row?.id}`, { isOk: true });
     });
-    refreshKey.value++;
+    tableRef.value.reload();
     startingDate.value = null;
 }
 
 const openTicketsDialog = (id) => {
-    if (!id) {
-        return;
-    }
     quasar
         .dialog({
             component: RouteListTicketsDialog,
@@ -215,21 +234,10 @@ const openTicketsDialog = (id) => {
                 <QBtn flat :label="t('Cancel')" v-close-popup class="text-primary" />
                 <QBtn color="primary" v-close-popup @click="cloneRoutes">
                     {{ t('globals.clone') }}
-                    <VnLv
-                        :label="t('route.summary.packages')"
-                        :value="getTotalPackages(entity.tickets)"
-                    />
                 </QBtn>
             </QCardActions>
         </QCard>
     </QDialog>
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
-    <FetchData url="AgencyModes" @on-fetch="(data) => (agencyList = data)" auto-load />
-    <FetchData url="Vehicles" @on-fetch="(data) => (vehicleList = data)" auto-load />
     <VnSubToolbar />
     <VnTable
         ref="tableRef"
@@ -237,15 +245,24 @@ const openTicketsDialog = (id) => {
         url="Routes/filter"
         :columns="columns"
         :right-search="true"
-        default-mode="table"
         :is-editable="true"
+        :filter="routeFilter"
+        redirect="route"
         :create="{
             urlCreate: 'Routes',
             title: t('Create route'),
-            onDataSaved: () => tableRef.reload(),
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {},
         }"
-        save-url="routes"
+        save-url="Routes/crud"
         :disable-option="{ card: true }"
+        :use-model="true"
+        table-height="85vh"
+        v-model:selected="selectedRows"
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
     >
         <template #moreBeforeActions>
             <QBtn
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index 2c9234c6e..050691af4 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -1,65 +1,68 @@
 <script setup>
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
-import { computed, onMounted, onUnmounted, ref } from 'vue';
-import { dashIfEmpty, toDateHourMin } from 'src/filters';
+import { computed, ref } from 'vue';
+import { dashIfEmpty } from 'src/filters';
+import { toDate } from 'filters/index';
 import { useQuasar } from 'quasar';
-import toCurrency from 'filters/toCurrency';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import RoadmapFilter from 'pages/Route/Roadmap/RoadmapFilter.vue';
-import VnConfirm from 'components/ui/VnConfirm.vue';
-import axios from 'axios';
-import VnInputDate from 'components/common/VnInputDate.vue';
 import { useSummaryDialog } from 'composables/useSummaryDialog';
-import RoadmapSummary from 'pages/Route/Roadmap/RoadmapSummary.vue';
-import { useRouter } from 'vue-router';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import toCurrency from 'filters/toCurrency';
+import axios from 'axios';
 
-const stateStore = useStateStore();
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import RoadmapSummary from 'pages/Route/Roadmap/RoadmapSummary.vue';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInputTime from 'src/components/common/VnInputTime.vue';
+
+const { viewSummary } = useSummaryDialog();
 const { t } = useI18n();
 const quasar = useQuasar();
-const router = useRouter();
-const { viewSummary } = useSummaryDialog();
-
-const to = Date.vnNew();
-to.setDate(to.getDate() + 1);
-to.setHours(0, 0, 0, 0);
-
-const from = Date.vnNew();
-from.setDate(from.getDate());
-from.setHours(0, 0, 0, 0);
-
-onMounted(() => (stateStore.rightDrawer = true));
-onUnmounted(() => (stateStore.rightDrawer = false));
-
 const selectedRows = ref([]);
 const columns = computed(() => [
     {
-        name: 'roadmap',
+        align: 'left',
+        name: 'id',
+        label: 'Id',
+        isId: true,
+    },
+    {
+        align: 'left',
+        name: 'name',
         label: t('Roadmap'),
-        field: (row) => row.name,
-        sortable: true,
-        align: 'left',
+        create: true,
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
-        name: 'ETD',
+        align: 'left',
+        name: 'etd',
         label: t('ETD'),
-        field: (row) => toDateHourMin(row.etd),
-        sortable: true,
-        align: 'left',
+        component: 'date',
+        columnFilter: {
+            alias: 'c',
+            inWhere: true,
+        },
+        format: ({ date }) => toDate(date),
+        cardVisible: true,
     },
     {
-        name: 'carrier',
+        align: 'left',
+        name: 'supplierFk',
         label: t('Carrier'),
-        field: (row) => row.supplier?.nickname,
-        sortable: true,
-        align: 'left',
+        component: 'select',
+        attrs: {
+            url: 'suppliers',
+            fields: ['id', 'name'],
+            optionLabel: 'name',
+            optionValue: 'id',
+        },
     },
     {
-        name: 'plate',
+        name: 'tractorPlate',
         label: t('Plate'),
         field: (row) => row.tractorPlate,
         sortable: true,
@@ -80,30 +83,29 @@ const columns = computed(() => [
         align: 'left',
     },
     {
-        name: 'actions',
-        label: '',
-        sortable: false,
         align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('Ver cmr'),
+                icon: 'visibility',
+                isPrimary: true,
+                action: (row) => viewSummary(row?.id, RoadmapSummary),
+            },
+        ],
     },
 ]);
 
-const refreshKey = ref(0);
+const tableRef = ref(0);
 const isCloneDialogOpen = ref(false);
 const etdDate = ref(null);
 
-const filter = {
-    include: { relation: 'supplier', scope: { fields: ['nickname'] } },
-    where: {
-        and: [{ etd: { gte: from } }, { etd: { lte: to } }],
-    },
-};
-
 const cloneSelection = async () => {
     await axios.post('Roadmaps/clone', {
         etd: etdDate.value,
         ids: selectedRows.value.map((row) => row?.id),
     });
-    refreshKey.value++;
+    tableRef.value.reload();
     etdDate.value = null;
 };
 
@@ -125,11 +127,7 @@ function confirmRemove() {
                 promise: removeSelection,
             },
         })
-        .onOk(() => refreshKey.value++);
-}
-
-function navigateToRoadmapSummary(_, { id }) {
-    router.push({ name: 'RoadmapSummary', params: { id } });
+        .onOk(() => tableRef.value++);
 }
 </script>
 
@@ -139,11 +137,6 @@ function navigateToRoadmapSummary(_, { id }) {
         :label="t('Search roadmaps')"
         :info="t('You can search by roadmap reference')"
     />
-    <RightMenu>
-        <template #right-panel>
-            <RoadmapFilter data-key="RoadmapList" />
-        </template>
-    </RightMenu>
     <QDialog v-model="isCloneDialogOpen">
         <QCard style="min-width: 350px">
             <QCardSection>
@@ -163,95 +156,55 @@ function navigateToRoadmapSummary(_, { id }) {
             </QCardActions>
         </QCard>
     </QDialog>
-    <QPage class="column items-center">
-        <VnSubToolbar class="justify-end">
-            <template #st-actions>
-                <QBtn
-                    icon="vn:clone"
-                    color="primary"
-                    class="q-mr-sm"
-                    :disable="!selectedRows?.length"
-                    @click="isCloneDialogOpen = true"
-                >
-                    <QTooltip>{{ t('Clone Selected Routes') }}</QTooltip>
-                </QBtn>
-                <QBtn
-                    icon="delete"
-                    color="primary"
-                    class="q-mr-sm"
-                    :disable="!selectedRows?.length"
-                    @click="confirmRemove"
-                >
-                    <QTooltip>{{ t('Delete roadmap(s)') }}</QTooltip>
-                </QBtn>
-            </template>
-        </VnSubToolbar>
-        <div class="route-list">
-            <VnPaginate
-                :key="refreshKey"
-                data-key="RoadmapList"
-                url="Roadmaps"
-                :limit="20"
-                :filter="filter"
+    <VnSubToolbar class="justify-end">
+        <template #st-actions>
+            <QBtn
+                icon="vn:clone"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows?.length"
+                @click="isCloneDialogOpen = true"
             >
-                <template #body="{ rows }">
-                    <div class="q-pa-md">
-                        <QTable
-                            v-model:selected="selectedRows"
-                            :columns="columns"
-                            :rows="rows"
-                            flat
-                            row-key="id"
-                            selection="multiple"
-                            :rows-per-page-options="[0]"
-                            hide-pagination
-                            :pagination="{ sortBy: 'ID', descending: true }"
-                            @row-click="navigateToRoadmapSummary"
-                        >
-                            <template #body-cell-carrier="props">
-                                <QTd :props="props">
-                                    <span v-if="props.value" class="link" @click.stop>
-                                        {{ props.value }}
-                                        <SupplierDescriptorProxy
-                                            :id="props.row?.supplier?.id"
-                                        />
-                                    </span>
-                                </QTd>
-                            </template>
-                            <template #body-cell-actions="props">
-                                <QTd :props="props">
-                                    <div class="flex items-center table-actions">
-                                        <QIcon
-                                            name="preview"
-                                            size="sm"
-                                            color="primary"
-                                            @click.stop="
-                                                viewSummary(
-                                                    props?.row?.id,
-                                                    RoadmapSummary
-                                                )
-                                            "
-                                            class="cursor-pointer"
-                                        >
-                                            <QTooltip>{{ t('Preview') }}</QTooltip>
-                                        </QIcon>
-                                    </div>
-                                </QTd>
-                            </template>
-                        </QTable>
-                    </div>
-                </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky :offset="[20, 20]">
-            <RouterLink :to="{ name: 'RouteRoadmapCreate' }">
-                <QBtn fab icon="add" color="primary" />
-                <QTooltip>
-                    {{ t('Create roadmap') }}
-                </QTooltip>
-            </RouterLink>
-        </QPageSticky>
-    </QPage>
+                <QTooltip>{{ t('Clone Selected Routes') }}</QTooltip>
+            </QBtn>
+            <QBtn
+                icon="delete"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows?.length"
+                @click="confirmRemove"
+            >
+                <QTooltip>{{ t('Delete roadmap(s)') }}</QTooltip>
+            </QBtn>
+        </template>
+    </VnSubToolbar>
+    <VnTable
+        ref="tableRef"
+        data-key="RoadmapList"
+        url="roadmaps"
+        :columns="columns"
+        :right-search="true"
+        :use-model="true"
+        default-mode="table"
+        v-model:selected="selectedRows"
+        table-height="85vh"
+        :table="{
+            selection: 'multiple',
+        }"
+        redirect="route/roadmap"
+        :create="{
+            urlCreate: 'Roadmaps',
+            title: t('Create routemap'),
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {},
+        }"
+        :disable-option="{ card: true }"
+    >
+        <template #more-create-dialog="{ data }">
+            <VnInputDate v-model="data.etd" />
+            <VnInputTime v-model="data.etd" />
+        </template>
+    </VnTable>
 </template>
 
 <style lang="scss" scoped>
@@ -264,6 +217,7 @@ function navigateToRoadmapSummary(_, { id }) {
 </style>
 <i18n>
 es:
+    Create routemap: Crear troncal
     Search roadmaps: Buscar troncales
     You can search by roadmap reference: Puedes buscar por referencia del troncal
     Delete roadmap(s): Eliminar troncal(es)
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 9337724b0..43b8964ff 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onUpdated } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index ce7d234c8..763fab812 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -99,7 +99,6 @@ const columns = computed(() => [
         }"
         order="id ASC"
         :columns="columns"
-        default-mode="table"
         auto-load
         :right-search="false"
         :use-model="true"
diff --git a/src/pages/Ticket/Card/ExpeditionNewTicket.vue b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
new file mode 100644
index 000000000..da775a368
--- /dev/null
+++ b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
@@ -0,0 +1,78 @@
+<script setup>
+import { reactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import VnInput from 'src/components/common/VnInput.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const $props = defineProps({
+    ticket: {
+        type: Boolean,
+        default: false,
+    },
+    withRoute: {
+        type: Boolean,
+        default: false,
+    },
+    selectedExpeditions: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const { t } = useI18n();
+const router = useRouter();
+const { notify } = useNotify();
+
+const newTicketFormData = reactive({});
+
+const createTicket = async () => {
+    try {
+        const expeditionIds = $props.selectedExpeditions.map(
+            (expedition) => expedition.id
+        );
+        const params = {
+            clientId: $props.ticket.clientFk,
+            landed: newTicketFormData.landed,
+            warehouseId: $props.ticket.warehouseFk,
+            addressId: $props.ticket.addressFk,
+            agencyModeId: $props.ticket.agencyModeFk,
+            routeId: newTicketFormData.routeFk,
+            expeditionIds: expeditionIds,
+        };
+
+        const { data } = await axios.post('Expeditions/moveExpeditions', params);
+        notify(t('globals.dataSaved'), 'positive');
+        router.push({ name: 'TicketSummary', params: { id: data.id } });
+    } catch (error) {
+        console.error(error);
+    }
+};
+</script>
+
+<template>
+    <FormModelPopup
+        model="expeditionNewTicket"
+        :form-initial-data="newTicketFormData"
+        :save-fn="createTicket"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInputDate :label="t('expedition.landed')" v-model="data.landed" />
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    v-if="withRoute"
+                    :label="t('expedition.routeId')"
+                    v-model="data.routeFk"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
new file mode 100644
index 000000000..3954b5a62
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -0,0 +1,354 @@
+<script setup>
+import { ref, computed, onMounted, onUnmounted, watch, nextTick } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import FetchData from 'components/FetchData.vue';
+import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { dashIfEmpty } from 'src/filters';
+import { useArrayData } from 'composables/useArrayData';
+import { toCurrency } from 'filters/index';
+import axios from 'axios';
+
+const route = useRoute();
+const stateStore = useStateStore();
+const { t } = useI18n();
+const salesRef = ref(null);
+const arrayData = useArrayData('ticketData');
+const { store } = arrayData;
+
+const ticketData = computed(() => store.data);
+const components = ref([]);
+const componentsList = ref([]);
+const theoricalCost = ref(0);
+const ticketVolume = ref(null);
+
+watch(
+    () => ticketData.value,
+    async () => {
+        await nextTick();
+        salesRef.value.fetch();
+        getComponentsSum();
+        getTheoricalCost();
+        if (ticketData.value?.zone && ticketData.value?.zone?.isVolumetric)
+            getTicketVolume();
+    },
+    { immediate: true }
+);
+
+const salesFilter = computed(() => ({
+    order: 'concept ASC',
+    include: [
+        {
+            relation: 'item',
+        },
+        {
+            relation: 'components',
+            scope: {
+                fields: ['componentFk', 'value'],
+                include: {
+                    relation: 'component',
+                    scope: {
+                        fields: ['typeFk', 'name'],
+                        include: {
+                            relation: 'componentType',
+                            scope: {
+                                fields: ['type', 'isBase', 'name'],
+                            },
+                        },
+                    },
+                },
+            },
+        },
+    ],
+    where: { ticketFk: route.params.id },
+}));
+
+const columns = computed(() => [
+    {
+        label: t('ticketComponents.item'),
+        name: 'item',
+        align: 'left',
+    },
+    {
+        label: t('ticketComponents.description'),
+        name: 'description',
+        align: 'left',
+    },
+    {
+        label: t('ticketComponents.quantity'),
+        name: 'quantity',
+        field: 'quantity',
+        align: 'left',
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('ticketComponents.serie'),
+        name: 'serie',
+        align: 'left',
+    },
+    {
+        label: t('ticketComponents.components'),
+        name: 'components',
+        align: 'left',
+    },
+    {
+        label: t('ticketComponents.import'),
+        name: 'import',
+        align: 'left',
+    },
+    {
+        label: t('ticketComponents.total'),
+        name: 'total',
+        align: 'left',
+    },
+]);
+
+const getBase = computed(() => {
+    let sum = 0;
+    for (let sale of components.value) {
+        for (let saleComponent of sale.components) {
+            if (saleComponent.component.componentType.isBase) {
+                sum += sale.quantity * saleComponent.value;
+            }
+        }
+    }
+    return sum;
+});
+
+const getTotal = computed(() => {
+    let total = 0;
+    for (let sale of components.value) {
+        for (let saleComponent of sale.components) {
+            total += sale.quantity * saleComponent.value;
+        }
+    }
+    return total;
+});
+
+const getComponentsSum = async () => {
+    try {
+        const { data } = await axios.get(`Tickets/${route.params.id}/getComponentsSum`);
+        componentsList.value = data;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const getTheoricalCost = async () => {
+    try {
+        const { data } = await axios.get(`Tickets/${route.params.id}/freightCost`);
+        theoricalCost.value = data;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const getTicketVolume = async () => {
+    try {
+        if (!ticketData.value) return;
+        const { data } = await axios.get(`Tickets/${ticketData.value.id}/getVolume`);
+        ticketVolume.value = data[0].volume;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+onMounted(() => {
+    stateStore.rightDrawer = true;
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <FetchData
+        ref="salesRef"
+        url="Sales"
+        :filter="salesFilter"
+        @on-fetch="(data) => (components = data)"
+        auto-load
+    />
+    <RightMenu>
+        <template #right-panel>
+            <QCard
+                class="q-pa-sm color-vn-text"
+                bordered
+                flat
+                style="border-color: black"
+            >
+                <QCardSection horizontal>
+                    <span class="text-weight-bold text-subtitle1 text-center full-width">
+                        {{ t('ticketComponents.total') }}
+                    </span>
+                </QCardSection>
+                <QCardSection horizontal>
+                    <span class="q-mr-xs color-vn-label"
+                        >{{ t('ticketComponents.baseToCommission') }}:
+                    </span>
+                    <span>{{ toCurrency(getBase) }}</span>
+                </QCardSection>
+                <QCardSection horizontal>
+                    <span class="q-mr-xs color-vn-label"
+                        >{{ t('ticketComponents.totalWithoutVat') }}:
+                    </span>
+                    <span>{{ toCurrency(getTotal) }}</span>
+                </QCardSection>
+            </QCard>
+            <QCard
+                class="q-pa-sm color-vn-text"
+                bordered
+                flat
+                style="border-color: black"
+            >
+                <QCardSection horizontal>
+                    <span class="text-weight-bold text-subtitle1 text-center full-width">
+                        {{ t('ticketComponents.components') }}
+                    </span>
+                </QCardSection>
+                <QCardSection
+                    v-for="(component, index) in componentsList"
+                    :key="index"
+                    horizontal
+                >
+                    <span v-if="component.name" class="q-mr-xs color-vn-label">
+                        {{ component.name }}:
+                    </span>
+                    <span v-if="component.value">{{
+                        toCurrency(component.value, 'EUR', 3)
+                    }}</span>
+                </QCardSection>
+            </QCard>
+            <QCard
+                class="q-pa-sm color-vn-text"
+                bordered
+                flat
+                style="border-color: black"
+            >
+                <QCardSection horizontal>
+                    <span class="text-weight-bold text-subtitle1 text-center full-width">
+                        {{ t('ticketComponents.zoneBreakdown') }}
+                    </span>
+                </QCardSection>
+                <QCardSection horizontal>
+                    <span class="q-mr-xs color-vn-label">
+                        {{ t('ticketComponents.price') }}:
+                    </span>
+                    <span>{{ toCurrency(ticketData?.zonePrice, 'EUR', 2) }}</span>
+                </QCardSection>
+                <QCardSection horizontal>
+                    <span class="q-mr-xs color-vn-label">
+                        {{ t('ticketComponents.bonus') }}:
+                    </span>
+                    <span>{{ toCurrency(ticketData?.zoneBonus, 'EUR', 2) }}</span>
+                </QCardSection>
+                <QCardSection horizontal>
+                    <span class="q-mr-xs color-vn-label">
+                        {{ t('ticketComponents.zone') }}:
+                    </span>
+                    <span class="link">
+                        {{ dashIfEmpty(ticketData?.zone?.name) }}
+                        <ZoneDescriptorProxy :id="ticketData?.zone?.id" />
+                    </span>
+                </QCardSection>
+                <QCardSection v-if="ticketData?.zone?.isVolumetric" horizontal>
+                    <span class="q-mr-xs color-vn-label">
+                        {{ t('ticketComponents.volume') }}:
+                    </span>
+                    <span>{{ ticketVolume }}</span>
+                </QCardSection>
+                <QCardSection horizontal>
+                    <span class="q-mr-xs color-vn-label">
+                        {{ t('ticketComponents.packages') }}:
+                    </span>
+                    <span>{{ dashIfEmpty(ticketData?.packages) }}</span>
+                </QCardSection>
+            </QCard>
+            <QCard
+                class="q-pa-sm color-vn-text"
+                bordered
+                flat
+                style="border-color: black"
+            >
+                <QCardSection horizontal>
+                    <span class="text-weight-bold text-subtitle1 text-center full-width">
+                        {{ t('ticketComponents.theoricalCost') }}
+                    </span>
+                </QCardSection>
+                <QCardSection horizontal>
+                    <span class="q-mr-xs color-vn-label">
+                        {{ t('ticketComponents.totalPrice') }}:
+                    </span>
+                    <span>{{ toCurrency(theoricalCost, 'EUR', 2) }}</span>
+                </QCardSection>
+            </QCard>
+        </template>
+    </RightMenu>
+    <QTable
+        :rows="components"
+        :columns="columns"
+        row-key="id"
+        :pagination="{ rowsPerPage: 0 }"
+        class="full-width q-mt-md"
+        :no-data-label="t('globals.noResults')"
+    >
+        <template #body-cell-item="{ row }">
+            <QTd>
+                <QBtn flat color="primary">
+                    <span class="link">{{ row.itemFk }}</span>
+                    <ItemDescriptorProxy :id="row.itemFk" />
+                </QBtn>
+            </QTd>
+        </template>
+        <template #body-cell-description="{ row }">
+            <QTd>
+                <div class="column">
+                    <span>{{ row.item.name }}</span>
+                    <span class="color-vn-label">{{ row.item.subName }}</span>
+                    <FetchedTags :item="row.item" :max-length="6" />
+                </div>
+            </QTd>
+        </template>
+        <template #body-cell-serie="{ row }">
+            <QTd>
+                <div class="column">
+                    <span v-for="(saleComponent, index) in row.components" :key="index">
+                        {{ saleComponent.component?.componentType?.name }}
+                    </span>
+                </div>
+            </QTd>
+        </template>
+        <template #body-cell-components="{ row }">
+            <QTd>
+                <div class="column">
+                    <span v-for="(saleComponent, index) in row.components" :key="index">
+                        {{ saleComponent.component?.name }}
+                    </span>
+                </div>
+            </QTd>
+        </template>
+        <template #body-cell-import="{ row }">
+            <QTd>
+                <div class="column text-right">
+                    <span v-for="(saleComponent, index) in row.components" :key="index">
+                        {{ toCurrency(saleComponent.value, 'EUR', 3) }}
+                    </span>
+                </div>
+            </QTd>
+        </template>
+        <template #body-cell-total="{ row }">
+            <QTd>
+                <div class="column text-right">
+                    <span v-for="(saleComponent, index) in row.components" :key="index">
+                        {{ toCurrency(saleComponent.value * row.quantity, 'EUR', 3) }}
+                    </span>
+                </div>
+            </QTd>
+        </template>
+    </QTable>
+</template>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index b753d0b4c..f68c897db 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -66,6 +66,23 @@ const filter = {
                 fields: ['id', 'name'],
             },
         },
+        {
+            relation: 'zone',
+            scope: {
+                fields: [
+                    'agencyModeFk',
+                    'bonus',
+                    'hour',
+                    'id',
+                    'isVolumetric',
+                    'itemMaxSize',
+                    'm3Max',
+                    'name',
+                    'price',
+                    'travelingDays',
+                ],
+            },
+        },
     ],
 };
 
diff --git a/src/pages/Ticket/Card/TicketDms.vue b/src/pages/Ticket/Card/TicketDms.vue
new file mode 100644
index 000000000..cd998620f
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketDms.vue
@@ -0,0 +1,47 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnDmsList from 'src/components/common/VnDmsList.vue';
+import TicketDmsImportForm from 'src/pages/Ticket/Card/TicketDmsImportForm.vue';
+
+const { t } = useI18n();
+
+const dmsListRef = ref(null);
+const showImportDialog = ref(false);
+
+const onDataSaved = () => dmsListRef.value.dmsRef.fetch();
+</script>
+<template>
+    <VnDmsList
+        ref="dmsListRef"
+        model="TicketDms"
+        update-model="tickets"
+        delete-model="TicketDms"
+        download-model="dms"
+        default-dms-code="ticket"
+        filter="ticketFk"
+        allow-import
+    />
+    <QDialog v-model="showImportDialog">
+        <TicketDmsImportForm @on-data-saved="onDataSaved()" />
+    </QDialog>
+    <QPageSticky position="bottom-right" :offset="[25, 90]">
+        <QBtn
+            fab
+            color="primary"
+            icon="file_copy"
+            @click="showImportDialog = true"
+            class="fill-icon"
+        >
+            <QTooltip>
+                {{ t('Import from existing') }}
+            </QTooltip>
+        </QBtn>
+    </QPageSticky>
+</template>
+
+<i18n>
+es:
+    Import from existing: Importar desde existente
+</i18n>
diff --git a/src/pages/Ticket/Card/TicketDmsImportForm.vue b/src/pages/Ticket/Card/TicketDmsImportForm.vue
new file mode 100644
index 000000000..869e166ca
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketDmsImportForm.vue
@@ -0,0 +1,76 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+import FetchData from 'components/FetchData.vue';
+
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const emit = defineEmits(['onDataSaved']);
+
+const { t } = useI18n();
+const { notify } = useNotify();
+const route = useRoute();
+
+const dmsOptions = ref([]);
+const dmsId = ref(null);
+
+const importDms = async () => {
+    try {
+        if (!dmsId.value) throw new Error(t(`The document identifier can't be empty`));
+
+        const data = {
+            ticketFk: route.params.id,
+            dmsFk: dmsId.value,
+        };
+
+        await axios.post('ticketDms', data);
+        notify(t('globals.dataSaved'), 'positive');
+        dmsId.value = null;
+        emit('onDataSaved');
+    } catch (e) {
+        throw new Error(e.message);
+    }
+};
+</script>
+
+<template>
+    <FetchData
+        url="Dms"
+        :filter="{ fields: ['id'], order: 'id ASC' }"
+        auto-load
+        @on-fetch="(data) => (dmsOptions = data)"
+    />
+    <FormModelPopup
+        url-create="genera"
+        model="DmsImport"
+        :title="t('Select document id')"
+        :form-initial-data="{}"
+        :save-fn="importDms"
+    >
+        <template #form-inputs>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelect
+                    :label="t('Document')"
+                    :options="dmsOptions"
+                    hide-selected
+                    option-label="id"
+                    option-value="id"
+                    v-model="dmsId"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    Select document id: Introduzca id de gestion documental
+    Document: Documento
+    The document indentifier can't be empty: El número de documento no puede estar vacío
+</i18n>
diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
new file mode 100644
index 000000000..bddfa2bfd
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -0,0 +1,474 @@
+<script setup>
+import { onMounted, ref, computed, onUnmounted, reactive, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import TicketEditManaProxy from './TicketEditMana.vue';
+import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import ExpeditionNewTicket from './ExpeditionNewTicket.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { toCurrency, toPercentage } from 'src/filters';
+import { useArrayData } from 'composables/useArrayData';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import useNotify from 'src/composables/useNotify.js';
+import { toDateTimeFormat } from 'src/filters/date';
+import axios from 'axios';
+
+const route = useRoute();
+const stateStore = useStateStore();
+const { t } = useI18n();
+const { notify } = useNotify();
+const { openConfirmationModal } = useVnConfirm();
+const editPriceProxyRef = ref(null);
+const newTicketDialogRef = ref(null);
+const logsTableDialogRef = ref(null);
+
+const expeditionsLogsData = ref([]);
+const selectedExpeditions = ref([]);
+const allColumnNames = ref([]);
+const visibleColumns = ref([]);
+const newTicketWithRoute = ref(false);
+const itemsOptions = ref([]);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'expeditionFk':
+            return { id: value };
+        case 'packageItemName':
+            return { packagingItemFk: value };
+    }
+};
+
+const expeditionsFilter = computed(() => ({
+    where: { ticketFk: route.params.id },
+    order: ['created DESC'],
+}));
+
+const expeditionsArrayData = useArrayData('ticketExpeditions', {
+    url: 'Expeditions/filter',
+    filter: expeditionsFilter.value,
+    exprBuilder: exprBuilder,
+});
+const expeditionsStore = expeditionsArrayData.store;
+const ticketExpeditions = computed(() => expeditionsStore.data);
+
+const ticketArrayData = useArrayData('ticketData');
+const ticketStore = ticketArrayData.store;
+const ticketData = computed(() => ticketStore.data);
+
+const refetchExpeditions = async () => {
+    await expeditionsArrayData.applyFilter({
+        params: { filter: JSON.stringify(expeditionsFilter.value) },
+    });
+};
+
+watch(
+    () => route.params.id,
+    async () => await refetchExpeditions(),
+    { immediate: true }
+);
+
+const params = reactive({});
+
+const applyColumnFilter = async (col) => {
+    try {
+        const paramKey = col.columnFilter?.filterParamKey || col.field;
+        params[paramKey] = col.columnFilter.filterValue;
+        await expeditionsArrayData.addFilter({ params });
+    } catch (err) {
+        console.error('Error applying column filter', err);
+    }
+};
+
+const getInputEvents = (col) => {
+    return col.columnFilter.type === 'select'
+        ? { 'update:modelValue': () => applyColumnFilter(col) }
+        : {
+              'keyup.enter': () => applyColumnFilter(col),
+          };
+};
+
+const columns = computed(() => [
+    {
+        label: t('expedition.id'),
+        name: 'id',
+        field: 'id',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterParamKey: 'expeditionFk',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('expedition.item'),
+        name: 'item',
+        align: 'left',
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterParamKey: 'packageItemName',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('expedition.name'),
+        name: 'name',
+        field: 'packageItemName',
+        align: 'left',
+        columnFilter: {
+            component: VnSelect,
+            type: 'select',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                options: itemsOptions.value,
+                'option-value': 'id',
+                'option-label': 'name',
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('expedition.packageType'),
+        name: 'packageType',
+        field: 'freightItemName',
+        align: 'left',
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            // filterParamKey: 'expeditionFk',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        label: t('expedition.counter'),
+        name: 'counter',
+        field: 'counter',
+        align: 'left',
+        columnFilter: null,
+    },
+    {
+        label: t('expedition.externalId'),
+        name: 'externalId',
+        field: 'externalId',
+        align: 'left',
+        columnFilter: null,
+    },
+    {
+        label: t('expedition.created'),
+        name: 'created',
+        field: 'created',
+        align: 'left',
+        columnFilter: null,
+        format: (value) => toDateTimeFormat(value),
+    },
+    {
+        label: t('expedition.state'),
+        name: 'state',
+        field: 'state',
+        align: 'left',
+        columnFilter: null,
+    },
+    {
+        label: '',
+        name: 'history',
+        align: 'left',
+        columnFilter: null,
+    },
+]);
+
+const logTableColumns = computed(() => [
+    {
+        label: t('expedition.state'),
+        name: 'state',
+        field: 'state',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('expedition.name'),
+        name: 'name',
+        align: 'name',
+        columnFilter: null,
+    },
+    {
+        label: t('expedition.created'),
+        name: 'created',
+        field: 'created',
+        align: 'left',
+        columnFilter: null,
+        format: (value) => toDateTimeFormat(value),
+    },
+]);
+
+const showNewTicketDialog = (withRoute = false) => {
+    newTicketWithRoute.value = withRoute;
+    newTicketDialogRef.value.show();
+};
+
+const deleteExpedition = async () => {
+    try {
+        const expeditionIds = selectedExpeditions.value.map(
+            (expedition) => expedition.id
+        );
+        const params = { expeditionIds };
+        await axios.post('Expeditions/deleteExpeditions', params);
+        await refetchExpeditions();
+        selectedExpeditions.value = [];
+        notify(t('expedition.expeditionRemoved'), 'positive');
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const showLog = async (expedition) => {
+    await getExpeditionState(expedition);
+    logsTableDialogRef.value.show();
+};
+
+const getExpeditionState = async (expedition) => {
+    try {
+        const filter = {
+            where: { expeditionFk: expedition.id },
+            order: ['created DESC'],
+        };
+
+        const { data } = await axios.get(`ExpeditionStates/filter`, {
+            params: { filter: JSON.stringify(filter) },
+        });
+        expeditionsLogsData.value = data;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    const filteredColumns = columns.value.filter((col) => col.name !== 'history');
+    allColumnNames.value = filteredColumns.map((col) => col.name);
+    // await expeditionsArrayData.fetch({ append: false });
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <FetchData
+        url="Items"
+        auto-load
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        @on-fetch="(data) => (itemsOptions = data)"
+    />
+    <VnSubToolbar>
+        <template #st-data>
+            <TableVisibleColumns
+                :all-columns="allColumnNames"
+                table-code="expeditionIndex"
+                labels-traductions-path="expedition"
+                @on-config-saved="visibleColumns = [...$event, 'history']"
+            />
+        </template>
+        <template #st-actions>
+            <QBtnGroup push class="q-gutter-x-sm" flat>
+                <QBtnDropdown
+                    ref="btnDropdownRef"
+                    color="primary"
+                    :label="t('expedition.move')"
+                    :disable="!selectedExpeditions.length"
+                >
+                    <template #label>
+                        <QTooltip>{{ t('Select lines to see the options') }}</QTooltip>
+                    </template>
+                    <QList>
+                        <QItem
+                            clickable
+                            v-close-popup
+                            v-ripple
+                            @click="showNewTicketDialog(false)"
+                        >
+                            <QItemSection>
+                                <QItemLabel>{{
+                                    t('expedition.newTicketWithoutRoute')
+                                }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                        <QItem
+                            clickable
+                            v-close-popup
+                            v-ripple
+                            @click="showNewTicketDialog(true)"
+                        >
+                            <QItemSection>
+                                <QItemLabel>{{
+                                    t('expedition.newTicketWithRoute')
+                                }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </QList>
+                </QBtnDropdown>
+                <QBtn
+                    :disable="!selectedExpeditions.length"
+                    icon="delete"
+                    color="primary"
+                    @click="
+                        openConfirmationModal(
+                            '',
+                            t('expedition.removeExpeditionSubtitle'),
+                            deleteExpedition
+                        )
+                    "
+                />
+            </QBtnGroup>
+        </template>
+    </VnSubToolbar>
+
+    <QTable
+        :rows="ticketExpeditions"
+        :columns="columns"
+        row-key="id"
+        :pagination="{ rowsPerPage: 0 }"
+        class="full-width q-mt-md"
+        selection="multiple"
+        v-model:selected="selectedExpeditions"
+        :visible-columns="visibleColumns"
+        :no-data-label="t('globals.noResults')"
+    >
+        <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>
+        <template #body-cell-item="{ row }">
+            <QTd auto-width @click.stop>
+                <QBtn flat color="primary">{{ row.packagingItemFk }}</QBtn>
+                <ItemDescriptorProxy :id="row.packagingItemFk" />
+            </QTd>
+        </template>
+        <template #body-cell-available="{ row }">
+            <QTd @click.stop>
+                <QBadge :color="row.available < 0 ? 'alert' : 'transparent'" dense>
+                    {{ row.available }}
+                </QBadge>
+            </QTd>
+        </template>
+
+        <template #body-cell-price="{ row }">
+            <QTd>
+                <template v-if="isTicketEditable && row.id">
+                    <QBtn flat color="primary" dense @click="onOpenEditPricePopover(row)">
+                        {{ toCurrency(row.price) }}
+                    </QBtn>
+                    <TicketEditManaProxy
+                        ref="editPriceProxyRef"
+                        :mana="mana"
+                        :new-price="getNewPrice"
+                        @save="updatePrice(row)"
+                    >
+                        <VnInput
+                            v-model.number="edit.price"
+                            :label="t('ticketSale.price')"
+                            type="number"
+                        />
+                    </TicketEditManaProxy>
+                </template>
+                <span v-else>{{ toCurrency(row.price) }}</span>
+            </QTd>
+        </template>
+        <template #body-cell-discount="{ row }">
+            <QTd>
+                <template v-if="!isLocked && row.id">
+                    <QBtn
+                        flat
+                        color="primary"
+                        dense
+                        @click="onOpenEditDiscountPopover(row)"
+                    >
+                        {{ toPercentage(row.discount / 100) }}
+                    </QBtn>
+                    <TicketEditManaProxy
+                        :mana="mana"
+                        :new-price="getNewPrice"
+                        @save="changeDiscount(row)"
+                    >
+                        <VnInput
+                            v-model.number="edit.discount"
+                            :label="t('ticketSale.discount')"
+                            type="number"
+                        />
+                    </TicketEditManaProxy>
+                </template>
+                <span v-else>{{ toPercentage(row.discount / 100) }}</span>
+            </QTd>
+        </template>
+        <template #body-cell-history="{ row }">
+            <QTd>
+                <QBtn
+                    @click.stop="showLog(row)"
+                    color="primary"
+                    icon="history"
+                    size="md"
+                    flat
+                >
+                    <QTooltip class="text-no-wrap">
+                        {{ t('expedition.historyAction') }}
+                    </QTooltip>
+                </QBtn>
+            </QTd>
+        </template>
+    </QTable>
+    <QDialog ref="newTicketDialogRef" transition-show="scale" transition-hide="scale">
+        <ExpeditionNewTicket
+            :ticket="ticketData"
+            :with-route="newTicketWithRoute"
+            :selected-expeditions="selectedExpeditions"
+        />
+    </QDialog>
+    <QDialog ref="logsTableDialogRef" transition-show="scale" transition-hide="scale">
+        <QTable
+            ref="tableRef"
+            data-key="TicketExpeditionLog"
+            :rows="expeditionsLogsData"
+            :columns="logTableColumns"
+            class="q-pa-sm"
+        >
+            <template #body-cell-name="{ row }">
+                <QTd auto-width>
+                    <QBtn flat dense color="primary">{{ row.name }}</QBtn>
+                    <WorkerDescriptorProxy :id="row.workerFk" />
+                </QTd>
+            </template>
+        </QTable>
+    </QDialog>
+</template>
diff --git a/src/pages/Ticket/Card/TicketPackage.vue b/src/pages/Ticket/Card/TicketPackage.vue
new file mode 100644
index 000000000..a76fce2b6
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketPackage.vue
@@ -0,0 +1,132 @@
+<script setup>
+import { ref, watch, computed, reactive } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CrudModel from 'components/CrudModel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+
+const route = useRoute();
+const { t } = useI18n();
+const ticketPackagingsCrudRef = ref(null);
+const listPackagingsOptions = ref([]);
+const arrayData = useArrayData('TicketPackagings');
+const { store } = arrayData;
+
+const crudModelFilter = reactive({
+    fields: ['id', 'ticketFk', 'packagingFk', 'quantity', 'created'],
+    where: { ticketFk: route.params.id },
+});
+
+const crudModelRequiredData = computed(() => ({
+    packagingFk: null,
+    quantity: 0,
+    created: Date.vnNew(),
+    ticketFk: route.params.id,
+}));
+
+const handleInputQuantityClear = (row) => {
+    if (row.quantity === null || row.quantity === undefined) row.quantity = 0;
+};
+
+watch(
+    () => route.params.id,
+    async () => {
+        crudModelFilter.where.ticketFk = route.params.id;
+        store.filter = crudModelFilter;
+        await ticketPackagingsCrudRef.value.reload();
+    }
+);
+</script>
+
+<template>
+    <FetchData
+        @on-fetch="(data) => (listPackagingsOptions = data)"
+        auto-load
+        :filter="{ fields: ['packagingFk', 'name'], order: 'name ASC', limit: 30 }"
+        url="Packagings/listPackaging"
+    />
+    <div class="flex justify-center">
+        <CrudModel
+            ref="ticketPackagingsCrudRef"
+            data-key="TicketPackagings"
+            url="TicketPackagings"
+            model="TicketPackagings"
+            :filter="crudModelFilter"
+            :data-required="crudModelRequiredData"
+            :default-remove="false"
+            auto-load
+            style="max-width: 800px"
+        >
+            <template #body="{ rows, validate }">
+                <QCard class="q-px-lg q-py-md">
+                    <div
+                        v-for="(row, index) in rows"
+                        :key="index"
+                        class="q-mb-md row items-center q-gutter-x-md"
+                    >
+                        <VnSelect
+                            :label="t('package.package')"
+                            :options="listPackagingsOptions"
+                            hide-selected
+                            option-label="name"
+                            option-value="packagingFk"
+                            v-model="row.packagingFk"
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>
+                                            {{ scope.opt?.name }}
+                                        </QItemLabel>
+                                        <QItemLabel caption>
+                                            #{{ scope.opt?.itemFk }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelect>
+                        <VnInput
+                            :label="t('package.quantity')"
+                            v-model.number="row.quantity"
+                            class="col"
+                            type="number"
+                            min="1"
+                            :required="true"
+                            @update:model-value="handleInputQuantityClear(row)"
+                            :rules="validate('TicketPackaging.quantity')"
+                        />
+                        <VnInputDate :label="t('package.added')" v-model="row.created" />
+                        <QIcon
+                            name="delete"
+                            size="sm"
+                            class="cursor-pointer"
+                            color="primary"
+                            @click="ticketPackagingsCrudRef.remove([row])"
+                        >
+                            <QTooltip>
+                                {{ t('package.removePackage') }}
+                            </QTooltip>
+                        </QIcon>
+                    </div>
+                    <QIcon
+                        name="add_circle"
+                        class="fill-icon-on-hover q-ml-md"
+                        size="sm"
+                        color="primary"
+                        @click="ticketPackagingsCrudRef.insert()"
+                    >
+                        <QTooltip>
+                            {{ t('package.addPackage') }}
+                        </QTooltip>
+                    </QIcon>
+                </QCard>
+            </template>
+        </CrudModel>
+    </div>
+</template>
diff --git a/src/pages/Ticket/Card/TicketPicture.vue b/src/pages/Ticket/Card/TicketPicture.vue
new file mode 100644
index 000000000..d6cc19bd1
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketPicture.vue
@@ -0,0 +1,60 @@
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import CatalogItem from 'components/ui/CatalogItem.vue';
+
+import { toCurrency } from 'filters/index';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const salesFilter = {
+    include: {
+        relation: 'item',
+        scope: {
+            field: ['name', 'image'],
+        },
+    },
+    where: { ticketFk: route.params.id },
+};
+const sales = ref([]);
+</script>
+
+<template>
+    <FetchData
+        ref="salesRef"
+        url="sales"
+        :filter="salesFilter"
+        @on-fetch="(data) => (sales = data)"
+        auto-load
+    />
+    <div class="pictures-list">
+        <CatalogItem v-for="(sale, index) in sales" :key="index" :item="sale.item">
+            <template #price>
+                <div class="q-mt-md full-width row justify-between items-center">
+                    <span class="text-h6">{{ sale.quantity }}</span>
+                    <span>{{ t('by') }}</span>
+                    <span class="text-h6">{{ toCurrency(sale?.price) }}</span>
+                </div>
+            </template>
+        </CatalogItem>
+    </div>
+</template>
+
+<style lang="scss" scoped>
+.pictures-list {
+    display: flex;
+    align-items: flex-start;
+    flex-wrap: wrap;
+    justify-content: center;
+    gap: 16px;
+}
+</style>
+
+<i18n>
+es:
+    by: por
+</i18n>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 32408bf67..cbc94b388 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -515,38 +515,32 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QBtnGroup>
         </template>
     </VnSubToolbar>
-    <RightMenu>
-        <template #right-panel>
-            <div
-                class="q-pa-md q-mb-md q-ma-md color-vn-text"
-                style="border: 2px solid black"
+    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+        <div
+            class="q-pa-md q-mb-md q-ma-md color-vn-text"
+            style="border: 2px solid black"
+        >
+            <QCardSection class="justify-center text-subtitle1" horizontal>
+                <span class="q-mr-xs color-vn-label"
+                    >{{ t('ticketSale.subtotal') }}:
+                </span>
+                <span>{{ toCurrency(store.data?.totalWithoutVat) }}</span>
+            </QCardSection>
+            <QCardSection class="justify-center text-subtitle1" horizontal>
+                <span class="q-mr-xs color-vn-label"> {{ t('ticketSale.tax') }}: </span>
+                <span>{{
+                    toCurrency(store.data?.totalWithVat - store.data?.totalWithoutVat)
+                }}</span>
+            </QCardSection>
+            <QCardSection
+                class="justify-center text-weight-bold text-subtitle1"
+                horizontal
             >
-                <QCardSection class="justify-center text-subtitle1" horizontal>
-                    <span class="q-mr-xs color-vn-label"
-                        >{{ t('ticketSale.subtotal') }}:
-                    </span>
-                    <span>{{ toCurrency(store.data?.totalWithoutVat) }}</span>
-                </QCardSection>
-                <QCardSection class="justify-center text-subtitle1" horizontal>
-                    <span class="q-mr-xs color-vn-label">
-                        {{ t('ticketSale.tax') }}:
-                    </span>
-                    <span>{{
-                        toCurrency(store.data?.totalWithVat - store.data?.totalWithoutVat)
-                    }}</span>
-                </QCardSection>
-                <QCardSection
-                    class="justify-center text-weight-bold text-subtitle1"
-                    horizontal
-                >
-                    <span class="q-mr-xs color-vn-label">
-                        {{ t('ticketSale.total') }}:
-                    </span>
-                    <span>{{ toCurrency(store.data?.totalWithVat) }}</span>
-                </QCardSection>
-            </div>
-        </template>
-    </RightMenu>
+                <span class="q-mr-xs color-vn-label"> {{ t('ticketSale.total') }}: </span>
+                <span>{{ toCurrency(store.data?.totalWithVat) }}</span>
+            </QCardSection>
+        </div></QDrawer
+    >
     <QTable
         :rows="sales"
         :columns="columns"
@@ -774,6 +768,5 @@ es:
     Continue anyway?: ¿Continuar de todas formas?
     You are going to delete lines of the ticket: Vas a eliminar lineas del ticket
     Add item: Añadir artículo
-    Select lines to see the options: Selecciona líneas para ver las opciones
     Transfer lines: Transferir líneas
 </i18n>
diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
new file mode 100644
index 000000000..d519bc2c6
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -0,0 +1,549 @@
+<script setup>
+import { ref, computed, nextTick, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import FetchData from 'components/FetchData.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 ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+
+import { dashIfEmpty } from 'src/filters';
+import useNotify from 'src/composables/useNotify.js';
+import { toDateTimeFormat } from 'src/filters/date';
+
+import axios from 'axios';
+
+const route = useRoute();
+const { t } = useI18n();
+const { notify } = useNotify();
+const saleTrackingTableDialogRef = ref(null);
+const itemShelvingSaleDialogRef = ref(null);
+const saleTrackingFetchDataRef = ref(null);
+
+const sales = ref([]);
+const saleTrackings = ref([]);
+const itemShelvignsSales = ref([]);
+const shelvingsOptions = ref([]);
+const parkingsOptions = ref([]);
+const saleTrackingUrl = computed(() => `SaleTrackings/${route.params.id}/filter`);
+const oldQuantity = ref(null);
+
+watch(
+    () => route.params.id,
+    async () => nextTick(async () => await saleTrackingFetchDataRef.value.fetch())
+);
+
+const columns = computed(() => [
+    {
+        label: t('ticketSaleTracking.isChecked'),
+        name: 'isChecked',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.item'),
+        name: 'item',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.description'),
+        name: 'description',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.quantity'),
+        name: 'quantity',
+        field: 'quantity',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.parking'),
+        name: 'parking',
+        field: 'parkingCode',
+        align: 'left',
+        sortable: true,
+        format: (value) => dashIfEmpty(value),
+    },
+    {
+        label: '',
+        name: 'actions',
+        align: 'left',
+        sortable: true,
+    },
+]);
+
+const logTableColumns = computed(() => [
+    {
+        label: t('ticketSaleTracking.quantity'),
+        name: 'quantity',
+        field: 'quantity',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.original'),
+        name: 'original',
+        field: 'originalQuantity',
+        align: 'original',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.worker'),
+        name: 'worker',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.state'),
+        name: 'state',
+        field: 'state',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.created'),
+        name: 'created',
+        field: 'created',
+        align: 'left',
+        sortable: true,
+        format: (value) => toDateTimeFormat(value),
+    },
+]);
+
+const shelvingsTableColumns = computed(() => [
+    {
+        label: t('ticketSaleTracking.quantity'),
+        name: 'quantity',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.worker'),
+        name: 'worker',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.shelving'),
+        name: 'shelving',
+        align: 'original',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.parking'),
+        name: 'parking',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.created'),
+        name: 'created',
+        field: 'created',
+        align: 'left',
+        sortable: true,
+        format: (value) => toDateTimeFormat(value),
+    },
+]);
+
+const getSaleTrackings = async (sale) => {
+    try {
+        const filter = {
+            where: { saleFk: sale.saleFk },
+            order: ['itemFk DESC'],
+        };
+        const { data } = await axios.get(`SaleTrackings/listSaleTracking`, {
+            params: { filter: JSON.stringify(filter) },
+        });
+        saleTrackings.value = data;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const showLog = async (sale) => {
+    await getSaleTrackings(sale);
+    saleTrackingTableDialogRef.value.show();
+};
+
+const getItemShelvingSales = async (sale) => {
+    try {
+        const filter = {
+            where: { saleFk: sale.saleFk },
+        };
+        const { data } = await axios.get(`ItemShelvingSales/filter`, {
+            params: { filter: JSON.stringify(filter) },
+        });
+        itemShelvignsSales.value = data;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const showShelving = async (sale) => {
+    await getItemShelvingSales(sale);
+    itemShelvingSaleDialogRef.value.show();
+};
+
+const updateQuantity = async (sale) => {
+    try {
+        if (oldQuantity.value === sale.quantity) return;
+        const params = {
+            quantity: sale.quantity,
+        };
+        await axios.patch(`ItemShelvingSales/${sale.id}`, params);
+        oldQuantity.value = null;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const updateParking = async (sale) => {
+    try {
+        const filter = {
+            fields: ['id'],
+            where: {
+                code: sale.shelvingFk,
+            },
+        };
+        const { data } = await axios.get(`Shelvings/findOne`, {
+            params: { filter: JSON.stringify(filter) },
+        });
+        const params = {
+            parkingFk: sale.parkingFk,
+        };
+        await axios.patch(`Shelvings/${data.id}`, params);
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const updateShelving = async (sale) => {
+    const params = {
+        shelvingFk: sale.shelvingFk,
+    };
+
+    const { data: patchResponseData } = await axios.patch(
+        `ItemShelvings/${sale.itemShelvingFk}`,
+        params
+    );
+    const filter = {
+        fields: ['parkingFk'],
+        where: {
+            code: patchResponseData.shelvingFk,
+        },
+    };
+    const { data: getResponseData } = await axios.get(`Shelvings/findOne`, { filter });
+    sale.parkingFk = getResponseData.parkingFk;
+};
+
+const saleTrackingNew = async (sale, stateCode, isChecked) => {
+    try {
+        const params = {
+            saleFk: sale.saleFk,
+            isChecked,
+            quantity: sale.quantity,
+            stateCode,
+        };
+        await axios.post(`SaleTrackings/new`, params);
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const saleTrackingDel = async ({ saleFk }, stateCode) => {
+    try {
+        const params = {
+            saleFk,
+            stateCodes: [stateCode],
+        };
+        await axios.post(`SaleTrackings/delete`, params);
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const clickSaleGroupDetail = async (sale) => {
+    try {
+        if (!sale.saleGroupDetailFk) return;
+
+        await axios.delete(`SaleGroupDetails/${sale.saleGroupDetailFk}`);
+        sale.hasSaleGroupDetail = false;
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const clickPreviousSelected = (sale) => {
+    try {
+        qCheckBoxController(sale, 'isPreviousSelected');
+        if (!sale.isPreviousSelected) sale.isPrevious = false;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const clickPrevious = (sale) => {
+    try {
+        qCheckBoxController(sale, 'isPrevious');
+        if (sale.isPrevious) sale.isPreviousSelected = true;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const qCheckBoxController = (sale, action) => {
+    const STATE_CODES = {
+        isControled: 'CHECKED',
+        isPrepared: 'PREPARED',
+        isPrevious: 'PREVIOUS_PREPARATION',
+        isPreviousSelected: 'PREVIOUS_PREPARATION',
+    };
+    const stateCode = STATE_CODES[action];
+    try {
+        if (!sale[action]) {
+            saleTrackingNew(sale, stateCode, true);
+            sale[action] = true;
+        } else {
+            saleTrackingDel(sale, stateCode);
+            sale[action] = false;
+        }
+    } catch (error) {
+        console.error(error);
+    }
+};
+</script>
+
+<template>
+    <FetchData
+        ref="saleTrackingFetchDataRef"
+        :url="saleTrackingUrl"
+        :filter="{ order: ['concept ASC', 'quantity DESC'] }"
+        auto-load
+        @on-fetch="(data) => (sales = data)"
+    />
+    <FetchData
+        url="Shelvings"
+        auto-load
+        @on-fetch="(data) => (shelvingsOptions = data)"
+    />
+    <FetchData url="Parkings" auto-load @on-fetch="(data) => (parkingsOptions = data)" />
+    <QTable
+        :rows="sales"
+        :columns="columns"
+        row-key="id"
+        :pagination="{ rowsPerPage: 0 }"
+        class="full-width q-mt-md"
+        :no-data-label="t('globals.noResults')"
+    >
+        <template #body-cell-isChecked="{ row }">
+            <QTd @click.stop>
+                <QCheckbox
+                    :model-value="!!row.hasSaleGroupDetail"
+                    color="pink"
+                    class="pink"
+                    :toggle-indeterminate="false"
+                    @update:model-value="clickSaleGroupDetail(row)"
+                >
+                    <QTooltip>
+                        {{ t('ticketSaleTracking.saleGroupDetail') }}
+                    </QTooltip>
+                </QCheckbox>
+                <QCheckbox
+                    :model-value="!!row.isPreviousSelected"
+                    color="info"
+                    class="info"
+                    :toggle-indeterminate="false"
+                    @update:model-value="clickPreviousSelected(row)"
+                >
+                    <QTooltip>
+                        {{ t('ticketSaleTracking.previousSelected') }}
+                    </QTooltip>
+                </QCheckbox>
+                <QCheckbox
+                    :model-value="!!row.isPrevious"
+                    color="cyan"
+                    class="cyan"
+                    :toggle-indeterminate="false"
+                    @update:model-value="clickPrevious(row)"
+                >
+                    <QTooltip>
+                        {{ t('ticketSaleTracking.previous') }}
+                    </QTooltip>
+                </QCheckbox>
+                <QCheckbox
+                    :model-value="!!row.isPrepared"
+                    color="warning"
+                    class="warning"
+                    :toggle-indeterminate="false"
+                    @update:model-value="qCheckBoxController(row, 'isPrepared')"
+                >
+                    <QTooltip>
+                        {{ t('ticketSaleTracking.prepared') }}
+                    </QTooltip>
+                </QCheckbox>
+                <QCheckbox
+                    :model-value="!!row.isControled"
+                    color="yellow"
+                    class="yellow"
+                    :toggle-indeterminate="false"
+                    @update:model-value="qCheckBoxController(row, 'isControled')"
+                >
+                    <QTooltip>
+                        {{ t('ticketSaleTracking.checked') }}
+                    </QTooltip>
+                </QCheckbox>
+            </QTd>
+        </template>
+        <template #body-cell-item="{ row }">
+            <QTd @click.stop>
+                <div>
+                    <QBtn flat color="primary">
+                        {{ row.itemFk }}
+                    </QBtn>
+                    <ItemDescriptorProxy :id="row.itemFk" />
+                </div>
+            </QTd>
+        </template>
+        <template #body-cell-description="{ row }">
+            <QTd class="col">
+                <div class="column">
+                    <span>{{ row.concept }}</span>
+                    <span v-if="row.subName" class="color-vn-label">
+                        {{ row.subName }}
+                    </span>
+                    <FetchedTags :item="row" :max-length="6" tag="value" />
+                </div>
+            </QTd>
+        </template>
+        <template #body-cell-actions="{ row }">
+            <QTd>
+                <QBtn
+                    @click.stop="showLog(row)"
+                    color="primary"
+                    icon="history"
+                    size="md"
+                    flat
+                >
+                    <QTooltip class="text-no-wrap">
+                        {{ t('ticketSaleTracking.historyAction') }}
+                    </QTooltip>
+                </QBtn>
+                <QBtn
+                    @click.stop="showShelving(row)"
+                    color="primary"
+                    icon="vn:inventory"
+                    size="md"
+                    flat
+                >
+                    <QTooltip class="text-no-wrap">
+                        {{ t('ticketSaleTracking.shelvingAction') }}
+                    </QTooltip>
+                </QBtn>
+            </QTd>
+        </template>
+    </QTable>
+    <QDialog
+        ref="saleTrackingTableDialogRef"
+        transition-show="scale"
+        transition-hide="scale"
+    >
+        <QTable
+            data-key="saleTrackingLog"
+            :rows="saleTrackings"
+            :columns="logTableColumns"
+            class="q-pa-sm"
+        >
+            <template #body-cell-worker="{ row }">
+                <QTd auto-width>
+                    <QBtn flat dense color="primary">{{ row.name }}</QBtn>
+                    <WorkerDescriptorProxy :id="row.workerFk" />
+                </QTd>
+            </template>
+        </QTable>
+    </QDialog>
+    <QDialog
+        ref="itemShelvingSaleDialogRef"
+        transition-show="scale"
+        transition-hide="scale"
+    >
+        <QTable
+            data-key="itemShelvingsSales"
+            :rows="itemShelvignsSales"
+            :columns="shelvingsTableColumns"
+            class="q-pa-sm"
+        >
+            <template #body-cell-quantity="{ row }">
+                <QTd auto-width>
+                    <VnInput
+                        v-model.number="row.quantity"
+                        @keyup.enter="updateQuantity(row)"
+                        @blur="updateQuantity(row)"
+                        @focus="oldQuantity = row.quantity"
+                    />
+                </QTd>
+            </template>
+            <template #body-cell-worker="{ row }">
+                <QTd auto-width>
+                    <QBtn flat dense color="primary">{{ row.name }}</QBtn>
+                    <WorkerDescriptorProxy :id="row.userFk" />
+                </QTd>
+            </template>
+            <template #body-cell-shelving="{ row }">
+                <QTd auto-width>
+                    <VnSelect
+                        :options="shelvingsOptions"
+                        hide-selected
+                        option-label="code"
+                        option-value="code"
+                        v-model="row.shelvingFk"
+                        @update:model-value="updateShelving(row)"
+                        style="max-width: 120px"
+                    />
+                </QTd>
+            </template>
+            <template #body-cell-parking="{ row }">
+                <QTd auto-width>
+                    <VnSelect
+                        :options="parkingsOptions"
+                        hide-selected
+                        option-label="code"
+                        option-value="id"
+                        v-model="row.parkingFk"
+                        @update:model-value="updateParking(row)"
+                        style="max-width: 120px"
+                    />
+                </QTd>
+            </template>
+        </QTable>
+    </QDialog>
+</template>
+
+<style lang="scss">
+$estados: (
+    'info': var(--q-info),
+    'warning': var(--q-warning),
+    'cyan': #00bcd4,
+    'pink': pink,
+    'yellow': #ffeb3b,
+);
+
+@each $estado, $color in $estados {
+    .q-checkbox.#{$estado} {
+        > .q-checkbox__inner > .q-checkbox__bg.absolute {
+            border-radius: 50% !important;
+            & .q-checkbox__svg > .q-checkbox__truthy {
+                stroke: $color;
+            }
+        }
+    }
+}
+</style>
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 4cc8207ef..63dd454ba 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -77,7 +77,6 @@ const getDefaultTaxClass = async () => {
             params: { filter: JSON.stringify(filter) },
         });
         defaultTaxClass.value = data;
-        console.log('defaultTaxClass', defaultTaxClass.value);
     } catch (error) {
         console.error(error);
     }
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 8b0a426dd..bb9a8c8a8 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -9,6 +9,8 @@ import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.v
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnProgress from 'src/components/common/VnProgressModal.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import TicketAdvanceFilter from './TicketAdvanceFilter.vue';
 
 import { dashIfEmpty, toCurrency } from 'src/filters';
 import { useVnConfirm } from 'composables/useVnConfirm';
@@ -42,9 +44,9 @@ const exprBuilder = (param, value) => {
         case 'notMovableLines':
         case 'futureZoneFk':
             return { [param]: value };
-        case 'ipt':
+        case 'iptColFilter':
             return { ipt: { like: `%${value}%` } };
-        case 'futureIpt':
+        case 'futureIptColFilter':
             return { futureIpt: { like: `%${value}%` } };
     }
 };
@@ -55,6 +57,7 @@ const arrayData = useArrayData('AdvanceTickets', {
     url: 'Tickets/getTicketsAdvance',
     userParams: userParams,
     exprBuilder: exprBuilder,
+    limit: 0,
 });
 const { store } = arrayData;
 const tickets = computed(() =>
@@ -110,7 +113,7 @@ const ticketColumns = computed(() => [
         sortable: true,
         columnFilter: {
             component: VnSelect,
-            filterParamKey: 'ipt',
+            filterParamKey: 'iptColFilter',
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -194,7 +197,7 @@ const ticketColumns = computed(() => [
         sortable: true,
         columnFilter: {
             component: VnSelect,
-            filterParamKey: 'futureIpt',
+            filterParamKey: 'futureIptColFilter',
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -451,7 +454,8 @@ onMounted(async () => {
     userParams.dateFuture = tomorrow;
     userParams.dateToAdvance = today;
     userParams.warehouseFk = user.value.warehouseFk;
-    await arrayData.addFilter({ userParams });
+    const filter = { limit: 0 };
+    await arrayData.addFilter({ filter, userParams });
 });
 </script>
 
@@ -521,6 +525,11 @@ onMounted(async () => {
             </QBtn>
         </template>
     </VnSubToolbar>
+    <RightMenu>
+        <template #right-panel>
+            <TicketAdvanceFilter data-key="AdvanceTickets" />
+        </template>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <QTable
             :rows="tickets"
diff --git a/src/pages/Ticket/TicketAdvanceFilter.vue b/src/pages/Ticket/TicketAdvanceFilter.vue
new file mode 100644
index 000000000..c4548763a
--- /dev/null
+++ b/src/pages/Ticket/TicketAdvanceFilter.vue
@@ -0,0 +1,173 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+import axios from 'axios';
+import { onMounted } from 'vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+    exprBuilder: {
+        type: Function,
+        default: null,
+    },
+});
+
+const warehousesOptions = ref([]);
+const itemPackingTypes = ref([]);
+
+const getItemPackingTypes = async () => {
+    try {
+        const filter = {
+            where: { isActive: true },
+        };
+        const { data } = await axios.get('ItemPackingTypes', {
+            params: { filter: JSON.stringify(filter) },
+        });
+        itemPackingTypes.value = data.map((ipt) => ({
+            description: t(ipt.description),
+            code: ipt.code,
+        }));
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+onMounted(async () => await getItemPackingTypes());
+</script>
+
+<template>
+    <FetchData
+        url="Warehouses"
+        @on-fetch="(data) => (warehousesOptions = data)"
+        auto-load
+    />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :hidden-tags="['search']"
+        :unremovable-params="['warehouseFk', 'dateFuture', 'dateToAdvance']"
+    >
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params, searchFn }">
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.dateFuture"
+                        :label="t('params.dateFuture')"
+                        is-outlined
+                        @update:model-value="searchFn()"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.dateToAdvance"
+                        :label="t('params.dateToAdvance')"
+                        is-outlined
+                        @update:model-value="searchFn()"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        :label="t('params.futureIpt')"
+                        v-model="params.futureIpt"
+                        :options="itemPackingTypes"
+                        option-value="code"
+                        option-label="description"
+                        :info="t('iptInfo')"
+                        @update:model-value="searchFn()"
+                        dense
+                        outlined
+                        rounded
+                    >
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        :label="t('params.ipt')"
+                        v-model="params.ipt"
+                        :options="itemPackingTypes"
+                        option-value="code"
+                        option-label="description"
+                        :info="t('iptInfo')"
+                        @update:model-value="searchFn()"
+                        dense
+                        outlined
+                        rounded
+                    >
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.itemPackingTypes')"
+                        v-model="params.itemPackingTypes"
+                        toggle-indeterminate
+                        :false-value="null"
+                        @update:model-value="searchFn()"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        :label="t('params.warehouseFk')"
+                        v-model="params.warehouseFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        @update:model-value="searchFn()"
+                        dense
+                        outlined
+                        rounded
+                    >
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    iptInfo: IPT
+    params:
+        dateFuture: Origin date
+        dateToAdvance: Destination date
+        futureIpt: Origin IPT
+        ipt: Destination IPT
+        itemPackingTypes: 100% movable
+        warehouseFk: Warehouse
+es:
+    Horizontal: Horizontal
+    Vertical: Vertical
+    iptInfo: Encajado
+    params:
+        dateFuture: fecha origen
+        dateToAdvance: Fecha destino
+        futureIpt: IPT Origen
+        ipt: IPT destino
+        itemPackingTypes: 100% movible
+        warehouseFk: Almacén
+</i18n>
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 63ac48393..3570cfc03 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -5,8 +5,6 @@ import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-
-import toDateString from 'filters/toDateString';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 16d7aac5d..6090bdbef 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -3,8 +3,8 @@ import { onMounted, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
+import { toDate, toCurrency } from 'src/filters/index';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import { toDate, toDateString, toCurrency } from 'src/filters/index';
 import TicketSummary from './Card/TicketSummary.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import TicketFilter from './TicketFilter.vue';
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 39aed4af7..d5530926f 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -93,6 +93,25 @@ futureTickets:
     moveTicketSuccess: Tickets moved successfully!
     searchInfo: Search future tickets by date
     futureTicket: Future tickets
+expedition:
+    id: Expedition
+    item: Item
+    name: Name
+    packageType: Package type
+    counter: Counter
+    externalId: externalId
+    created: Created
+    state: State
+    historyAction: Status log
+    newTicketWithRoute: New ticket with route
+    newTicketWithoutRoute: New ticket without route
+    landed: Landed
+    routeId: Route id
+    deleteExpedition: Delete expedition
+    expeditionRemoved: Expedition removed
+    removeExpeditionSubtitle: Are you sure you want to delete this expedition?
+    worker: Worker
+    move: Move
 basicData:
     next: Next
     back: Back
@@ -149,6 +168,24 @@ weeklyTickets:
     salesperson: Salesperson
     search: Search weekly tickets
     searchInfo: Search weekly tickets by id or client id
+ticketSaleTracking:
+    isChecked: Is checked
+    item: Item
+    description: Description
+    quantity: Quantity
+    parking: Parking
+    historyAction: Log states
+    shelvingAction: Shelvings sale
+    original: Original
+    worker: Worker
+    state: State
+    created: Created
+    shelving: Shelving
+    saleGroupDetail: sale group detail
+    previousSelected: previous selected
+    previous: previous
+    prepared: prepared
+    checked: checked
 service:
     pay: Pay
     description: Description
@@ -159,8 +196,32 @@ service:
     addService: Add service
     quantityInfo: To create services with negative amounts mark the service on the source ticket and press the pay button.
     createRefundSuccess: 'The following refund ticket have been created: { ticketId }'
+ticketComponents:
+    item: Item
+    description: Description
+    quantity: Quantity
+    serie: Serie
+    components: Components
+    import: Import
+    total: Total
+    baseToCommission: Base to commission
+    totalWithoutVat: Total without VAT
+    zoneBreakdown: Zone breakdown
+    price: Price
+    bonus: Bonus
+    zone: Zone
+    volume: Volume
+    theoricalCost: Theorical cost
+    totalPrice: Total price
+    packages: Packages
 tracking:
     state: State
     worker: Worker
     created: Created
     addState: Add state
+package:
+    package: Package
+    quantity: Quantity
+    added: Added
+    addPackage: Add package
+    removePackage: Remove package
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index d5b50efc5..132c61928 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -164,5 +164,67 @@ ticketSale:
     shipped: F. Envío
     agency: Agencia
     address: Consignatario
+ticketComponents:
+    item: Artículo
+    description: Descripción
+    quantity: Cantidad
+    serie: Serie
+    components: Componentes
+    import: Importe
+    total: Total
+    baseToCommission: Base comisionable
+    totalWithoutVat: Total sin IVA
+    zoneBreakdown: Desglose zona
+    price: Precio
+    bonus: Bonificación
+    zone: Zona
+    volume: Volúmen
+    theoricalCost: Porte teórico
+    totalPrice: Precio total
+    packages: Bultos
+expedition:
+    id: Expedición
+    item: Artículo
+    name: Nombre
+    packageType: Package type
+    counter: Contador
+    externalId: externalId
+    created: Fecha creación
+    state: Estado
+    historyAction: Historial de estados
+    newTicketWithRoute: Nuevo ticket con ruta
+    newTicketWithoutRoute: Nuevo ticket sin ruta
+    landed: F. entrega
+    routeId: Id ruta
+    deleteExpedition: Eliminar expedición
+    expeditionRemoved: Expedición eliminada
+    removeExpeditionSubtitle: ¿Está seguro de eliminar esta expedición?
+    worker: Trabajador
+    move: Mover
+package:
+    package: Embalaje
+    quantity: Cantidad
+    added: Añadido
+    addPackage: Añadir embalaje
+    removePackage: Quitar embalaje
+ticketSaleTracking:
+    isChecked: Comprobado
+    item: Artículo
+    description: Descripción
+    quantity: Cantidad
+    parking: Parking
+    historyAction: Historial estados
+    shelvingAction: Carros línea
+    original: Original
+    worker: Trabajador
+    state: Estado
+    created: Fecha creación
+    shelving: Matrícula
+    saleGroupDetail: detalle grupo líneas
+    previousSelected: previa seleccionado
+    previous: previa
+    prepared: preparado
+    checked: revisado
 Search ticket: Buscar tickets
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket
+Select lines to see the options: Selecciona líneas para ver las opciones
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index af9aa5f7f..d7dce911b 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onUpdated } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
deleted file mode 100644
index 77f7ec112..000000000
--- a/src/pages/Travel/TravelFilter.vue
+++ /dev/null
@@ -1,225 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import FetchData from 'components/FetchData.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-
-const { t } = useI18n();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
-
-const warehousesOptions = ref([]);
-const continentsOptions = ref([]);
-const agenciesOptions = ref([]);
-
-const add = (paramsObj, key) => {
-    if (paramsObj[key] === undefined) {
-        paramsObj[key] = 1;
-    } else {
-        paramsObj[key]++;
-    }
-};
-
-const decrement = (paramsObj, key) => {
-    if (paramsObj[key] === 0) return;
-
-    paramsObj[key]--;
-};
-</script>
-
-<template>
-    <FetchData
-        url="Warehouses"
-        @on-fetch="(data) => (warehousesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Continents"
-        @on-fetch="(data) => (continentsOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="AgencyModes"
-        @on-fetch="(data) => (agenciesOptions = data)"
-        auto-load
-    />
-
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params, searchFn }">
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        :label="t('travelFilter.filter.agencyModeFk')"
-                        v-model="params.agencyModeFk"
-                        @update:model-value="searchFn()"
-                        :options="agenciesOptions"
-                        option-value="agencyFk"
-                        option-label="name"
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        :label="t('travelFilter.filter.warehouseOutFk')"
-                        v-model="params.warehouseOutFk"
-                        @update:model-value="searchFn()"
-                        :options="warehousesOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        :label="t('travelFilter.filter.warehouseInFk')"
-                        v-model="params.warehouseInFk"
-                        @update:model-value="searchFn()"
-                        :options="warehousesOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <QInput
-                        v-model="params.scopeDays"
-                        type="number"
-                        :label="t('travelFilter.filter.scopeDays')"
-                        dense
-                        outlined
-                        rounded
-                        class="input-number"
-                    >
-                        <template #append>
-                            <QBtn
-                                icon="add"
-                                flat
-                                dense
-                                size="12px"
-                                @click="add(params, 'scopeDays')"
-                            />
-                            <QBtn
-                                icon="remove"
-                                flat
-                                dense
-                                size="12px"
-                                @click="decrement(params, 'scopeDays')"
-                            />
-                        </template>
-                    </QInput>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        v-model="params.landedFrom"
-                        :label="t('params.landedFrom')"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        :label="t('params.landedTo')"
-                        v-model="params.landedTo"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        :label="t('params.continent')"
-                        v-model="params.continent"
-                        @update:model-value="searchFn()"
-                        :options="continentsOptions"
-                        option-value="code"
-                        option-label="name"
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <QInput
-                        v-model="params.totalEntries"
-                        type="number"
-                        :label="t('params.totalEntries')"
-                        dense
-                        outlined
-                        rounded
-                        min="0"
-                        class="input-number"
-                    >
-                        <template #append>
-                            <QBtn
-                                icon="add"
-                                flat
-                                dense
-                                size="12px"
-                                @click="add(params, 'totalEntries')"
-                            />
-                            <QBtn
-                                icon="remove"
-                                flat
-                                dense
-                                size="12px"
-                                @click="decrement(params, 'totalEntries')"
-                            />
-                        </template>
-                    </QInput>
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-
-<i18n>
-en:
-    params:
-        search: Id/Reference
-        landedFrom: Landed from
-        landedTo: Landed to
-        continent: Continent out
-        totalEntries: Total entries
-es:
-    params:
-        search: Id/Referencia
-        landedFrom: Llegada desde
-        landedTo: Llegada hasta
-        continent: Cont. Salida
-        totalEntries: Ent. totales
-
-</i18n>
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 200ef817b..dbb8949a7 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -198,7 +198,6 @@ const columns = computed(() => [
         }"
         order="landed DESC"
         :columns="columns"
-        default-mode="table"
         auto-load
         redirect="travel"
         :is-editable="false"
diff --git a/src/pages/Travel/locale/en.yml b/src/pages/Travel/locale/en.yml
deleted file mode 100644
index c67eddce0..000000000
--- a/src/pages/Travel/locale/en.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-travelFilter:
-    filter:
-        warehouseOutFk: Warehouse Out
-        warehouseInFk: Warehouse In
-        agencyModeFk: Agency
-        scopeDays: Days onward
diff --git a/src/pages/Travel/locale/es.yml b/src/pages/Travel/locale/es.yml
deleted file mode 100644
index 8e958c074..000000000
--- a/src/pages/Travel/locale/es.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-travelFilter:
-    filter:
-        warehouseInFk: Alm. entrada
-        warehouseOutFk: Alm. salida
-        agencyModeFk: Agencia
-        scopeDays: Días adelante
diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue
index ad18d61e0..037a65eaf 100644
--- a/src/pages/Worker/Card/WorkerBalance.vue
+++ b/src/pages/Worker/Card/WorkerBalance.vue
@@ -77,7 +77,6 @@ const columns = computed(() => [
         }"
         order="paymentDate DESC"
         :columns="columns"
-        default-mode="table"
         auto-load
         :right-search="false"
         :is-editable="true"
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 82a698878..951c8511e 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -71,7 +71,7 @@ watch(
 const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
-    data.value = useCardDescription(entity.user.nickname, entity.id);
+    data.value = useCardDescription(entity.user?.nickname, entity.id);
 };
 
 const openChangePasswordForm = () => changePasswordFormDialog.value.show();
diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index 0ac97d9ef..829326898 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -116,7 +116,6 @@ const columns = computed(() => [
         }"
         order="id DESC"
         :columns="columns"
-        default-mode="table"
         auto-load
         :right-search="false"
         :is-editable="true"
diff --git a/src/router/modules/invoiceOut.js b/src/router/modules/invoiceOut.js
index 7c05b82e6..aac84573c 100644
--- a/src/router/modules/invoiceOut.js
+++ b/src/router/modules/invoiceOut.js
@@ -35,7 +35,7 @@ export default {
                     name: 'InvoiceOutGlobal',
                     meta: {
                         title: 'globalInvoicing',
-                        icon: 'contact_support',
+                        icon: 'Date_Range',
                     },
                     component: () => import('src/pages/InvoiceOut/InvoiceOutGlobal.vue'),
                 },
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
index eb5424e75..aa1ca774d 100644
--- a/src/router/modules/order.js
+++ b/src/router/modules/order.js
@@ -37,7 +37,7 @@ export default {
                         title: 'orderCreate',
                         icon: 'add',
                     },
-                    component: () => import('src/pages/Order/Card/OrderForm.vue'),
+                    component: () => import('src/pages/Order/OrderList.vue'),
                 },
             ],
         },
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 72f423ae3..f6f92b7d9 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -57,15 +57,6 @@ export default {
                     },
                     component: () => import('src/pages/Route/RouteRoadmap.vue'),
                 },
-                {
-                    path: 'roadmap/create',
-                    name: 'RouteRoadmapCreate',
-                    meta: {
-                        title: 'RouteRoadmapCreate',
-                        icon: 'vn:troncales',
-                    },
-                    component: () => import('src/pages/Route/Roadmap/RoadmapCreate.vue'),
-                },
                 {
                     path: 'cmr',
                     name: 'CmrList',
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 1e635470b..c507553d6 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -14,15 +14,21 @@ export default {
         main: ['TicketList', 'TicketAdvance', 'TicketWeekly', 'TicketFuture'],
         card: [
             'TicketBasicData',
-            'TicketBoxing',
-            'TicketSms',
             'TicketSale',
             'TicketLog',
+            'TicketExpedition',
+            'TicketDms',
             'TicketPurchaseRequest',
-            'TicketService',
             'TicketTracking',
-            'TicketVolume',
             'TicketNotes',
+            'TicketPicture',
+            'TicketVolume',
+            'TicketComponents',
+            'TicketPackage',
+            'TicketService',
+            'TicketSaleTracking',
+            'TicketBoxing',
+            'TicketSms',
         ],
     },
     children: [
@@ -70,8 +76,8 @@ export default {
                     component: () => import('src/pages/Ticket/TicketFuture.vue'),
                 },
                 {
-                    path: 'advance',
                     name: 'TicketAdvance',
+                    path: 'advance',
                     meta: {
                         title: 'ticketAdvance',
                         icon: 'keyboard_double_arrow_left',
@@ -142,12 +148,95 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketLog.vue'),
                 },
+                {
+                    path: 'observation',
+                    name: 'TicketNotes',
+                    meta: {
+                        title: 'notes',
+                        icon: 'vn:notes',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketNotes.vue'),
+                },
+                {
+                    path: 'picture',
+                    name: 'TicketPicture',
+                    meta: {
+                        title: 'pictures',
+                        icon: 'vn:photo',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketPicture.vue'),
+                },
+                {
+                    path: 'volume',
+                    name: 'TicketVolume',
+                    meta: {
+                        title: 'volume',
+                        icon: 'vn:volume',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketVolume.vue'),
+                },
+                {
+                    path: 'expedition',
+                    name: 'TicketExpedition',
+                    meta: {
+                        title: 'expedition',
+                        icon: 'vn:package',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketExpedition.vue'),
+                },
+                {
+                    path: 'service',
+                    name: 'TicketService',
+                    meta: {
+                        title: 'services',
+                        icon: 'vn:services',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketService.vue'),
+                },
+                {
+                    path: 'package',
+                    name: 'TicketPackage',
+                    meta: {
+                        title: 'packages',
+                        icon: 'vn:bin',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketPackage.vue'),
+                },
+                {
+                    path: 'components',
+                    name: 'TicketComponents',
+                    meta: {
+                        title: 'components',
+                        icon: 'vn:components',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketComponents.vue'),
+                },
+
+                {
+                    path: 'sale-tracking',
+                    name: 'TicketSaleTracking',
+                    meta: {
+                        title: 'saleTracking',
+                        icon: 'assignment',
+                    },
+                    component: () =>
+                        import('src/pages/Ticket/Card/TicketSaleTracking.vue'),
+                },
+                {
+                    path: 'dms',
+                    name: 'TicketDms',
+                    meta: {
+                        title: 'dms',
+                        icon: 'cloud_upload',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketDms.vue'),
+                },
                 {
                     path: 'boxing',
                     name: 'TicketBoxing',
                     meta: {
                         title: 'boxing',
-                        icon: 'vn:package',
+                        icon: 'science',
                     },
                     component: () => import('src/pages/Ticket/Card/TicketBoxing.vue'),
                 },
@@ -160,34 +249,6 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
                 },
-
-                {
-                    path: 'service',
-                    name: 'TicketService',
-                    meta: {
-                        title: 'services',
-                        icon: 'vn:services',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketService.vue'),
-                },
-                {
-                    path: 'volume',
-                    name: 'TicketVolume',
-                    meta: {
-                        title: 'volume',
-                        icon: 'vn:volume',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketVolume.vue'),
-                },
-                {
-                    path: 'observation',
-                    name: 'TicketNotes',
-                    meta: {
-                        title: 'notes',
-                        icon: 'vn:notes',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketNotes.vue'),
-                },
             ],
         },
     ],
diff --git a/src/stores/invoiceOutGlobal.js b/src/stores/invoiceOutGlobal.js
index b1bcc0e7d..bb9a3d376 100644
--- a/src/stores/invoiceOutGlobal.js
+++ b/src/stores/invoiceOutGlobal.js
@@ -237,7 +237,7 @@ export const useInvoiceOutGlobalStore = defineStore({
         async getNegativeBasesCsv() {
             try {
                 const arrayData = useArrayData('InvoiceOutNegative');
-                const params = arrayData.store.currentFilter;
+                const params = arrayData.store.userParams;
 
                 const { data } = await axios.get('InvoiceOuts/negativeBasesCsv', {
                     params,
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 51f266800..961e80377 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -21,9 +21,9 @@ export const useNavigationStore = defineStore('navigationStore', () => {
         'route',
         'ticket',
         'worker',
+        'account',
         'wagon',
         'zone',
-        'account',
     ];
     const pinnedModules = ref([]);
     const role = useRole();
diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js
index fc80c93f8..8edd3a11c 100644
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@@ -1,20 +1,20 @@
-// describe('WagonTypeCreate', () => {
-//     beforeEach(() => {
-//         cy.viewport(1920, 1080);
-//         cy.login('customer');
-//         cy.visit(`/#/entry/my`, {
-//             onBeforeLoad(win) {
-//                 cy.stub(win, 'open');
-//             },
-//         });
-//         cy.waitForElement('.q-page', 6000);
-//     });
+describe('EntryMy when is supplier', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('supplier');
+        cy.visit(`/#/entry/my`, {
+            onBeforeLoad(win) {
+                cy.stub(win, 'open');
+            },
+        });
+        cy.waitForElement('.q-page', 6000);
+    });
 
-//     it('should create edit and remove new dms', () => {
-//         cy.get(
-//             '[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
-//         ).click();
-//         cy.get('.q-card__actions > .q-btn').click();
-//         cy.window().its('open').should('be.called');
-//     });
-// });
+    it('should open buyLabel when is supplier', () => {
+        cy.get(
+            '[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
+        ).click();
+        cy.get('.q-card__actions > .q-btn').click();
+        cy.window().its('open').should('be.called');
+    });
+});
diff --git a/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js b/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
index 7863d6bfa..efe5550c3 100644
--- a/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
@@ -8,7 +8,8 @@ describe('InvoiceInCorrective', () => {
     it('should create a correcting invoice', () => {
         cy.viewport(1280, 720);
         cy.login('developer');
-        cy.visit(`/#/invoice-in/1/summary?limit=10`);
+        cy.visit(`/#/invoice-in/1/summary`);
+        cy.waitForElement('.q-page');
 
         cy.openActionsDescriptor();
 
diff --git a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
index a2e9998bb..4b5b993df 100644
--- a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
@@ -7,6 +7,7 @@ describe('InvoiceInDescriptor', () => {
         cy.viewport(1280, 720);
         cy.login('developer');
         cy.visit('/#/invoice-in/1/summary');
+        cy.waitForElement('.q-page');
 
         cy.openActionsDescriptor();
         cy.get(firstDescritorOpt).click();
diff --git a/test/cypress/integration/logout.spec.js b/test/cypress/integration/logout.spec.js
new file mode 100644
index 000000000..b35a8415a
--- /dev/null
+++ b/test/cypress/integration/logout.spec.js
@@ -0,0 +1,39 @@
+/// <reference types="cypress" />
+describe('Logout', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.visit(`/#/dashboard`);
+        cy.waitForElement('.q-page', 6000);
+    });
+    describe('by user', () => {
+        it('should logout', () => {
+            cy.get(
+                '#user > .q-btn__content > .q-avatar > .q-avatar__content > .q-img > .q-img__container > .q-img__image'
+            ).click();
+            cy.get('.block').click();
+        });
+    });
+    describe('not user', () => {
+        beforeEach(() => {
+            cy.intercept('GET', '**/VnUsers/acl', {
+                statusCode: 401,
+                body: {
+                    error: {
+                        statusCode: 401,
+                        name: 'Error',
+                        message: 'Authorization Required',
+                        code: 'AUTHORIZATION_REQUIRED',
+                    },
+                },
+                statusMessage: 'AUTHORIZATION_REQUIRED',
+            }).as('someRoute');
+        });
+        it('when token not exists', () => {
+            cy.reload();
+            cy.get('.q-notification__message').should(
+                'have.text',
+                'Authorization Required'
+            );
+        });
+    });
+});
diff --git a/test/cypress/integration/route/routeList.spec.js b/test/cypress/integration/route/routeList.spec.js
new file mode 100644
index 000000000..d30595d52
--- /dev/null
+++ b/test/cypress/integration/route/routeList.spec.js
@@ -0,0 +1,15 @@
+describe('Route', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/route/list`);
+    });
+
+    it('Route list create route', () => {
+        cy.visit(`/#/route/list`);
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('input[name="description"]').eq(1).type('routeTestOne{enter}');
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+        cy.url().should('include', '/summary');
+    });
+});
diff --git a/test/vitest/__tests__/composables/useArrayData.spec.js b/test/vitest/__tests__/composables/useArrayData.spec.js
index 5e4d12560..21323395b 100644
--- a/test/vitest/__tests__/composables/useArrayData.spec.js
+++ b/test/vitest/__tests__/composables/useArrayData.spec.js
@@ -5,7 +5,7 @@ import { useRouter } from 'vue-router';
 import * as vueRouter from 'vue-router';
 
 describe('useArrayData', () => {
-    const filter = '{"order":"","limit":10,"skip":0}';
+    const filter = '{"limit":10,"skip":0}';
     const params = { supplierFk: 2 };
     beforeEach(() => {
         vi.spyOn(useRouter(), 'replace');
diff --git a/test/vitest/__tests__/composables/useSession.spec.js b/test/vitest/__tests__/composables/useSession.spec.js
index 831acbf18..789b149ec 100644
--- a/test/vitest/__tests__/composables/useSession.spec.js
+++ b/test/vitest/__tests__/composables/useSession.spec.js
@@ -55,6 +55,7 @@ describe('session', () => {
             expect(user.value).toEqual(previousUser);
 
             vi.spyOn(axios, 'post').mockResolvedValue({ data: true });
+            vi.spyOn(axios, 'get').mockResolvedValue({ data: true });
             await session.destroy();
 
             user = state.getUser();