diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index ea1ea53f2..2e580257c 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -198,6 +198,7 @@ async function fetch() {
     } catch (e) {
         state.set(modelValue, {});
         originalData.value = {};
+        throw e;
     }
 }
 
diff --git a/src/components/RegularizeStockForm.vue b/src/components/RegularizeStockForm.vue
index 3cd18d1c8..91a2e5d39 100644
--- a/src/components/RegularizeStockForm.vue
+++ b/src/components/RegularizeStockForm.vue
@@ -44,7 +44,7 @@ const onDataSaved = (data) => {
     <FormModelPopup
         url-create="Items/regularize"
         model="Items"
-        :title="t('Regularize stock')"
+        :title="t('item.regularizeStock')"
         :form-initial-data="regularizeFormData"
         @on-data-saved="onDataSaved($event)"
     >
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index f4c0091d2..cf217555a 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -6,6 +6,7 @@ import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useState } from 'src/composables/useState';
 import { useRoute } from 'vue-router';
+import VnMoreOptions from './VnMoreOptions.vue';
 
 const $props = defineProps({
     url: {
@@ -47,7 +48,6 @@ let store;
 let entity;
 const isLoading = ref(false);
 const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
-const menuRef = ref();
 defineExpose({ getData });
 
 onBeforeMount(async () => {
@@ -159,25 +159,11 @@ const toModule = computed(() =>
                         </QTooltip>
                     </QBtn>
                 </RouterLink>
-                <QBtn
-                    v-if="$slots.menu"
-                    color="white"
-                    dense
-                    flat
-                    icon="more_vert"
-                    round
-                    size="md"
-                    data-cy="descriptor-more-opts"
-                >
-                    <QTooltip>
-                        {{ t('components.cardDescriptor.moreOptions') }}
-                    </QTooltip>
-                    <QMenu :ref="menuRef">
-                        <QList>
-                            <slot name="menu" :entity="entity" :menu-ref="menuRef" />
-                        </QList>
-                    </QMenu>
-                </QBtn>
+                <VnMoreOptions v-if="$slots.menu">
+                    <template #menu="{ menuRef }">
+                        <slot name="menu" :entity="entity" :menu-ref="menuRef" />
+                    </template>
+                </VnMoreOptions>
             </div>
             <slot name="before" />
             <div class="body q-py-sm">
@@ -222,8 +208,8 @@ const toModule = computed(() =>
     />
 </template>
 
-<style lang="scss" scoped>
-:deep(.body) {
+<style lang="scss">
+.body {
     background-color: var(--vn-section-color);
     .text-h5 {
         font-size: 20px;
@@ -262,7 +248,9 @@ const toModule = computed(() =>
         }
     }
 }
+</style>
 
+<style lang="scss" scoped>
 .title {
     overflow: hidden;
     text-overflow: ellipsis;
diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index 8395dfd73..52427f3fe 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -1,10 +1,11 @@
 <script setup>
-import { ref, computed, watch, onBeforeMount, onMounted } from 'vue';
+import { ref, computed, watch, onBeforeMount } from 'vue';
 import { useRoute } from 'vue-router';
 import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { isDialogOpened } from 'src/filters';
-import { useStateStore } from 'src/stores/useStateStore';
+import VnMoreOptions from './VnMoreOptions.vue';
 
 const props = defineProps({
     url: {
@@ -40,7 +41,6 @@ const { store } = arrayData;
 const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
 const isLoading = ref(false);
 
-const stateStore = useStateStore();
 defineExpose({
     entity,
     fetch,
@@ -52,9 +52,6 @@ onBeforeMount(async () => {
     watch(props, async () => await fetch());
 });
 
-onMounted(() => {
-    stateStore.rightDrawerChangeValue(false);
-});
 async function fetch() {
     store.url = props.url;
     store.filter = props.filter ?? {};
@@ -64,6 +61,7 @@ async function fetch() {
     isLoading.value = false;
 }
 </script>
+
 <template>
     <div class="summary container">
         <QCard class="cardSummary">
@@ -84,11 +82,16 @@ async function fetch() {
                         <span v-else></span>
                     </slot>
                     <slot name="header" :entity="entity" dense>
-                        {{ entity.id + ' - ' + entity.name }}
-                    </slot>
-                    <slot name="header-right" :entity="entity">
-                        <span></span>
+                        <VnLv :label="`${entity.id} -`" :value="entity.name" />
                     </slot>
+                    <span class="row no-wrap">
+                        <slot name="header-right" :entity="entity" />
+                        <VnMoreOptions v-if="$slots.menu && isDialogOpened()">
+                            <template #menu="{ menuRef }">
+                                <slot name="menu" :entity="entity" :menu-ref="menuRef" />
+                            </template>
+                        </VnMoreOptions>
+                    </span>
                 </div>
                 <div class="summaryBody row q-mb-md">
                     <slot name="body" :entity="entity" />
@@ -97,6 +100,7 @@ async function fetch() {
         </QCard>
     </div>
 </template>
+
 <style lang="scss">
 .summary.container {
     display: flex;
diff --git a/src/components/ui/VnMoreOptions.vue b/src/components/ui/VnMoreOptions.vue
new file mode 100644
index 000000000..39e84be2b
--- /dev/null
+++ b/src/components/ui/VnMoreOptions.vue
@@ -0,0 +1,20 @@
+<template>
+    <QBtn
+        color="white"
+        dense
+        flat
+        icon="more_vert"
+        round
+        size="md"
+        data-cy="descriptor-more-opts"
+    >
+        <QTooltip>
+            {{ $t('components.cardDescriptor.moreOptions') }}
+        </QTooltip>
+        <QMenu ref="menuRef">
+            <QList>
+                <slot name="menu" :menu-ref="$refs.menuRef" />
+            </QList>
+        </QMenu>
+    </QBtn>
+</template>
diff --git a/src/composables/useHasAccount.js b/src/composables/useHasAccount.js
new file mode 100644
index 000000000..1014bedf3
--- /dev/null
+++ b/src/composables/useHasAccount.js
@@ -0,0 +1,6 @@
+import axios from 'axios';
+
+export default async (id) => {
+    const { data } = await axios.get(`Accounts/${id}/exists`);
+    return data.exists;
+};
diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index 8af817fcc..4e5328de6 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -1,13 +1,13 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
-import FetchData from 'src/components/FetchData.vue';
 import VnImg from 'src/components/ui/VnImg.vue';
+import useHasAccount from 'src/composables/useHasAccount.js';
 
 const $props = defineProps({
     id: {
@@ -23,6 +23,7 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 const data = ref(useCardDescription());
+const hasAccount = ref();
 const setData = (entity) => (data.value = useCardDescription(entity.nickname, entity.id));
 
 const filter = {
@@ -30,18 +31,16 @@ const filter = {
     fields: ['id', 'nickname', 'name', 'role'],
     include: { relation: 'role', scope: { fields: ['id', 'name'] } },
 };
-const hasAccount = ref(false);
+
+onMounted(async () => {
+    hasAccount.value = await useHasAccount(entityId.value);
+});
 </script>
 
 <template>
-    <FetchData
-        :url="`Accounts/${entityId}/exists`"
-        auto-load
-        @on-fetch="(data) => (hasAccount = data.exists)"
-    />
     <CardDescriptor
         ref="descriptor"
-        url="VnUsers/preview"
+        :url="`VnUsers/preview`"
         :filter="filter"
         module="Account"
         @on-fetch="setData"
@@ -50,7 +49,7 @@ const hasAccount = ref(false);
         :subtitle="data.subtitle"
     >
         <template #menu>
-            <AccountDescriptorMenu :has-account="hasAccount" />
+            <AccountDescriptorMenu :entity-id="entityId" />
         </template>
         <template #before>
             <VnImg :id="entityId" collection="user" resolution="520x520" class="photo">
@@ -74,7 +73,7 @@ const hasAccount = ref(false);
             <VnLv :label="t('account.card.nickname')" :value="entity.name" />
             <VnLv :label="t('account.card.role')" :value="entity.role.name" />
         </template>
-        <template #icons="{ entity }">
+        <template #actions="{ entity }">
             <QCardActions class="q-gutter-x-md">
                 <QIcon
                     v-if="!entity.active"
@@ -82,7 +81,7 @@ const hasAccount = ref(false);
                     name="vn:disabled"
                     flat
                     round
-                    size="xs"
+                    size="sm"
                     class="fill-icon"
                 >
                     <QTooltip>{{ t('account.card.deactivated') }}</QTooltip>
@@ -93,7 +92,7 @@ const hasAccount = ref(false);
                     v-if="hasAccount"
                     flat
                     round
-                    size="xs"
+                    size="sm"
                     class="fill-icon"
                 >
                     <QTooltip>{{ t('account.card.enabled') }}</QTooltip>
diff --git a/src/pages/Account/Card/AccountDescriptorMenu.vue b/src/pages/Account/Card/AccountDescriptorMenu.vue
index c091962fc..aa49dabe8 100644
--- a/src/pages/Account/Card/AccountDescriptorMenu.vue
+++ b/src/pages/Account/Card/AccountDescriptorMenu.vue
@@ -1,37 +1,37 @@
 <script setup>
 import axios from 'axios';
-import { computed, ref, toRefs } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useVnConfirm } from 'composables/useVnConfirm';
-import { useRoute } from 'vue-router';
 import { useAcl } from 'src/composables/useAcl';
 import { useArrayData } from 'src/composables/useArrayData';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import VnChangePassword from 'src/components/common/VnChangePassword.vue';
-import { useQuasar } from 'quasar';
+import useNotify from 'src/composables/useNotify.js';
+import useHasAccount from 'src/composables/useHasAccount.js';
 import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 
 const $props = defineProps({
-    hasAccount: {
-        type: Boolean,
-        default: false,
+    entityId: {
+        type: Number,
         required: true,
     },
 });
+
 const { t } = useI18n();
-const { hasAccount } = toRefs($props);
 const { openConfirmationModal } = useVnConfirm();
-const route = useRoute();
-const { notify } = useQuasar();
+const { notify } = useNotify();
 const account = computed(() => useArrayData('AccountId').store.data[0]);
-account.value.hasAccount = hasAccount.value;
-const entityId = computed(() => +route.params.id);
+
+onMounted(async () => {
+    account.value.hasAccount = await useHasAccount($props.entityId);
+});
 
 async function updateStatusAccount(active) {
     if (active) {
-        await axios.post(`Accounts`, { id: entityId.value });
+        await axios.post(`Accounts`, { id: $props.entityId });
     } else {
-        await axios.delete(`Accounts/${entityId.value}`);
+        await axios.delete(`Accounts/${$props.entityId}`);
     }
 
     account.value.hasAccount = active;
@@ -42,7 +42,7 @@ async function updateStatusAccount(active) {
     });
 }
 async function updateStatusUser(active) {
-    await axios.patch(`VnUsers/${entityId.value}`, { active });
+    await axios.patch(`VnUsers/${$props.entityId}`, { active });
     account.value.active = active;
     const status = active ? 'activate' : 'deactivate';
     notify({
@@ -105,6 +105,7 @@ async function sync() {
                 class="full-width"
                 clearable
                 clear-icon="close"
+                type="password"
             />
         </template>
     </VnConfirm>
diff --git a/src/pages/Account/Card/AccountMailAlias.vue b/src/pages/Account/Card/AccountMailAlias.vue
index 8d3bd3b67..efd2b481b 100644
--- a/src/pages/Account/Card/AccountMailAlias.vue
+++ b/src/pages/Account/Card/AccountMailAlias.vue
@@ -9,6 +9,7 @@ import AccountMailAliasCreateForm from './AccountMailAliasCreateForm.vue';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useArrayData } from 'composables/useArrayData';
 import useNotify from 'src/composables/useNotify.js';
+import useHasAccount from 'src/composables/useHasAccount.js';
 import axios from 'axios';
 
 const { t } = useI18n();
@@ -50,16 +51,6 @@ const columns = computed(() => [
     },
 ]);
 
-const fetchAccountExistence = async () => {
-    try {
-        const { data } = await axios.get(`Accounts/${route.params.id}/exists`);
-        return data.exists;
-    } catch (error) {
-        console.error('Error fetching account existence', error);
-        return false;
-    }
-};
-
 const deleteMailAlias = async (row) => {
     await axios.delete(`${urlPath}/${row.id}`);
     fetchMailAliases();
@@ -79,7 +70,7 @@ const fetchMailAliases = async () => {
 
 const getAccountData = async (reload = true) => {
     loading.value = true;
-    hasAccount.value = await fetchAccountExistence();
+    hasAccount.value = await useHasAccount(route.params.id);
     if (!hasAccount.value) {
         loading.value = false;
         store.data = [];
diff --git a/src/pages/Account/Card/AccountMailForwarding.vue b/src/pages/Account/Card/AccountMailForwarding.vue
index 30849d44a..0e5ae3122 100644
--- a/src/pages/Account/Card/AccountMailForwarding.vue
+++ b/src/pages/Account/Card/AccountMailForwarding.vue
@@ -9,6 +9,7 @@ import VnRow from 'components/ui/VnRow.vue';
 import axios from 'axios';
 import { useStateStore } from 'stores/useStateStore';
 import useNotify from 'src/composables/useNotify.js';
+import useHasAccount from 'src/composables/useHasAccount';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -30,23 +31,9 @@ const hasDataChanged = computed(
         initialData.value.hasData !== hasData.value
 );
 
-const fetchAccountExistence = async () => {
-    try {
-        const { data } = await axios.get(`Accounts/${route.params.id}/exists`);
-        return data.exists;
-    } catch (error) {
-        console.error('Error fetching account existence', error);
-        return false;
-    }
-};
-
 const fetchMailForwards = async () => {
-    try {
-        const response = await axios.get(`MailForwards/${route.params.id}`);
-        return response.data;
-    } catch {
-        return null;
-    }
+    const response = await axios.get(`MailForwards/${route.params.id}`);
+    return response.data;
 };
 
 const deleteMailForward = async () => {
@@ -72,7 +59,7 @@ const setInitialData = async () => {
     loading.value = true;
     initialData.value.account = route.params.id;
     formData.value.account = route.params.id;
-    hasAccount.value = await fetchAccountExistence(route.params.id);
+    hasAccount.value = await useHasAccount(route.params.id);
     if (!hasAccount.value) {
         loading.value = false;
         return;
diff --git a/src/pages/Account/Card/AccountSummary.vue b/src/pages/Account/Card/AccountSummary.vue
index e6c21ed34..ca17c7975 100644
--- a/src/pages/Account/Card/AccountSummary.vue
+++ b/src/pages/Account/Card/AccountSummary.vue
@@ -7,6 +7,7 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
 import { useArrayData } from 'src/composables/useArrayData';
+import AccountDescriptorMenu from './AccountDescriptorMenu.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -31,12 +32,14 @@ const filter = {
 <template>
     <CardSummary
         data-key="AccountId"
-        ref="AccountSummary"
         url="VnUsers/preview"
         :filter="filter"
         @on-fetch="(data) => (account = data)"
     >
         <template #header>{{ account.id }} - {{ account.nickname }}</template>
+        <template #menu="">
+            <AccountDescriptorMenu :entity-id="entityId" />
+        </template>
         <template #body>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index 3642dc0d0..e1e000815 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -1,21 +1,13 @@
 <script setup>
-import VnCard from 'components/common/VnCard.vue';
+import VnCardBeta from 'components/common/VnCardBeta.vue';
 import ClaimDescriptor from './ClaimDescriptor.vue';
-import ClaimFilter from '../ClaimFilter.vue';
 import filter from './ClaimFilter.js';
 </script>
 <template>
-    <VnCard
-        data-key="Claim"
-        base-url="Claims"
-        :descriptor="ClaimDescriptor"
-        :filter-panel="ClaimFilter"
-        search-data-key="ClaimList"
+    <VnCardBeta 
+        data-key="Claim" 
+        base-url="Claims" 
+        :descriptor="ClaimDescriptor" 
         :filter="filter"
-        :searchbar-props="{
-            url: 'Claims/filter',
-            label: 'Search claim',
-            info: 'You can search by claim id or customer name',
-        }"
     />
 </template>
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 8939a0785..66fb151e5 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -19,6 +19,7 @@ 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 WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import ClaimDescriptorMenu from './ClaimDescriptorMenu.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -228,6 +229,9 @@ function claimUrl(section) {
                 </QList>
             </QBtnDropdown>
         </template>
+        <template #menu="{ entity }">
+            <ClaimDescriptorMenu :claim="entity.claim" />
+        </template>
         <template #body="{ entity: { claim, salesClaimed, developments } }">
             <QCard class="vn-one" v-if="$route.name != 'ClaimSummary'">
                 <VnTitle
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index bb97162d8..35b051cdc 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -2,18 +2,18 @@
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'filters/index';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import ClaimFilter from './ClaimFilter.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';
 import ZoneDescriptorProxy from '../Zone/Card/ZoneDescriptorProxy.vue';
+import VnSection from 'src/components/common/VnSection.vue';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
+const dataKey = 'ClaimList';
 
 const claimFilterRef = ref();
 const columns = computed(() => [
@@ -125,48 +125,50 @@ const STATE_COLOR = {
 </script>
 
 <template>
-    <VnSearchbar
-        data-key="ClaimList"
-        :label="t('Search claim')"
-        :info="t('You can search by claim id or customer name')"
-    />
-    <RightMenu>
-        <template #right-panel>
+    <VnSection
+        :data-key="dataKey"
+        :columns="columns"
+        prefix="claim"
+        :array-data-props="{
+            url: 'Claims/filter',
+            order: ['cs.priority ASC', 'created ASC'],
+        }"
+    >
+        <template #rightMenu>
             <ClaimFilter data-key="ClaimList" ref="claimFilterRef" />
         </template>
-    </RightMenu>
-    <VnTable
-        data-key="ClaimList"
-        url="Claims/filter"
-        :order="['cs.priority ASC', 'created ASC']"
-        :columns="columns"
-        redirect="claim"
-        :right-search="false"
-    >
-        <template #column-clientFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.clientName }}
-                <CustomerDescriptorProxy :id="row.clientFk" />
-            </span>
+        <template #body>
+            <VnTable
+                :data-key="dataKey"
+                :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>
+                <template #column-zoneFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row.zoneName }}
+                        <ZoneDescriptorProxy :id="row.zoneId" />
+                    </span>
+                </template>
+            </VnTable>
         </template>
-        <template #column-attendedBy="{ row }">
-            <span @click.stop>
-                <VnUserLink :name="row.workerName" :worker-id="row.workerFk" />
-            </span>
-        </template>
-        <template #column-zoneFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.zoneName }}
-                <ZoneDescriptorProxy :id="row.zoneId" />
-            </span>
-        </template>
-    </VnTable>
+    </VnSection>
 </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:
diff --git a/src/pages/Claim/locale/en.yml b/src/pages/Claim/locale/en.yml
index ffcb44df6..11b4a2ca4 100644
--- a/src/pages/Claim/locale/en.yml
+++ b/src/pages/Claim/locale/en.yml
@@ -44,3 +44,5 @@ claim:
     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
+    search: Search claims
+    searchInfo: You can search by claim id or customer name
diff --git a/src/pages/Claim/locale/es.yml b/src/pages/Claim/locale/es.yml
index 052416aa7..d35d2c8e7 100644
--- a/src/pages/Claim/locale/es.yml
+++ b/src/pages/Claim/locale/es.yml
@@ -1,5 +1,3 @@
-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
@@ -46,3 +44,5 @@ claim:
     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í
+    search: Buscar reclamación
+    searchInfo: Puedes buscar por ID de la reclamación o nombre del cliente
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 6650ea395..d2eb125d7 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -12,6 +12,7 @@ import VnLinkMail from 'src/components/ui/VnLinkMail.vue';
 import CustomerSummaryTable from 'src/pages/Customer/components/CustomerSummaryTable.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
+import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
 const route = useRoute();
 const { t } = useI18n();
 const grafanaUrl = 'https://grafana.verdnatura.es';
@@ -70,6 +71,9 @@ const sumRisk = ({ clientRisks }) => {
         data-key="CustomerSummary"
         module-name="Customer"
     >
+        <template #menu="{ entity }">
+            <CustomerDescriptorMenu :customer="entity" />
+        </template>
         <template #body="{ entity }">
             <QCard class="vn-one">
                 <VnTitle
@@ -94,14 +98,13 @@ const sumRisk = ({ clientRisks }) => {
                             :phone-number="entity.mobile"
                             :channel="entity.country?.saySimpleCountry?.channel"
                             class="q-ml-xs"
-                            :country="entity.country?.code"
                         />
                     </template>
                 </VnLv>
                 <VnLv :value="entity.email" copy
                     ><template #label>
                         {{ t('globals.params.email') }}
-                        <VnLinkMail :email="entity.email"></VnLinkMail> </template
+                        <VnLinkMail email="entity.email"></VnLinkMail> </template
                 ></VnLv>
                 <VnLv
                     :label="t('customer.summary.salesPerson')"
@@ -173,7 +176,7 @@ const sumRisk = ({ clientRisks }) => {
                         :label="t('customer.summary.notifyByEmail')"
                         :value="entity.isToBeMailed"
                     />
-                    <VnLv :label="t('globals.isVies')" :value="entity.isVies" />
+                    <VnLv :label="t('customer.summary.vies')" :value="entity.isVies" />
                 </VnRow>
             </QCard>
             <QCard class="vn-one">
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 9814615a6..c54ecc3f0 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -7,9 +7,9 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
 import { toDate } from 'src/filters';
-import { usePrintService } from 'composables/usePrintService';
 import { getUrl } from 'src/composables/getUrl';
 import filter from './EntryFilter.js';
+import EntryDescriptorMenu from './EntryDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -21,7 +21,6 @@ const $props = defineProps({
 
 const route = useRoute();
 const { t } = useI18n();
-const { openReport } = usePrintService();
 const entryDescriptorRef = ref(null);
 const url = ref();
 
@@ -52,10 +51,6 @@ const getEntryRedirectionFilter = (entry) => {
         to,
     });
 };
-
-const showEntryReport = () => {
-    openReport(`Entries/${route.params.id}/entry-order-pdf`);
-};
 </script>
 
 <template>
@@ -68,14 +63,12 @@ const showEntryReport = () => {
         data-key="Entry"
     >
         <template #menu="{ entity }">
-            <QItem v-ripple clickable @click="showEntryReport(entity)">
-                <QItemSection>{{ t('Show entry report') }}</QItemSection>
-            </QItem>
+            <EntryDescriptorMenu :id="entity.id" />
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('globals.agency')" :value="entity.travel?.agency?.name" />
-            <VnLv :label="t('globals.shipped')" :value="toDate(entity.travel?.shipped)" />
-            <VnLv :label="t('globals.landed')" :value="toDate(entity.travel?.landed)" />
+            <VnLv :label="t('shipped')" :value="toDate(entity.travel?.shipped)" />
+            <VnLv :label="t('landed')" :value="toDate(entity.travel?.landed)" />
             <VnLv
                 :label="t('globals.warehouseOut')"
                 :value="entity.travel?.warehouseOut?.name"
@@ -154,7 +147,6 @@ es:
     Supplier card: Ficha del proveedor
     All travels with current agency: Todos los envíos con la agencia actual
     All entries with current supplier: Todas las entradas con el proveedor actual
-    Show entry report: Ver informe del pedido
     Go to module index: Ir al índice del modulo
     Inventory entry: Es inventario
     Virtual entry: Es una redada
diff --git a/src/pages/Entry/Card/EntryDescriptorMenu.vue b/src/pages/Entry/Card/EntryDescriptorMenu.vue
new file mode 100644
index 000000000..a357b46fe
--- /dev/null
+++ b/src/pages/Entry/Card/EntryDescriptorMenu.vue
@@ -0,0 +1,22 @@
+<script setup>
+import { usePrintService } from 'composables/usePrintService';
+
+const { openReport } = usePrintService();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+
+function showEntryReport() {
+    openReport(`Entries/${$props.id}/entry-order-pdf`);
+}
+</script>
+
+<template>
+    <QItem v-ripple clickable @click="showEntryReport">
+        <QItemSection>{{ $t('entryList.list.showEntryReport') }}</QItemSection>
+    </QItem>
+</template>
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 39dad672c..755e39454 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -12,6 +12,7 @@ import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
 import VnToSummary from 'src/components/ui/VnToSummary.vue';
+import EntryDescriptorMenu from './EntryDescriptorMenu.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 
@@ -172,6 +173,9 @@ const fetchEntryBuys = async () => {
         <template #header>
             <span>{{ entry.id }} - {{ entry.supplier.nickname }}</span>
         </template>
+        <template #menu="{ entity }">
+            <EntryDescriptorMenu :id="entity.id" />
+        </template>
         <template #body>
             <QCard class="vn-one">
                 <VnTitle
@@ -207,7 +211,10 @@ const fetchEntryBuys = async () => {
                     :label="t('entry.summary.travelAgency')"
                     :value="entry.travel.agency?.name"
                 />
-                <VnLv :label="t('globals.shipped')" :value="toDate(entry.travel.shipped)" />
+                <VnLv
+                    :label="t('globals.shipped')"
+                    :value="toDate(entry.travel.shipped)"
+                />
                 <VnLv
                     :label="t('globals.warehouseOut')"
                     :value="entry.travel.warehouseOut?.name"
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 7e92fe051..879a50914 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -243,7 +243,6 @@ const columns = computed(() => [
 
 <i18n>
 es:
-    Inventory entry: Es inventario
     Virtual entry: Es una redada
     Search entries: Buscar entradas
     You can search by entry reference: Puedes buscar por referencia de la entrada
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 6e41566d0..59c2666a7 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -1,6 +1,7 @@
 entryList:
     list:
         inventoryEntry: Inventory entry
+        showEntryReport: Show entry report
 entryFilter:
     filter:
         search: General search
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 7e627b09f..4fb7bbf08 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -4,6 +4,7 @@ You can search by entry reference: Puedes buscar por referencia de la entrada
 entryList:
     list:
         inventoryEntry: Es inventario
+        showEntryReport: Ver informe del pedido
 entryFilter:
     filter:
         search: Búsqueda general
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index cb8a45833..9ba0df395 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -1,60 +1,30 @@
 <script setup>
-import { ref, reactive, computed, onBeforeMount, capitalize } from 'vue';
+import { ref, reactive, computed, onBeforeMount } from 'vue';
 import { useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
 import axios from 'axios';
 import { toCurrency, toDate } from 'src/filters';
-import { useAcl } from 'src/composables/useAcl';
-import { downloadFile } from 'src/composables/downloadFile';
-import { useArrayData } from 'src/composables/useArrayData';
-import { usePrintService } from 'composables/usePrintService';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import FetchData from 'src/components/FetchData.vue';
-import SendEmailDialog from 'components/common/SendEmailDialog.vue';
-import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import { useCapitalize } from 'src/composables/useCapitalize';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
-import InvoiceInToBook from '../InvoiceInToBook.vue';
+import InvoiceInDescriptorMenu from './InvoiceInDescriptorMenu.vue';
 
 const $props = defineProps({ id: { type: Number, default: null } });
-
 const { push, currentRoute } = useRouter();
-
-const quasar = useQuasar();
-const { hasAny } = useAcl();
 const { t } = useI18n();
-const { openReport, sendEmail } = usePrintService();
-const arrayData = useArrayData();
 
-const invoiceIn = computed(() => arrayData.store.data);
 const cardDescriptorRef = ref();
 const correctionDialogRef = ref();
 const entityId = computed(() => $props.id || +currentRoute.value.params.id);
 const totalAmount = ref();
-const currentAction = ref();
 const config = ref();
 const cplusRectificationTypes = ref([]);
 const siiTypeInvoiceIns = ref([]);
 const invoiceCorrectionTypes = ref([]);
-const actions = {
-    unbook: {
-        title: t('assertAction', { action: t('unbook') }),
-        action: toUnbook,
-    },
-    delete: {
-        title: t('assertAction', { action: t('delete') }),
-        action: deleteInvoice,
-    },
-    clone: {
-        title: t('assertAction', { action: t('clone') }),
-        action: cloneInvoice,
-    },
-    showPdf: { cb: showPdfInvoice },
-    sendPdf: { cb: sendPdfInvoiceConfirmation },
-    correct: { cb: () => correctionDialogRef.value.show() },
-};
+
 const filter = {
     include: [
         {
@@ -90,7 +60,7 @@ const routes = reactive({
         return {
             name: 'InvoiceInList',
             query: {
-                table: JSON.stringify({ supplierFk: id }),
+                params: JSON.stringify({ supplierFk: id }),
             },
         };
     },
@@ -99,7 +69,7 @@ const routes = reactive({
             return {
                 name: 'InvoiceInList',
                 query: {
-                    table: JSON.stringify({ correctedFk: entityId.value }),
+                    params: JSON.stringify({ correctedFk: entityId.value }),
                 },
             };
         }
@@ -118,21 +88,21 @@ const routes = reactive({
 const correctionFormData = reactive({
     invoiceReason: 2,
     invoiceType: 2,
-    invoiceClass: 8,
+    invoiceClass: 6,
 });
 const isNotFilled = computed(() => Object.values(correctionFormData).includes(null));
 
 onBeforeMount(async () => {
     await setInvoiceCorrection(entityId.value);
     const { data } = await axios.get(`InvoiceIns/${entityId.value}/getTotals`);
-    totalAmount.value = data.totalTaxableBase;
+    totalAmount.value = data.totalDueDay;
 });
 
 onBeforeRouteUpdate(async (to, from) => {
     if (to.params.id !== from.params.id) {
         await setInvoiceCorrection(to.params.id);
         const { data } = await axios.get(`InvoiceIns/${to.params.id}/getTotals`);
-        totalAmount.value = data.totalTaxableBase;
+        totalAmount.value = data.totalDueDay;
     }
 });
 
@@ -153,94 +123,6 @@ async function setInvoiceCorrection(id) {
     );
 }
 
-function openDialog() {
-    quasar.dialog({
-        component: VnConfirm,
-        componentProps: {
-            title: t(currentAction.value.title),
-            promise: currentAction.value.action,
-        },
-    });
-}
-
-async function toUnbook() {
-    const { data } = await axios.post(`InvoiceIns/${entityId.value}/toUnbook`);
-    const { isLinked, bookEntry, accountingEntries } = data;
-
-    const type = isLinked ? 'warning' : 'positive';
-    const message = isLinked
-        ? t('isLinked', { bookEntry, accountingEntries })
-        : t('isNotLinked', { bookEntry });
-
-    quasar.notify({ type, message });
-    if (!isLinked) arrayData.store.data.isBooked = false;
-}
-
-async function deleteInvoice() {
-    await axios.delete(`InvoiceIns/${entityId.value}`);
-    quasar.notify({
-        type: 'positive',
-        message: t('Invoice deleted'),
-    });
-    push({ path: '/invoice-in' });
-}
-
-async function cloneInvoice() {
-    const { data } = await axios.post(`InvoiceIns/${entityId.value}/clone`);
-    quasar.notify({
-        type: 'positive',
-        message: t('Invoice cloned'),
-    });
-    push({ path: `/invoice-in/${data.id}/summary` });
-}
-
-const canEditProp = (props) =>
-    hasAny([{ model: 'InvoiceIn', props, accessType: 'WRITE' }]);
-
-const isAgricultural = () => {
-    if (!config.value) return false;
-    return (
-        invoiceIn.value?.supplier?.sageFarmerWithholdingFk ===
-        config?.value[0]?.sageWithholdingFk
-    );
-};
-
-function showPdfInvoice() {
-    if (isAgricultural())
-        openReport(`InvoiceIns/${entityId.value}/invoice-in-pdf`, null, '_blank');
-}
-
-function sendPdfInvoiceConfirmation() {
-    quasar.dialog({
-        component: SendEmailDialog,
-        componentProps: {
-            data: {
-                address: invoiceIn.value.supplier.contacts[0].email,
-            },
-            promise: sendPdfInvoice,
-        },
-    });
-}
-
-function sendPdfInvoice({ address }) {
-    if (!address)
-        quasar.notify({
-            type: 'negative',
-            message: t(`The email can't be empty`),
-        });
-    else
-        return sendEmail(`InvoiceIns/${entityId.value}/invoice-in-email`, {
-            recipientId: invoiceIn.value.supplier.id,
-            recipient: address,
-        });
-}
-
-function triggerMenu(type) {
-    currentAction.value = actions[type];
-    if (currentAction.value.cb) currentAction.value.cb();
-    else openDialog(type);
-}
-
 const createInvoiceInCorrection = async () => {
     const { data: correctingId } = await axios.post(
         'InvoiceIns/corrective',
@@ -262,7 +144,7 @@ const createInvoiceInCorrection = async () => {
         auto-load
     />
     <FetchData
-        url="siiTypeInvoiceIns"
+        url="SiiTypeInvoiceIns"
         :where="{ code: { like: 'R%' } }"
         @on-fetch="(data) => (siiTypeInvoiceIns = data)"
         auto-load
@@ -281,87 +163,13 @@ const createInvoiceInCorrection = async () => {
         title="supplierRef"
     >
         <template #menu="{ entity }">
-            <InvoiceInToBook>
-                <template #content="{ book }">
-                    <QItem
-                        v-if="!entity?.isBooked && canEditProp('toBook')"
-                        v-ripple
-                        clickable
-                        @click="book(entityId)"
-                    >
-                        <QItemSection>{{ t('To book') }}</QItemSection>
-                    </QItem>
-                </template>
-            </InvoiceInToBook>
-            <QItem
-                v-if="entity?.isBooked && canEditProp('toUnbook')"
-                v-ripple
-                clickable
-                @click="triggerMenu('unbook')"
-            >
-                <QItemSection>
-                    {{ t('To unbook') }}
-                </QItemSection>
-            </QItem>
-            <QItem
-                v-if="canEditProp('deleteById')"
-                v-ripple
-                clickable
-                @click="triggerMenu('delete')"
-            >
-                <QItemSection>{{ t('Delete invoice') }}</QItemSection>
-            </QItem>
-            <QItem
-                v-if="canEditProp('clone')"
-                v-ripple
-                clickable
-                @click="triggerMenu('clone')"
-            >
-                <QItemSection>{{ t('Clone invoice') }}</QItemSection>
-            </QItem>
-            <QItem
-                v-if="isAgricultural()"
-                v-ripple
-                clickable
-                @click="triggerMenu('showPdf')"
-            >
-                <QItemSection>{{ t('Show agricultural receipt as PDF') }}</QItemSection>
-            </QItem>
-            <QItem
-                v-if="isAgricultural()"
-                v-ripple
-                clickable
-                @click="triggerMenu('sendPdf')"
-            >
-                <QItemSection
-                    >{{ t('Send agricultural receipt as PDF') }}...</QItemSection
-                >
-            </QItem>
-            <QItem
-                v-if="!invoiceInCorrection.corrected"
-                v-ripple
-                clickable
-                @click="triggerMenu('correct')"
-            >
-                <QItemSection>{{ t('Create rectificative invoice') }}...</QItemSection>
-            </QItem>
-            <QItem
-                v-if="entity.dmsFk"
-                v-ripple
-                clickable
-                @click="downloadFile(entity.dmsFk)"
-            >
-                <QItemSection>{{ t('components.smartCard.downloadFile') }}</QItemSection>
-            </QItem>
+            <InvoiceInDescriptorMenu :invoice="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('InvoiceIn.list.issued')" :value="toDate(entity.issued)" />
-            <VnLv
-                :label="t('InvoiceIn.summary.bookedDate')"
-                :value="toDate(entity.booked)"
-            />
-            <VnLv :label="t('InvoiceIn.list.amount')" :value="toCurrency(totalAmount)" />
-            <VnLv :label="t('InvoiceIn.list.supplier')">
+            <VnLv :label="t('invoiceIn.list.issued')" :value="toDate(entity.issued)" />
+            <VnLv :label="t('invoiceIn.summary.booked')" :value="toDate(entity.booked)" />
+            <VnLv :label="t('invoiceIn.list.amount')" :value="toCurrency(totalAmount)" />
+            <VnLv :label="t('invoiceIn.list.supplier')">
                 <template #value>
                     <span class="link">
                         {{ entity?.supplier?.nickname }}
@@ -378,7 +186,7 @@ const createInvoiceInCorrection = async () => {
                     color="primary"
                     :to="routes.getSupplier(entity.supplierFk)"
                 >
-                    <QTooltip>{{ t('InvoiceIn.list.supplier') }}</QTooltip>
+                    <QTooltip>{{ t('invoiceIn.list.supplier') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -394,7 +202,7 @@ const createInvoiceInCorrection = async () => {
                     color="primary"
                     :to="routes.getTickets(entity.supplierFk)"
                 >
-                    <QTooltip>{{ t('InvoiceIn.descriptor.ticketList') }}</QTooltip>
+                    <QTooltip>{{ t('invoiceOut.card.ticketList') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     v-if="
@@ -438,7 +246,7 @@ const createInvoiceInCorrection = async () => {
                             readonly
                         />
                         <VnSelect
-                            :label="`${capitalize(t('globals.class'))}`"
+                            :label="`${useCapitalize(t('globals.class'))}`"
                             v-model="correctionFormData.invoiceClass"
                             :options="siiTypeInvoiceIns"
                             option-value="id"
@@ -448,27 +256,15 @@ const createInvoiceInCorrection = async () => {
                     </QItemSection>
                     <QItemSection>
                         <VnSelect
-                            :label="`${capitalize(t('globals.type'))}`"
+                            :label="`${useCapitalize(t('globals.type'))}`"
                             v-model="correctionFormData.invoiceType"
                             :options="cplusRectificationTypes"
                             option-value="id"
                             option-label="description"
                             :required="true"
-                        >
-                            <template #option="{ opt }">
-                                <QItem>
-                                    <QItemSection>
-                                        <QItemLabel
-                                            >{{ opt.code }} -
-                                            {{ opt.description }}</QItemLabel
-                                        >
-                                    </QItemSection>
-                                </QItem>
-                                <div></div>
-                            </template>
-                        </VnSelect>
+                        />
                         <VnSelect
-                            :label="`${capitalize(t('globals.reason'))}`"
+                            :label="`${useCapitalize(t('globals.reason'))}`"
                             v-model="correctionFormData.invoiceReason"
                             :options="invoiceCorrectionTypes"
                             option-value="id"
@@ -512,31 +308,3 @@ const createInvoiceInCorrection = async () => {
     }
 }
 </style>
-<i18n>
-en:
-    isNotLinked: The entry {bookEntry} has been deleted with {accountingEntries} entries
-    isLinked: The entry {bookEntry} has been linked to Sage. Please contact administration for further information
-    assertAction: Are you sure you want to {action} this invoice?
-es:
-    book: asentar
-    unbook: desasentar
-    delete: eliminar
-    clone: clonar
-    To book: Contabilizar
-    To unbook: Descontabilizar
-    Delete invoice: Eliminar factura
-    Invoice deleted: Factura eliminada
-    Clone invoice: Clonar factura
-    Invoice cloned: Factura clonada
-    Show agricultural receipt as PDF: Ver recibo agrícola como PDF
-    Send agricultural receipt as PDF: Enviar recibo agrícola como PDF
-    Are you sure you want to send it?: Estás seguro que quieres enviarlo?
-    Send PDF invoice: Enviar factura a PDF
-    Create rectificative invoice: Crear factura rectificativa
-    Rectificative invoice: Factura rectificativa
-    Original invoice: Factura origen
-    Entry: entrada
-    isNotLinked: Se ha eliminado el asiento nº {bookEntry} con {accountingEntries} apuntes
-    isLinked: El asiento {bookEntry} fue enlazado a Sage, por favor contacta con administración
-    assertAction: Estas seguro de querer {action} esta factura?
-</i18n>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue
new file mode 100644
index 000000000..3b7de7308
--- /dev/null
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptorMenu.vue
@@ -0,0 +1,206 @@
+<script setup>
+import { ref, computed, toRefs, reactive } from 'vue';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+import axios from 'axios';
+import { useAcl } from 'src/composables/useAcl';
+import { downloadFile } from 'src/composables/downloadFile';
+import { useArrayData } from 'src/composables/useArrayData';
+import { usePrintService } from 'composables/usePrintService';
+import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import SendEmailDialog from 'components/common/SendEmailDialog.vue';
+import InvoiceInToBook from '../InvoiceInToBook.vue';
+
+const { hasAny } = useAcl();
+const { t } = useI18n();
+const { openReport, sendEmail } = usePrintService();
+const { push, currentRoute } = useRouter();
+const $props = defineProps({
+    invoice: {
+        type: Object,
+        required: true,
+    },
+});
+const { invoice } = toRefs($props);
+const quasar = useQuasar();
+const arrayData = useArrayData();
+const currentAction = ref();
+const config = ref();
+const correctionDialogRef = ref();
+const invoiceInCorrection = reactive({ correcting: [], corrected: null });
+const entityId = computed(() => $props.invoice.id || +currentRoute.value.params.id);
+const invoiceIn = computed(() => arrayData.store.data);
+const actions = {
+    unbook: {
+        title: t('assertAction', { action: t('InvoiceIn.descriptorMenu.unbook') }),
+        action: toUnbook,
+    },
+    delete: {
+        title: t('assertAction', { action: t('InvoiceIn.descriptorMenu.delete') }),
+        action: deleteInvoice,
+    },
+    clone: {
+        title: t('assertAction', { action: t('InvoiceIn.descriptorMenu.clone') }),
+        action: cloneInvoice,
+    },
+    showPdf: { cb: showPdfInvoice },
+    sendPdf: { cb: sendPdfInvoiceConfirmation },
+    correct: { cb: () => correctionDialogRef.value.show() },
+};
+const canEditProp = (props) =>
+    hasAny([{ model: 'InvoiceIn', props, accessType: 'WRITE' }]);
+
+function triggerMenu(type) {
+    currentAction.value = actions[type];
+    if (currentAction.value.cb) currentAction.value.cb();
+    else openDialog(type);
+}
+
+function openDialog() {
+    quasar.dialog({
+        component: VnConfirm,
+        componentProps: {
+            title: t(currentAction.value.title),
+            promise: currentAction.value.action,
+        },
+    });
+}
+
+async function toUnbook() {
+    const { data } = await axios.post(`InvoiceIns/${entityId.value}/toUnbook`);
+    const { isLinked, bookEntry, accountingEntries } = data;
+
+    const type = isLinked ? 'warning' : 'positive';
+    const message = isLinked
+        ? t('isLinked', { bookEntry })
+        : t('isNotLinked', { bookEntry, accountingEntries });
+
+    quasar.notify({ type, message });
+    if (!isLinked) arrayData.store.data.isBooked = false;
+}
+
+async function deleteInvoice() {
+    await axios.delete(`InvoiceIns/${entityId.value}`);
+    quasar.notify({
+        type: 'positive',
+        message: t('InvoiceIn.descriptorMenu.invoiceDeleted'),
+    });
+    push({ path: '/invoice-in' });
+}
+
+async function cloneInvoice() {
+    const { data } = await axios.post(`InvoiceIns/${entityId.value}/clone`);
+    quasar.notify({
+        type: 'positive',
+        message: t('InvoiceIn.descriptorMenu.invoiceCloned'),
+    });
+    push({ path: `/invoice-in/${data.id}/summary` });
+}
+
+const isAgricultural = () => {
+    if (!config.value) return false;
+    return (
+        invoiceIn.value?.supplier?.sageFarmerWithholdingFk ===
+        config?.value[0]?.sageWithholdingFk
+    );
+};
+function showPdfInvoice() {
+    if (isAgricultural()) openReport(`InvoiceIns/${entityId.value}/invoice-in-pdf`);
+}
+
+function sendPdfInvoiceConfirmation() {
+    quasar.dialog({
+        component: SendEmailDialog,
+        componentProps: {
+            data: {
+                address: invoiceIn.value.supplier.contacts[0].email,
+            },
+            promise: sendPdfInvoice,
+        },
+    });
+}
+
+function sendPdfInvoice({ address }) {
+    if (!address)
+        quasar.notify({
+            type: 'negative',
+            message: t(`The email can't be empty`),
+        });
+    else
+        return sendEmail(`InvoiceIns/${entityId.value}/invoice-in-email`, {
+            recipientId: invoiceIn.value.supplier.id,
+            recipient: address,
+        });
+}
+</script>
+
+<template>
+    <InvoiceInToBook>
+        <template #content="{ book }">
+            <QItem
+                v-if="!invoice?.isBooked && canEditProp('toBook')"
+                v-ripple
+                clickable
+                @click="book(entityId)"
+            >
+                <QItemSection>{{ t('InvoiceIn.descriptorMenu.toBook') }}</QItemSection>
+            </QItem>
+        </template>
+    </InvoiceInToBook>
+    <QItem
+        v-if="invoice?.isBooked && canEditProp('toUnbook')"
+        v-ripple
+        clickable
+        @click="triggerMenu('unbook')"
+    >
+        <QItemSection>
+            {{ t('InvoiceIn.descriptorMenu.toUnbook') }}
+        </QItemSection>
+    </QItem>
+    <QItem
+        v-if="canEditProp('deleteById')"
+        v-ripple
+        clickable
+        @click="triggerMenu('InvoiceIn.descriptorMenu.delete')"
+    >
+        <QItemSection>{{ t('InvoiceIn.descriptorMenu.deleteInvoice') }}</QItemSection>
+    </QItem>
+    <QItem v-if="canEditProp('clone')" v-ripple clickable @click="triggerMenu('clone')">
+        <QItemSection>{{ t('InvoiceIn.descriptorMenu.cloneInvoice') }}</QItemSection>
+    </QItem>
+    <QItem v-if="isAgricultural()" v-ripple clickable @click="triggerMenu('showPdf')">
+        <QItemSection>{{
+            t('InvoiceIn.descriptorMenu.showAgriculturalPdf')
+        }}</QItemSection>
+    </QItem>
+    <QItem v-if="isAgricultural()" v-ripple clickable @click="triggerMenu('sendPdf')">
+        <QItemSection
+            >{{ t('InvoiceIn.descriptorMenu.sendAgriculturalPdf') }}...</QItemSection
+        >
+    </QItem>
+    <QItem
+        v-if="!invoiceInCorrection.corrected"
+        v-ripple
+        clickable
+        @click="triggerMenu('correct')"
+    >
+        <QItemSection
+            >{{ t('InvoiceIn.descriptorMenu.createCorrective') }}...</QItemSection
+        >
+    </QItem>
+    <QItem v-if="invoice.dmsFk" v-ripple clickable @click="downloadFile(invoice.dmsFk)">
+        <QItemSection>{{ t('components.smartCard.downloadFile') }}</QItemSection>
+    </QItem>
+</template>
+
+<i18n>
+en:
+    isNotLinked: The entry {bookEntry} has been deleted with {accountingEntries} entries		
+    isLinked: The entry has been linked to Sage. Please contact administration for further information		
+    assertAction: Are you sure you want to {action} this invoice?
+es:
+    isNotLinked: Se ha eliminado el asiento nº {bookEntry} con {accountingEntries} apuntes		
+    isLinked: El asiento fue enlazado a Sage, por favor contacta con administración		
+    assertAction: Estas seguro de querer {action} esta factura?
+</i18n>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 115a33208..b11ceb10c 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -10,6 +10,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import InvoiceIntoBook from '../InvoiceInToBook.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import InvoiceInDescriptorMenu from './InvoiceInDescriptorMenu.vue';
 
 const props = defineProps({ id: { type: [Number, String], default: 0 } });
 const { t } = useI18n();
@@ -200,6 +201,9 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 </template>
             </InvoiceIntoBook>
         </template>
+        <template #menu="{ entity }">
+            <InvoiceInDescriptorMenu :invoice="entity" />
+        </template>
         <template #body="{ entity }">
             <!--Basic Data-->
             <QCard class="vn-one">
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index 3723a0f05..2d1458290 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -12,6 +12,26 @@ InvoiceIn:
         amount: Amount
     descriptor:
         ticketList: Ticket list
+    descriptorMenu:
+        book: Book
+        unbook: Unbook
+        delete: Delete
+        clone: Clone
+        toBook: To book
+        toUnbook: To unbook
+        deleteInvoice: Delete invoice
+        invoiceDeleted: invoice deleted
+        cloneInvoice: Clone invoice
+        invoiceCloned: Invoice cloned
+        showAgriculturalPdf: Show agricultural receipt as PDF
+        sendAgriculturalPdf: Send agricultural receipt as PDF
+        checkSendInvoice: Are you sure you want to send it?
+        sendPdfInvoice: Send PDF invoice
+        createCorrective: Create rectificative invoice
+        correctiveInvoice: Rectificative invoice
+        originalInvoice: Original invoice
+        entry: Entry
+        emailEmpty: The email can't be empty
     card:
         client: Client
         company: Company
@@ -50,4 +70,3 @@ invoicein:
     params:
         account: Ledger account
         correctingFk: Rectificative
-        
\ No newline at end of file
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index 5637605f6..e6b323a73 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -12,6 +12,26 @@ InvoiceIn:
         amount: Importe
     descriptor:
         ticketList: Listado de tickets
+    descriptorMenu:
+        book: Asentar
+        unbook: Desasentar
+        delete: Eliminar
+        clone: Clonar
+        toBook: Contabilizar
+        toUnbook: Descontabilizar
+        deleteInvoice: Eliminar factura
+        invoiceDeleted: Factura eliminada
+        cloneInvoice: Clonar factura
+        invoiceCloned: Factura clonada
+        showAgriculturalPdf: Ver recibo agrícola como PDF
+        sendAgriculturalPdf: Enviar recibo agrícola como PDF
+        checkSendInvoice: ¿Estás seguro que quieres enviarlo?
+        sendPdfInvoice: Enviar factura a PDF
+        createCorrective: Crear factura rectificativa
+        correctiveInvoice: Factura rectificativa
+        originalInvoice: Factura origen
+        entry: Entrada
+        emailEmpty: El email no puede estar vacío
     card:
         client: Cliente
         company: Empresa
@@ -47,4 +67,3 @@ invoicein:
     params:
         account: Cuenta contable
         correctingFk: Rectificativa
-        
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index 81b3e7c41..3ceb447dd 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -10,6 +10,7 @@ import { getUrl } from 'src/composables/getUrl';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import InvoiceOutDescriptorMenu from './InvoiceOutDescriptorMenu.vue';
 
 onMounted(async () => {
     fetch();
@@ -113,6 +114,9 @@ const ticketsColumns = ref([
         <template #header="{ entity: { invoiceOut } }">
             <div>{{ invoiceOut.ref }} - {{ invoiceOut.client?.socialName }}</div>
         </template>
+        <template #menu="{ entity }">
+            <InvoiceOutDescriptorMenu :invoice-out-data="entity.invoiceOut" />
+        </template>
         <template #body="{ entity: { invoiceOut } }">
             <QCard class="vn-one">
                 <VnTitle :text="t('globals.pageTitles.basicData')" />
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 4705525fb..c6fee8540 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -6,17 +6,16 @@ import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import RegularizeStockForm from 'components/RegularizeStockForm.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import axios from 'axios';
 import { dashIfEmpty } from 'src/filters';
 import { useArrayData } from 'src/composables/useArrayData';
-import { cloneItem } from 'src/pages/Item/composables/cloneItem';
+import ItemDescriptorMenu from './ItemDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
-        type: [Number, String],
+        type: Number,
         required: false,
         default: null,
     },
@@ -29,7 +28,7 @@ const $props = defineProps({
         default: null,
     },
     saleFk: {
-        type: [Number, String],
+        type: Number,
         default: null,
     },
     warehouseFk: {
@@ -38,7 +37,6 @@ const $props = defineProps({
     },
 });
 
-const { openCloneDialog } = cloneItem();
 const route = useRoute();
 const { t } = useI18n();
 const warehouseConfig = ref(null);
@@ -46,7 +44,6 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-const regularizeStockFormDialog = ref(null);
 const mounted = ref();
 
 const arrayDataStock = useArrayData('descriptorStock', {
@@ -61,14 +58,14 @@ onMounted(async () => {
 const data = ref(useCardDescription());
 const setData = async (entity) => {
     if (!entity) return;
-    data.value = useCardDescription(entity?.name, entity?.id);
+    data.value = useCardDescription(entity.name, entity.id);
     await updateStock();
 };
 
 const getItemConfigs = async () => {
     const { data } = await axios.get('ItemConfigs/findOne');
     if (!data) return;
-    return (warehouseConfig.value = data.warehouseFk);
+    warehouseConfig.value = data.warehouseFk;
 };
 const updateStock = async () => {
     if (!mounted.value) return;
@@ -89,10 +86,6 @@ const updateStock = async () => {
     if (storeData?.itemFk == entityId.value) return;
     await stock.fetch({});
 };
-
-const openRegularizeStockForm = () => {
-    regularizeStockFormDialog.value.show();
-};
 </script>
 
 <template>
@@ -105,24 +98,12 @@ const openRegularizeStockForm = () => {
         :url="`Items/${entityId}/getCard`"
         @on-fetch="setData"
     >
-        <template #menu="{}">
-            <QItem v-ripple clickable @click="openRegularizeStockForm()">
-                <QItemSection>
-                    {{ t('Regularize stock') }}
-                    <QDialog ref="regularizeStockFormDialog">
-                        <RegularizeStockForm
-                            :item-fk="entityId"
-                            :warehouse-fk="warehouseFk"
-                            @on-data-saved="updateStock()"
-                        />
-                    </QDialog>
-                </QItemSection>
-            </QItem>
-            <QItem v-ripple clickable @click="openCloneDialog(entityId)">
-                <QItemSection>
-                    {{ t('globals.clone') }}
-                </QItemSection>
-            </QItem>
+        <template #menu>
+            <ItemDescriptorMenu
+                :entity-id="entityId"
+                :warehouse-fk="warehouseFk"
+                @regularized="updateStock"
+            />
         </template>
         <template #before>
             <ItemDescriptorImage
@@ -191,7 +172,6 @@ const openRegularizeStockForm = () => {
 
 <i18n>
 es:
-    Regularize stock: Regularizar stock
     Inactive article: Artículo inactivo
 </i18n>
 
diff --git a/src/pages/Item/Card/ItemDescriptorImage.vue b/src/pages/Item/Card/ItemDescriptorImage.vue
index 05185c589..a887964e9 100644
--- a/src/pages/Item/Card/ItemDescriptorImage.vue
+++ b/src/pages/Item/Card/ItemDescriptorImage.vue
@@ -131,7 +131,6 @@ const handlePhotoUpdated = (evt = false) => {
 
 <i18n>
 es:
-    Regularize stock: Regularizar stock
     All it's properties will be copied: Todas sus propiedades serán copiadas
     Do you want to clone this item?: ¿Desea clonar este artículo?
     warehouseText: Calculado sobre el almacén de { warehouseName }
diff --git a/src/pages/Item/Card/ItemDescriptorMenu.vue b/src/pages/Item/Card/ItemDescriptorMenu.vue
new file mode 100644
index 000000000..3e9c6f2d4
--- /dev/null
+++ b/src/pages/Item/Card/ItemDescriptorMenu.vue
@@ -0,0 +1,44 @@
+<script setup>
+import RegularizeStockForm from 'components/RegularizeStockForm.vue';
+import { cloneItem } from 'src/pages/Item/composables/cloneItem';
+
+const { openCloneDialog } = cloneItem();
+
+defineProps({
+    entityId: {
+        type: Number,
+        default: null,
+    },
+    warehouseFk: {
+        type: Number,
+        default: null,
+    },
+});
+
+defineEmits(['regularized']);
+</script>
+<template>
+    <QItem v-ripple clickable @click="$refs.regularizeStockFormDialog.show()">
+        <QItemSection>
+            {{ $t('item.regularizeStock') }}
+            <QDialog ref="regularizeStockFormDialog">
+                <RegularizeStockForm
+                    :item-fk="entityId"
+                    :warehouse-fk="warehouseFk"
+                    @on-data-saved="$emit('regularized')"
+                />
+            </QDialog>
+        </QItemSection>
+    </QItem>
+    <QItem v-ripple clickable @click="openCloneDialog(entityId)">
+        <QItemSection>
+            {{ $t('globals.clone') }}
+        </QItemSection>
+    </QItem>
+</template>
+
+<style lang="scss" scoped>
+.weekdaysBtn {
+    margin: 1%;
+}
+</style>
diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
index e1b97d7c9..bc828bbf6 100644
--- a/src/pages/Item/Card/ItemSummary.vue
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -8,6 +8,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import ItemDescriptorImage from 'src/pages/Item/Card/ItemDescriptorImage.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import ItemDescriptorMenu from './ItemDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -43,10 +44,13 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
         <template #header="{ entity: { item } }">
             {{ item.id }} - {{ item.name }}
         </template>
+        <template #menu>
+            <ItemDescriptorMenu :entity-id="entityId" :warehouse-fk="warehouseFk" />
+        </template>
         <template #body="{ entity: { item, tags, visible, available, botanical } }">
             <QCard class="vn-one photo">
                 <ItemDescriptorImage
-                    :entity-id="Number(entityId)"
+                    :entity-id="entityId"
                     :visible="visible"
                     :available="available"
                     :show-edit-button="false"
@@ -89,7 +93,7 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
             <QCard class="vn-one">
                 <VnTitle
                     :url="getUrl(entityId, 'basic-data')"
-                    :text="t('item.summary.basicData')"
+                    :text="t('item.summary.otherData')"
                 />
                 <VnLv
                     :label="t('item.summary.intrastatCode')"
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index 1d6e69339..f04563791 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -152,7 +152,7 @@ const columns = computed(() => [
         },
         columnField: {
             component: null,
-        }
+        },
     },
     {
         label: t('item.list.category'),
@@ -498,5 +498,4 @@ es:
     Create Item: Crear artículo
     You can search by id: Puedes buscar por id
     Preview: Vista previa
-    Regularize stock: Regularizar stock
 </i18n>
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
index c4ad0f537..907c72acd 100644
--- a/src/pages/Item/locale/en.yml
+++ b/src/pages/Item/locale/en.yml
@@ -219,3 +219,4 @@ item:
         minSalesQuantity: 'Cantidad mínima de venta'
         genus: 'Genus'
         specie: 'Specie'
+    regularizeStock: Regularize stock
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
index d558c38a6..015dea4dd 100644
--- a/src/pages/Item/locale/es.yml
+++ b/src/pages/Item/locale/es.yml
@@ -210,6 +210,7 @@ item:
         minSalesQuantity: 'Cantidad mínima de venta'
         genus: 'Genus'
         specie: 'Specie'
+    regularizeStock: Regularizar stock
     buyRequest:
         ticketId: 'ID Ticket'
         shipped: 'F. envío'
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index e0c613aed..0d5f0146f 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -9,7 +9,6 @@ import useCardDescription from 'src/composables/useCardDescription';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import FetchData from 'components/FetchData.vue';
-import OrderDescriptorMenu from 'pages/Order/Card/OrderDescriptorMenu.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const DEFAULT_ITEMS = 0;
@@ -94,9 +93,6 @@ const total = ref(0);
         @on-fetch="setData"
         data-key="orderData"
     >
-        <template #menu="{ entity }">
-            <OrderDescriptorMenu :order="entity" />
-        </template>
         <template #body="{ entity }">
             <VnLv
                 :label="t('globals.state')"
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index ad06dfe43..a289688e4 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -12,6 +12,7 @@ import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import OrderDescriptorMenu from 'pages/Order/Card/OrderDescriptorMenu.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -91,6 +92,9 @@ async function handleConfirm() {
                     <QTooltip>{{ t('order.summary.confirmLines') }}</QTooltip>
                 </QBtn>
             </template>
+            <template #menu="{ entity }">
+                <OrderDescriptorMenu :order="entity" />
+            </template>
             <template #body="{ entity }">
                 <QCard class="vn-one">
                     <VnTitle
diff --git a/src/pages/Route/Card/RouteDescriptorMenu.vue b/src/pages/Route/Card/RouteDescriptorMenu.vue
index 6092bcd95..d1a70c868 100644
--- a/src/pages/Route/Card/RouteDescriptorMenu.vue
+++ b/src/pages/Route/Card/RouteDescriptorMenu.vue
@@ -52,7 +52,7 @@ async function actualizeVolume() {
     const params = { isOk: true };
     await axios.post(`Routes/${routeId}/updateVolume`, params);
     quasar.notify({
-        message: t('globals.dataUpdated'),
+        message: t('globals.dataSaved'),
         type: 'positive',
     });
 }
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index a0b971195..3051972b2 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -12,6 +12,7 @@ import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import RouteDescriptorMenu from './RouteDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -128,6 +129,9 @@ const ticketColumns = ref([
             <template #header="{ entity }">
                 <span>{{ `${entity?.route.id} - ${entity?.route?.description}` }}</span>
             </template>
+            <template #menu="{ entity }">
+                <RouteDescriptorMenu :route="entity.route" />
+            </template>
             <template #body="{ entity }">
                 <QCard class="vn-max">
                     <VnTitle
diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue
index 3fb36b4f7..1fbb1897d 100644
--- a/src/pages/Route/Roadmap/RoadmapSummary.vue
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@@ -10,6 +10,7 @@ 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 RoadmapDescriptorMenu from './RoadmapDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -86,6 +87,9 @@ const filter = {
             <template #header="{ entity }">
                 <span>{{ `${entity?.id} - ${entity?.name}` }}</span>
             </template>
+            <template #menu="{ entity }">
+                <RoadmapDescriptorMenu :route="entity" />
+            </template>
             <template #body="{ entity }">
                 <QCard class="vn-one">
                     <VnTitle
diff --git a/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue b/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue
index 16351fdd4..447737e9c 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue
@@ -4,6 +4,7 @@ import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import VnConfirm from 'components/ui/VnConfirm.vue';
+import { useRoute } from 'vue-router';
 
 const $props = defineProps({
     shelving: {
@@ -14,8 +15,11 @@ const $props = defineProps({
 
 const router = useRouter();
 const quasar = useQuasar();
+const route = useRoute();
 const { t } = useI18n();
 
+const emit = defineEmits(['onRemove']);
+
 function confirmRemove() {
     quasar.dialog({
         component: VnConfirm,
@@ -32,11 +36,12 @@ async function remove() {
         return;
     }
     await axios.delete(`Shelvings/${$props.shelving.id}`);
-    await router.push({ name: 'ShelvingList' });
+    if (route.name != 'ShelvingList') await router.push({ name: 'ShelvingList' });
     quasar.notify({
         message: t('globals.dataDeleted'),
         type: 'positive',
     });
+    emit('onRemove', {});
 }
 </script>
 <template>
diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue
index 0c1eb2a1d..39fa4639f 100644
--- a/src/pages/Shelving/Card/ShelvingSummary.vue
+++ b/src/pages/Shelving/Card/ShelvingSummary.vue
@@ -1,10 +1,11 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnUserLink from 'components/ui/VnUserLink.vue';
+import ShelvingDescriptorMenu from './ShelvingDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -14,7 +15,7 @@ const $props = defineProps({
 });
 const route = useRoute();
 const { t } = useI18n();
-
+const summary = ref({});
 const entityId = computed(() => $props.id || route.params.id);
 
 const filter = {
@@ -43,7 +44,13 @@ const filter = {
             data-key="ShelvingSummary"
         >
             <template #header="{ entity }">
-                <div>{{ entity.id }} - {{ entity.code }}</div>
+                <div>{{ entity.code }}</div>
+            </template>
+            <template #menu="{ entity }">
+                <ShelvingDescriptorMenu
+                    :shelving="entity"
+                    @on-remove="$refs.summary.fetch()"
+                />
             </template>
             <template #body="{ entity }">
                 <QCard class="vn-one">
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 2f5f69e1c..2c6e34864 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -96,7 +96,6 @@ function toTicketUrl(section) {
         ref="summaryRef"
         :url="`Tickets/${entityId}/summary`"
         data-key="TicketSummary"
-        data-cy="ticketSummary"
     >
         <template #header-left>
             <VnToSummary
@@ -114,7 +113,7 @@ function toTicketUrl(section) {
                 {{ entity.nickname }}
             </div>
         </template>
-        <template #header-right="{ entity }">
+        <template #header-right>
             <div>
                 <QBtnDropdown
                     ref="stateBtnDropdownRef"
@@ -133,18 +132,11 @@ function toTicketUrl(section) {
                         @update:model-value="changeState"
                     />
                 </QBtnDropdown>
-                <QBtn color="white" dense flat icon="more_vert" round size="md">
-                    <QTooltip>
-                        {{ t('components.cardDescriptor.moreOptions') }}
-                    </QTooltip>
-                    <QMenu>
-                        <QList>
-                            <TicketDescriptorMenu :ticket="entity" />
-                        </QList>
-                    </QMenu>
-                </QBtn>
             </div>
         </template>
+        <template #menu="{ entity }">
+            <TicketDescriptorMenu :ticket="entity" />
+        </template>
         <template #body="{ entity }">
             <QCard class="vn-one">
                 <VnTitle
@@ -258,7 +250,7 @@ function toTicketUrl(section) {
             <QCard class="vn-one" v-if="entity.notes.length">
                 <VnTitle
                     :url="toTicketUrl('observation')"
-                    :text="t('globals.pageTitles.notes')"
+                    :text="t('ticket.pageTitles.notes')"
                 />
                 <QVirtualScroll
                     :items="entity.notes"
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 59c3a8a91..9deb22808 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -11,6 +11,7 @@ import FetchData from 'src/components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import { toDate, toCurrency } from 'src/filters';
 import axios from 'axios';
+import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
 
 const $props = defineProps({
     id: {
@@ -242,7 +243,9 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
         <template #header>
             <span>{{ travel.id }} - {{ travel.ref }}</span>
         </template>
-
+        <template #menu="{ entity }">
+            <TravelDescriptorMenuItems :travel="entity" />
+        </template>
         <template #body>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index f09aec816..c09e8868f 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -6,11 +6,10 @@ import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import VnChangePassword from 'src/components/common/VnChangePassword.vue';
-import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import VnImg from 'src/components/ui/VnImg.vue';
 import EditPictureForm from 'components/EditPictureForm.vue';
-import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
+import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
 
 const $props = defineProps({
     id: {
@@ -28,8 +27,6 @@ const image = ref(null);
 
 const route = useRoute();
 const { t } = useI18n();
-const state = useState();
-const user = state.getUser();
 const showEditPhotoForm = ref(false);
 const toggleEditPictureForm = () => {
     showEditPhotoForm.value = !showEditPhotoForm.value;
@@ -45,18 +42,6 @@ const getIsExcluded = async () => {
     workerExcluded.value = data.exists;
 };
 
-const handleExcluded = async () => {
-    if (workerExcluded.value)
-        await axios.delete(`WorkerDisableExcludeds/${entityId.value}`);
-    else
-        await axios.post(`WorkerDisableExcludeds`, {
-            workerFk: entityId.value,
-            dated: new Date(),
-        });
-
-    workerExcluded.value = !workerExcluded.value;
-};
-
 const handlePhotoUpdated = (evt = false) => {
     image.value.reload(evt);
 };
@@ -72,25 +57,11 @@ const handlePhotoUpdated = (evt = false) => {
         @on-fetch="getIsExcluded"
     >
         <template #menu="{ entity }">
-            <QItem v-ripple clickable @click="handleExcluded">
-                <QItemSection>
-                    {{
-                        workerExcluded
-                            ? t('Click to allow the user to be disabled')
-                            : t('Click to exclude the user from getting disabled')
-                    }}
-                </QItemSection>
-            </QItem>
-            <QItem
-                v-if="!entity.user.emailVerified && user.id != entity.id"
-                v-ripple
-                clickable
-                @click="$refs.changePassRef.show"
-            >
-                <QItemSection>
-                    {{ t('globals.changePass') }}
-                </QItemSection>
-            </QItem>
+            <WorkerDescriptorMenu
+                :worker="entity"
+                :is-excluded="workerExcluded"
+                @show-dialog="$refs.changePassRef.show"
+            />
         </template>
         <template #before>
             <div class="relative-position">
@@ -144,14 +115,10 @@ const handlePhotoUpdated = (evt = false) => {
                 :value="entity.user?.emailUser?.email"
                 copy
             />
-            <VnLv :label="t('worker.list.department')">
-                <template #value>
-                        <span class="link" v-text="entity.department?.department?.name" />
-                        <DepartmentDescriptorProxy
-                            :id="entity.department?.department?.id"
-                        />
-                </template>
-            </VnLv>
+            <VnLv
+                :label="t('worker.list.department')"
+                :value="entity.department ? entity.department.department.name : null"
+            />
             <VnLv :value="entity.phone">
                 <template #label>
                     {{ t('globals.phone') }}
@@ -211,8 +178,6 @@ const handlePhotoUpdated = (evt = false) => {
 
 <i18n>
 es:
-    Go to client: Ir a cliente
-    Go to user: Ir al usuario
     Click to allow the user to be disabled: Marcar para deshabilitar
     Click to exclude the user from getting disabled: Marcar para no deshabilitar
 </i18n>
diff --git a/src/pages/Worker/Card/WorkerDescriptorMenu.vue b/src/pages/Worker/Card/WorkerDescriptorMenu.vue
new file mode 100644
index 000000000..8d82dc839
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerDescriptorMenu.vue
@@ -0,0 +1,65 @@
+<script setup>
+import { computed, ref, toRefs } from 'vue';
+import axios from 'axios';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useState } from 'src/composables/useState';
+
+const $props = defineProps({
+    worker: {
+        type: Object,
+        required: true,
+    },
+    isExcluded: {
+        type: Boolean,
+        required: true,
+    },
+});
+const route = useRoute();
+const { t } = useI18n();
+const state = useState();
+const user = state.getUser();
+const { worker } = toRefs($props);
+const workerExcluded = ref($props.isExcluded);
+const entityId = computed(() => {
+    return $props.worker.id || route.params.id;
+});
+const emit = defineEmits(['show-dialog']);
+const handleExcluded = async () => {
+    if (workerExcluded.value)
+        await axios.delete(`WorkerDisableExcludeds/${entityId.value}`);
+    else
+        await axios.post(`WorkerDisableExcludeds`, {
+            workerFk: entityId.value,
+            dated: new Date(),
+        });
+
+    workerExcluded.value = !workerExcluded.value;
+};
+
+const showChangePasswordDialog = () => {
+    emit('show-dialog', true);
+};
+</script>
+
+<template>
+    <QItem v-ripple clickable @click="handleExcluded">
+        <QItemSection>
+            {{
+                workerExcluded
+                    ? t('Click to allow the user to be disabled')
+                    : t('Click to exclude the user from getting disabled')
+            }}
+        </QItemSection>
+    </QItem>
+    <QItem
+        v-if="!worker.user.emailVerified && user.id == worker.id"
+        v-ripple
+        clickable
+        @click="showChangePasswordDialog"
+    >
+        <QItemSection>
+            {{ t('globals.changePass') }}
+        </QItemSection>
+    </QItem>
+</template>
diff --git a/src/pages/Worker/Card/WorkerPBX.vue b/src/pages/Worker/Card/WorkerPBX.vue
index 547156532..12f2a4b23 100644
--- a/src/pages/Worker/Card/WorkerPBX.vue
+++ b/src/pages/Worker/Card/WorkerPBX.vue
@@ -1,68 +1,28 @@
+src/pages/Worker/Card/WorkerPBX.vue
+
 <script setup>
-import { watch, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-
-import { useState } from 'src/composables/useState';
-
 import FormModel from 'src/components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-
-const { t } = useI18n();
-const state = useState();
-const route = useRoute();
-const workerPBXForm = ref();
-const extension = ref(null);
-
-const filter = {
-    include: [
-        {
-            relation: 'sip',
-        },
-    ],
-};
-
-watch(
-    () => route.params.id,
-    () => state.set('extension', null)
-);
-
-const onFetch = (data) => {
-    state.set('extension', data?.sip?.extension);
-    extension.value = state.get('extension');
-};
-
-const updateModelValue = (data) => {
-    state.set('extension', data);
-    workerPBXForm.value.hasChanges = true;
-};
 </script>
 
 <template>
     <FormModel
-        ref="workerPBXForm"
-        :filter="filter"
-        :url="`Workers/${route.params.id}`"
+        model="WorkerPbx"
+        :url="`Workers/${$route.params.id}/sip`"
         url-update="Sips"
-        auto-load
         :mapper="
-            () => ({
-                userFk: +route.params.id,
+            ({ userFk, extension }) => ({
+                userFk,
                 extension,
             })
         "
-        model="DeviceProductionUser"
-        @on-fetch="onFetch"
+        auto-load
     >
-        <template #form="{}">
-            <VnRow>
-                <VnInput
-                    :label="t('worker.summary.sipExtension')"
-                    v-model="extension"
-                    @update:model-value="updateModelValue"
-                />
-            </VnRow>
+        <template #form="{ data }">
+            <VnInput
+                :label="$t('worker.summary.sipExtension')"
+                v-model="data.extension"
+            />
         </template>
     </FormModel>
 </template>
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 496f1ca16..bfb503f6b 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -11,6 +11,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import RoleDescriptorProxy from 'src/pages/Account/Role/Card/RoleDescriptorProxy.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
 import { useAdvancedSummary } from 'src/composables/useAdvancedSummary';
+import WorkerDescriptorMenu from './WorkerDescriptorMenu.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -42,6 +43,9 @@ onBeforeMount(async () => {
         <template #header="{ entity }">
             <div>{{ entity.id }} - {{ entity.firstName }} {{ entity.lastName }}</div>
         </template>
+        <template #menu="{ entity }">
+            <WorkerDescriptorMenu :worker="entity" :is-excluded="workerExcluded" />
+        </template>
         <template #body="{ entity: worker }">
             <QCard class="vn-one">
                 <VnTitle :url="basicDataUrl" :text="t('globals.summary.basicData')" />
diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 2d65476ce..c38da614c 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -100,6 +100,16 @@ const agencyOptions = ref([]);
                     required="true"
                     clearable
                 />
+                <VnInput
+                    v-model="data.priceOptimum"
+                    :label="t('Price optimum')"
+                    type="number"
+                    min="0"
+                    required="true"
+                    clearable
+                />
+            </VnRow>
+            <VnRow>
                 <VnInput
                     v-model="data.bonus"
                     :label="t('Bonus')"
@@ -107,8 +117,6 @@ const agencyOptions = ref([]);
                     min="0"
                     clearable
                 />
-            </VnRow>
-            <VnRow>
                 <VnSelect
                     :label="t('Distribution point')"
                     v-model="data.addressFk"
@@ -152,6 +160,7 @@ es:
     Traveling days: Dias de viaje
     Closing: Cierre
     Price: Precio
+    Price optimum: Precio óptimo
     Bonus: Bonificación
     Inflation: Inflación
     Volumetric: Volumétrico
diff --git a/src/pages/Zone/Card/ZoneEventInclusionForm.vue b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
index b4096e5a2..805d03b27 100644
--- a/src/pages/Zone/Card/ZoneEventInclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
@@ -182,13 +182,19 @@ onMounted(() => {
                     min="0"
                 />
                 <VnInput
-                    v-model="eventInclusionFormData.bonus"
-                    :label="t('zone.bonus')"
+                    v-model="eventInclusionFormData.priceOptimum"
+                    :label="t('list.priceOptimum')"
                     type="number"
                     min="0"
                 />
             </VnRow>
             <VnRow>
+                <VnInput
+                    v-model="eventInclusionFormData.bonus"
+                    :label="t('zone.bonus')"
+                    type="number"
+                    min="0"
+                />
                 <VnInput
                     v-model="eventInclusionFormData.m3Max"
                     :label="t('zone.m3Max')"
diff --git a/src/pages/Zone/Card/ZoneSummary.vue b/src/pages/Zone/Card/ZoneSummary.vue
index 384ee1fe9..124802633 100644
--- a/src/pages/Zone/Card/ZoneSummary.vue
+++ b/src/pages/Zone/Card/ZoneSummary.vue
@@ -11,6 +11,7 @@ import { getUrl } from 'src/composables/getUrl';
 import { toCurrency } from 'filters/index';
 import { toTimeFormat } from 'src/filters/date';
 import axios from 'axios';
+import ZoneDescriptorMenuItems from './ZoneDescriptorMenuItems.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -79,6 +80,9 @@ onMounted(async () => {
         <template #header="{ entity }">
             <div>#{{ entity.id }} - {{ entity.name }}</div>
         </template>
+        <template #menu="{ entity }">
+            <ZoneDescriptorMenuItems :zone="entity" />
+        </template>
         <template #body="{ entity: zone }">
             <QCard class="vn-one">
                 <VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index b277ceabb..575b12f7a 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -22,6 +22,7 @@ list:
     agency: Agencia
     close: Cierre
     price: Precio
+    priceOptimum: Precio óptimo
     create: Crear zona
     openSummary: Detalles
     searchZone: Buscar zonas
diff --git a/src/router/modules/claim.js b/src/router/modules/claim.js
index 8b0a70896..4dfde08da 100644
--- a/src/router/modules/claim.js
+++ b/src/router/modules/claim.js
@@ -1,19 +1,12 @@
 import { RouterView } from 'vue-router';
 
-export default {
-    name: 'Claim',
-    path: '/claim',
+const claimCard = {
+    name: 'ClaimCard',
+    path: ':id',
+    component: () => import('src/pages/Claim/Card/ClaimCard.vue'),
+    redirect: { name: 'ClaimSummary' },
     meta: {
-        title: 'claims',
-        icon: 'vn:claims',
-        moduleName: 'Claim',
-        keyBinding: 'r',
-    },
-    component: RouterView,
-    redirect: { name: 'ClaimMain' },
-    menus: {
-        main: ['ClaimList'],
-        card: [
+        menu: [
             'ClaimBasicData',
             'ClaimLines',
             'ClaimPhotos',
@@ -23,109 +16,125 @@ export default {
             'ClaimLog',
         ],
     },
+    children: [
+        {            
+            path: 'summary',
+            name: 'ClaimSummary',
+            meta: {
+                title: 'summary',
+                icon: 'launch',
+            },
+            component: () => import('src/pages/Claim/Card/ClaimSummary.vue'),
+        },
+        {
+            path: 'basic-data',
+            name: 'ClaimBasicData',
+            meta: {
+                title: 'basicData',
+                icon: 'vn:settings',
+                acls: [{ model: 'Claim', props: 'findById', accessType: 'READ' }],
+            },
+            component: () => import('src/pages/Claim/Card/ClaimBasicData.vue'),
+        },
+        {
+            path: 'lines',
+            name: 'ClaimLines',
+            meta: {
+                title: 'lines',
+                icon: 'vn:details',
+            },
+            component: () => import('src/pages/Claim/Card/ClaimLines.vue'),
+        },
+        {
+            path: 'photos',
+            name: 'ClaimPhotos',
+            meta: {
+                title: 'photos',
+                icon: 'image',
+            },
+            component: () => import('src/pages/Claim/Card/ClaimPhoto.vue'),
+        },
+        {
+            path: 'notes',
+            name: 'ClaimNotes',
+            meta: {
+                title: 'notes',
+                icon: 'draft',
+            },
+            component: () => import('src/pages/Claim/Card/ClaimNotes.vue'),
+        },
+        {
+            path: 'development',
+            name: 'ClaimDevelopment',
+            meta: {
+                title: 'development',
+                icon: 'vn:traceability',
+                acls: [
+                    {
+                        model: 'ClaimDevelopment',
+                        props: '*',
+                        accessType: 'WRITE',
+                    },
+                ],
+            },
+            component: () => import('src/pages/Claim/Card/ClaimDevelopment.vue'),
+        },
+        {
+            path: 'action',
+            name: 'ClaimAction',
+            meta: {
+                title: 'action',
+                icon: 'vn:actions',
+            },
+            component: () => import('src/pages/Claim/Card/ClaimAction.vue'),
+        },
+        {
+            path: 'log',
+            name: 'ClaimLog',
+            meta: {
+                title: 'log',
+                icon: 'history',
+            },
+            component: () => import('src/pages/Claim/Card/ClaimLog.vue'),
+        },
+    ],
+}
+
+export default {
+    name: 'Claim',
+    path: '/claim',
+    meta: {
+        title: 'claims',
+        icon: 'vn:claims',
+        moduleName: 'Claim',
+        keyBinding: 'r',
+        menu: ['ClaimList'],
+    },
+    component: RouterView,
+    redirect: { name: 'ClaimMain' },
     children: [
         {
             name: 'ClaimMain',
             path: '',
             component: () => import('src/components/common/VnModule.vue'),
-            redirect: { name: 'ClaimList' },
+            redirect: { name: 'ClaimIndexMain' },
             children: [
                 {
-                    name: 'ClaimList',
-                    path: 'list',
-                    meta: {
-                        title: 'list',
-                        icon: 'view_list',
-                    },
+                    path: '',
+                    name: 'ClaimIndexMain',
+                    redirect: { name: 'ClaimList' },
                     component: () => import('src/pages/Claim/ClaimList.vue'),
-                },
-            ],
-        },
-        {
-            name: 'ClaimCard',
-            path: ':id',
-            component: () => import('src/pages/Claim/Card/ClaimCard.vue'),
-            redirect: { name: 'ClaimSummary' },
-            children: [
-                {
-                    name: 'ClaimSummary',
-                    path: 'summary',
-                    meta: {
-                        title: 'summary',
-                        icon: 'launch',
-                    },
-                    component: () => import('src/pages/Claim/Card/ClaimSummary.vue'),
-                },
-                {
-                    name: 'ClaimBasicData',
-                    path: 'basic-data',
-                    meta: {
-                        title: 'basicData',
-                        icon: 'vn:settings',
-                        acls: [{ model: 'Claim', props: 'findById', accessType: 'READ' }],
-                    },
-                    component: () => import('src/pages/Claim/Card/ClaimBasicData.vue'),
-                },
-                {
-                    name: 'ClaimLines',
-                    path: 'lines',
-                    meta: {
-                        title: 'lines',
-                        icon: 'vn:details',
-                    },
-                    component: () => import('src/pages/Claim/Card/ClaimLines.vue'),
-                },
-                {
-                    name: 'ClaimPhotos',
-                    path: 'photos',
-                    meta: {
-                        title: 'photos',
-                        icon: 'image',
-                    },
-                    component: () => import('src/pages/Claim/Card/ClaimPhoto.vue'),
-                },
-                {
-                    name: 'ClaimNotes',
-                    path: 'notes',
-                    meta: {
-                        title: 'notes',
-                        icon: 'draft',
-                    },
-                    component: () => import('src/pages/Claim/Card/ClaimNotes.vue'),
-                },
-                {
-                    name: 'ClaimDevelopment',
-                    path: 'development',
-                    meta: {
-                        title: 'development',
-                        icon: 'vn:traceability',
-                        acls: [
-                            {
-                                model: 'ClaimDevelopment',
-                                props: '*',
-                                accessType: 'WRITE',
+                    children: [
+                        {
+                            name: 'ClaimList',
+                            path: 'list',
+                            meta: {
+                                title: 'list',
+                                icon: 'view_list',
                             },
-                        ],
-                    },
-                    component: () => import('src/pages/Claim/Card/ClaimDevelopment.vue'),
-                },
-                {
-                    name: 'ClaimAction',
-                    path: 'action',
-                    meta: {
-                        title: 'action',
-                        icon: 'vn:actions',
-                    },
-                    component: () => import('src/pages/Claim/Card/ClaimAction.vue'),
-                },
-                {
-                    name: 'ClaimLog',
-                    path: 'log',
-                    meta: {
-                        title: 'log',
-                        icon: 'history',
-                    },
-                    component: () => import('src/pages/Claim/Card/ClaimLog.vue'),
+                        },
+                        claimCard,
+                    ],
                 },
             ],
         },
diff --git a/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js b/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
index a64f98c10..0eb873355 100644
--- a/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
@@ -1,7 +1,7 @@
 /// <reference types="cypress" />
 
 describe('InvoiceInCorrective', () => {
-    const createRectificative = '.q-menu > .q-list > :nth-child(6) > .q-item__section';
+    const createCorrective = '.q-menu > .q-list > :nth-child(6) > .q-item__section';
     const rectificativeSection = '.q-drawer-container .q-list > a:nth-child(6)';
     const saveDialog = '.q-card > .q-card__actions > .q-btn--standard ';
 
@@ -13,7 +13,7 @@ describe('InvoiceInCorrective', () => {
 
         cy.openActionsDescriptor();
 
-        cy.get(createRectificative).click();
+        cy.get(createCorrective).click();
         cy.get(saveDialog).click();
         cy.wait('@corrective').then((interception) => {
             const correctingId = interception.response.body;