diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index c8d83b6c4..9f5ae319c 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -81,7 +81,7 @@ onMounted(async () => {
     });
 
     // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
-    state.set($props.model, $props.formInitialData ?? {});
+    state.set($props.model, $props.formInitialData);
     if ($props.autoLoad && !$props.formInitialData) {
         await fetch();
     }
diff --git a/src/components/common/VnCurrency.vue b/src/components/common/VnCurrency.vue
new file mode 100644
index 000000000..660c4e979
--- /dev/null
+++ b/src/components/common/VnCurrency.vue
@@ -0,0 +1,34 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useCapitalize } from 'src/composables/useCapitalize';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const props = defineProps({
+    modelValue: { type: String, default: '' },
+});
+
+const { t } = useI18n();
+const emit = defineEmits(['update:modelValue']);
+
+const amount = computed({
+    get() {
+        return props.modelValue;
+    },
+    set(val) {
+        emit('update:modelValue', val);
+    },
+});
+</script>
+<template>
+    <VnInput
+        v-model="amount"
+        type="number"
+        step="any"
+        :label="useCapitalize(t('amount'))"
+    />
+</template>
+<i18n>
+es:
+    amount: importe
+</i18n>
diff --git a/src/components/common/VnDms.vue b/src/components/common/VnDms.vue
index d2651f5d8..d5c59517d 100644
--- a/src/components/common/VnDms.vue
+++ b/src/components/common/VnDms.vue
@@ -111,7 +111,7 @@ function addDefaultData(data) {
     <FormModelPopup
         :title="formInitialData ? t('globals.edit') : t('globals.create')"
         model="dms"
-        :form-initial-data="formInitialData"
+        :form-initial-data="formInitialData ?? {}"
         :save-fn="save"
     >
         <template #form-inputs>
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 5591fd15c..05dff9a72 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -62,7 +62,7 @@ const creditWarning = computed(() => {
     <CardSummary ref="summary" :url="`Clients/${entityId}/summary`">
         <template #body="{ entity }">
             <QCard class="vn-one">
-                <a class="header" :href="clientUrl + `basic-data`">
+                <a class="header" :href="`#/customer/${entityId}/basic-data`">
                     {{ t('customer.summary.basicData') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
@@ -96,7 +96,7 @@ const creditWarning = computed(() => {
                 />
             </QCard>
             <QCard class="vn-one">
-                <a class="header" :href="clientUrl + `fiscal-data`">
+                <a class="header" :href="`#/customer/${entityId}/fiscal-data`">
                     {{ t('customer.summary.fiscalAddress') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
@@ -121,7 +121,7 @@ const creditWarning = computed(() => {
                 <VnLv :label="t('customer.summary.street')" :value="entity.street" />
             </QCard>
             <QCard class="vn-one">
-                <a class="header link" :href="clientUrl + `fiscal-data`" link>
+                <a class="header link" :href="`#/customer/${entityId}/fiscal-data`" link>
                     {{ t('customer.summary.fiscalData') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
@@ -149,7 +149,7 @@ const creditWarning = computed(() => {
                 <VnLv :label="t('customer.summary.vies')" :value="entity.isVies" />
             </QCard>
             <QCard class="vn-one">
-                <a class="header link" :href="clientUrl + `billing-data`" link>
+                <a class="header link" :href="`#/customer/${entityId}/billing-data`" link>
                     {{ t('customer.summary.billingData') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
@@ -170,7 +170,7 @@ const creditWarning = computed(() => {
                 />
             </QCard>
             <QCard class="vn-one" v-if="entity.defaultAddress">
-                <a class="header link" :href="clientUrl + `address/index`" link>
+                <a class="header link" :href="`#/customer/${entityId}/consignees`" link>
                     {{ t('customer.summary.consignee') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
@@ -188,7 +188,7 @@ const creditWarning = computed(() => {
                 />
             </QCard>
             <QCard class="vn-one" v-if="entity.account">
-                <a class="header link" :href="clientUrl + `web-access`">
+                <a class="header link" :href="`#/customer/${entityId}/web-access`">
                     {{ t('customer.summary.webAccess') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
diff --git a/src/pages/Customer/Payments/CustomerPaymentsFilter.vue b/src/pages/Customer/Payments/CustomerPaymentsFilter.vue
index 74ea2c203..1b79868c0 100644
--- a/src/pages/Customer/Payments/CustomerPaymentsFilter.vue
+++ b/src/pages/Customer/Payments/CustomerPaymentsFilter.vue
@@ -1,9 +1,9 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import VnCurrency from 'src/components/common/VnCurrency.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -12,10 +12,6 @@ const props = defineProps({
         required: true,
     },
 });
-
-function isValidNumber(value) {
-    return /^(\d|\d+(\.|,)?\d+)$/.test(value);
-}
 </script>
 
 <template>
@@ -51,28 +47,9 @@ function isValidNumber(value) {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        :label="t('Amount')"
-                        v-model="params.amount"
-                        is-outlined
-                        @update:model-value="
-                            (value) => {
-                                if (value.includes(','))
-                                    params.amount = params.amount.replace(',', '.');
-                            }
-                        "
-                        :rules="[
-                            (val) => isValidNumber(val) || !val || 'Please type a number',
-                        ]"
-                        lazy-rules
-                    >
-                        <template #prepend>
-                            <QIcon name="euro" size="sm" />
-                        </template>
-                    </VnInput>
+                    <VnCurrency v-model="params.amount" is-outlined />
                 </QItemSection>
             </QItem>
-
             <QItem>
                 <QItemSection>
                     <VnInputDate v-model="params.from" :label="t('From')" is-outlined />
diff --git a/src/pages/Department/Card/DepartmentSummary.vue b/src/pages/Department/Card/DepartmentSummary.vue
index 40bb4c83d..ee511270b 100644
--- a/src/pages/Department/Card/DepartmentSummary.vue
+++ b/src/pages/Department/Card/DepartmentSummary.vue
@@ -36,7 +36,10 @@ onMounted(async () => {
         </template>
         <template #body="{ entity: department }">
             <QCard class="column">
-                <a class="header" :href="department + `basic-data`">
+                <a
+                    class="header"
+                    :href="`#/department/department/${entityId}/basic-data`"
+                >
                     {{ t('Basic data') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 3861e0321..e1679ee5c 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -39,30 +39,47 @@ onMounted(async () => {
 const tableColumnComponents = {
     quantity: {
         component: () => 'span',
+        props: () => {},
     },
     stickers: {
         component: () => 'span',
+        props: () => {},
+        event: () => {},
     },
     packagingFk: {
         component: () => 'span',
+        props: () => {},
+        event: () => {},
     },
     weight: {
         component: () => 'span',
+        props: () => {},
+        event: () => {},
     },
     packing: {
         component: () => 'span',
+        props: () => {},
+        event: () => {},
     },
     grouping: {
         component: () => 'span',
+        props: () => {},
+        event: () => {},
     },
     buyingValue: {
         component: () => 'span',
+        props: () => {},
+        event: () => {},
     },
     amount: {
         component: () => 'span',
+        props: () => {},
+        event: () => {},
     },
     pvp: {
         component: () => 'span',
+        props: () => {},
+        event: () => {},
     },
 };
 
@@ -147,140 +164,91 @@ const fetchEntryBuys = async () => {
         :url="`Entries/${entityId}/getEntry`"
         @on-fetch="(data) => setEntryData(data)"
     >
-        <template #header-left>
-            <a class="header link" :href="entryUrl">
-                <QIcon name="open_in_new" color="white" size="sm" />
-            </a>
-        </template>
         <template #header>
             <span>{{ entry.id }} - {{ entry.supplier.nickname }}</span>
         </template>
 
         <template #body>
             <QCard class="vn-one">
-                <a class="header link" :href="entryUrl">
+                <a class="header link" :href="`#/entry/${entityId}/basic-data`">
                     {{ t('globals.summary.basicData') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
-                <VnRow>
-                    <div class="col">
-                        <VnLv
-                            :label="t('entry.summary.commission')"
-                            :value="entry.commission"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnLv
-                            :label="t('entry.summary.currency')"
-                            :value="entry.currency.name"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnLv
-                            :label="t('entry.summary.company')"
-                            :value="entry.company.code"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnLv
-                            :label="t('entry.summary.reference')"
-                            :value="entry.reference"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnLv
-                            :label="t('entry.summary.invoiceNumber')"
-                            :value="entry.invoiceNumber"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnLv
-                            :label="t('entry.summary.ordered')"
-                            :value="entry.isOrdered"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnLv
-                            :label="t('entry.summary.confirmed')"
-                            :value="entry.isConfirmed"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnLv
-                            :label="t('entry.summary.booked')"
-                            :value="entry.isBooked"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnLv :label="t('entry.summary.raid')" :value="entry.isRaid" />
-                    </div>
-                    <div class="col">
-                        <VnLv
-                            :label="t('entry.summary.excludedFromAvailable')"
-                            :value="entry.isExcludedFromAvailable"
-                        />
-                    </div>
-                </VnRow>
+
+                <VnLv :label="t('entry.summary.commission')" :value="entry.commission" />
+
+                <VnLv :label="t('entry.summary.currency')" :value="entry.currency.name" />
+
+                <VnLv :label="t('entry.summary.company')" :value="entry.company.code" />
+
+                <VnLv :label="t('entry.summary.reference')" :value="entry.reference" />
+
+                <VnLv
+                    :label="t('entry.summary.invoiceNumber')"
+                    :value="entry.invoiceNumber"
+                />
+
+                <VnLv :label="t('entry.summary.ordered')" :value="entry.isOrdered" />
+
+                <VnLv :label="t('entry.summary.confirmed')" :value="entry.isConfirmed" />
+
+                <VnLv :label="t('entry.summary.booked')" :value="entry.isBooked" />
+
+                <VnLv :label="t('entry.summary.raid')" :value="entry.isRaid" />
+
+                <VnLv
+                    :label="t('entry.summary.excludedFromAvailable')"
+                    :value="entry.isExcludedFromAvailable"
+                />
             </QCard>
             <QCard class="vn-one">
-                <a class="header link" :href="entryUrl">
+                <a class="header">
                     {{ t('Travel data') }}
-                    <QIcon name="open_in_new" color="primary" />
                 </a>
-                <VnRow>
-                    <div class="col">
-                        <VnLv :label="t('entry.summary.travelReference')">
-                            <template #value>
-                                <span class="link">
-                                    {{ entry.travel.ref }}
-                                    <TravelDescriptorProxy :id="entry.travel.id" />
-                                </span>
-                            </template>
-                        </VnLv>
-                    </div>
-                    <div class="col">
-                        <VnLv
-                            :label="t('entry.summary.travelAgency')"
-                            :value="entry.travel.agency.name"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnLv
-                            :label="t('entry.summary.travelShipped')"
-                            :value="toDate(entry.travel.shipped)"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnLv
-                            :label="t('entry.summary.travelWarehouseOut')"
-                            :value="entry.travel.warehouseOut.name"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnLv
-                            :label="t('entry.summary.travelDelivered')"
-                            :value="entry.travel.isDelivered"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnLv
-                            :label="t('entry.summary.travelLanded')"
-                            :value="toDate(entry.travel.landed)"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnLv
-                            :label="t('entry.summary.travelWarehouseIn')"
-                            :value="entry.travel.warehouseIn.name"
-                        />
-                    </div>
-                    <div class="col">
-                        <VnLv
-                            :label="t('entry.summary.travelReceived')"
-                            :value="entry.travel.isReceived"
-                        />
-                    </div>
-                </VnRow>
+
+                <VnLv :label="t('entry.summary.travelReference')">
+                    <template #value>
+                        <span class="link">
+                            {{ entry.travel.ref }}
+                            <TravelDescriptorProxy :id="entry.travel.id" />
+                        </span>
+                    </template>
+                </VnLv>
+
+                <VnLv
+                    :label="t('entry.summary.travelAgency')"
+                    :value="entry.travel.agency.name"
+                />
+
+                <VnLv
+                    :label="t('entry.summary.travelShipped')"
+                    :value="toDate(entry.travel.shipped)"
+                />
+
+                <VnLv
+                    :label="t('entry.summary.travelWarehouseOut')"
+                    :value="entry.travel.warehouseOut.name"
+                />
+
+                <VnLv
+                    :label="t('entry.summary.travelDelivered')"
+                    :value="entry.travel.isDelivered"
+                />
+
+                <VnLv
+                    :label="t('entry.summary.travelLanded')"
+                    :value="toDate(entry.travel.landed)"
+                />
+
+                <VnLv
+                    :label="t('entry.summary.travelWarehouseIn')"
+                    :value="entry.travel.warehouseIn.name"
+                />
+
+                <VnLv
+                    :label="t('entry.summary.travelReceived')"
+                    :value="entry.travel.isReceived"
+                />
             </QCard>
             <QCard class="vn-two" style="min-width: 100%">
                 <a class="header">
@@ -297,7 +265,10 @@ const fetchEntryBuys = async () => {
                         <QTr no-hover>
                             <QTd v-for="col in cols" :key="col.name">
                                 <component
-                                    :is="tableColumnComponents[col.name].component()"
+                                    :is="tableColumnComponents[col.name].component(props)"
+                                    v-bind="tableColumnComponents[col.name].props(props)"
+                                    @click="tableColumnComponents[col.name].event(props)"
+                                    class="col-content"
                                 >
                                     <template
                                         v-if="
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index e240e9a8c..edfd93a2e 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -8,6 +8,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnCurrency from 'src/components/common/VnCurrency.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -158,7 +159,12 @@ async function insert() {
                 </template>
                 <template #body-cell-amount="{ row }">
                     <QTd>
-                        <QInput v-model="row.amount" clearable clear-icon="close" />
+                        <VnCurrency
+                            v-model="row.amount"
+                            :is-outlined="false"
+                            clearable
+                            clear-icon="close"
+                        />
                     </QTd>
                 </template>
                 <template #body-cell-foreignvalue="{ row }">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 850b67cc3..1df785b9d 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -381,7 +381,7 @@ function getLink(param) {
             </QCard>
             <!--Intrastat-->
             <QCard v-if="invoiceIn.invoiceInIntrastat.length">
-                <a class="header" :href="getUrl('intrastat')">
+                <a class="header" :href="getLink('intrastat')">
                     {{ t('invoiceIn.card.intrastat') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index d8e742706..8915a96ec 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -9,6 +9,7 @@ import { toCurrency } from 'src/filters';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import CrudModel from 'src/components/CrudModel.vue';
+import VnCurrency from 'src/components/common/VnCurrency.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -225,7 +226,7 @@ async function addExpense() {
                 </template>
                 <template #body-cell-taxablebase="{ row }">
                     <QTd>
-                        <QInput
+                        <VnCurrency
                             :class="{
                                 'no-pointer-events': isNotEuro(invoiceIn.currency.code),
                             }"
@@ -234,11 +235,7 @@ async function addExpense() {
                             clear-icon="close"
                             v-model="row.taxableBase"
                             clearable
-                        >
-                            <template #prepend>
-                                <QIcon name="euro" size="xs" flat />
-                            </template>
-                        </QInput>
+                        />
                     </QTd>
                 </template>
                 <template #body-cell-sageiva="{ row, col }">
@@ -328,7 +325,7 @@ async function addExpense() {
                                     </VnSelectFilter>
                                 </QItem>
                                 <QItem>
-                                    <QInput
+                                    <VnCurrency
                                         :label="t('Taxable base')"
                                         :class="{
                                             'no-pointer-events': isNotEuro(
@@ -340,11 +337,7 @@ async function addExpense() {
                                         clear-icon="close"
                                         v-model="props.row.taxableBase"
                                         clearable
-                                    >
-                                        <template #append>
-                                            <QIcon name="euro" size="xs" flat />
-                                        </template>
-                                    </QInput>
+                                    />
                                 </QItem>
                                 <QItem>
                                     <VnSelectFilter
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 8bf007235..8f8213f1c 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -8,6 +8,7 @@ import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import { useCapitalize } from 'src/composables/useCapitalize';
+import VnCurrency from 'src/components/common/VnCurrency.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -137,16 +138,7 @@ const suppliersRef = ref();
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        :label="t('Amount')"
-                        v-model="params.amount"
-                        is-outlined
-                        lazy-rules
-                    >
-                        <template #prepend>
-                            <QIcon name="euro" size="sm"></QIcon>
-                        </template>
-                    </VnInput>
+                    <VnCurrency v-model="params.amount" is-outlined />
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-md">
diff --git a/src/pages/InvoiceOut/InvoiceOutFilter.vue b/src/pages/InvoiceOut/InvoiceOutFilter.vue
index f8a430b51..985bfb085 100644
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@@ -6,6 +6,7 @@ import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import VnCurrency from 'src/components/common/VnCurrency.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -57,7 +58,11 @@ function setWorkers(data) {
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput :label="t('Amount')" v-model="params.amount" is-outlined />
+                    <VnCurrency
+                        :label="t('Amount')"
+                        v-model="params.amount"
+                        is-outlined
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
index 3adfa1d13..66b9257a0 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import VnCurrency from 'src/components/common/VnCurrency.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -84,7 +85,7 @@ const props = defineProps({
             </QItem>
             <QItem>
                 <QItemSection>
-                    <VnInput
+                    <VnCurrency
                         v-model="params.amount"
                         :label="t('invoiceOut.negativeBases.amount')"
                         is-outlined
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index d734e21a5..95ac97628 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -62,7 +62,11 @@ const isAdministrative = computed(() => {
 
         <template #body>
             <QCard class="vn-one">
-                <a v-if="isAdministrative" class="header link" :href="supplierUrl">
+                <a
+                    v-if="isAdministrative"
+                    class="header link"
+                    :href="`#/supplier/${entityId}/basic-data`"
+                >
                     {{ t('globals.summary.basicData') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
@@ -105,7 +109,11 @@ const isAdministrative = computed(() => {
                 </VnLv>
             </QCard>
             <QCard class="vn-one">
-                <a v-if="isAdministrative" class="header link" :href="supplierUrl">
+                <a
+                    v-if="isAdministrative"
+                    class="header link"
+                    :href="`#/supplier/${entityId}/billing-data`"
+                >
                     {{ t('supplier.summary.billingData') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
@@ -124,7 +132,11 @@ const isAdministrative = computed(() => {
                 <VnLv :label="t('supplier.summary.account')" :value="supplier.account" />
             </QCard>
             <QCard class="vn-one">
-                <a v-if="isAdministrative" class="header link" :href="supplierUrl">
+                <a
+                    v-if="isAdministrative"
+                    class="header link"
+                    :href="`#/supplier/${entityId}/fiscal-data`"
+                >
                     {{ t('supplier.summary.fiscalData') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
@@ -155,7 +167,11 @@ const isAdministrative = computed(() => {
                 />
             </QCard>
             <QCard class="vn-one">
-                <a v-if="isAdministrative" class="header link" :href="supplierUrl">
+                <a
+                    v-if="isAdministrative"
+                    class="header link"
+                    :href="`#/supplier/${entityId}/fiscal-data`"
+                >
                     {{ t('supplier.summary.fiscalAddress') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 176d9adf4..8867c4289 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -78,7 +78,7 @@ const filter = {
                 <VnLv :label="t('worker.card.name')" :value="worker.user.nickname" />
                 <VnLv
                     :label="t('worker.list.department')"
-                    :value="worker.department.department.name"
+                    :value="worker.department?.department?.name"
                 />
                 <VnLv :label="t('worker.list.email')" :value="worker.user.email" copy />
                 <VnLv :label="t('worker.summary.boss')" link>
@@ -102,10 +102,10 @@ const filter = {
                         <VnLinkPhone :phone-number="worker.phone" />
                     </template>
                 </VnLv>
-                <VnLv :value="worker.client.phone">
+                <VnLv :value="worker.client?.phone">
                     <template #label>
                         {{ t('worker.summary.personalPhone') }}
-                        <VnLinkPhone :phone-number="worker.client.phone" />
+                        <VnLinkPhone :phone-number="worker.client?.phone" />
                     </template>
                 </VnLv>
                 <VnLv :label="t('worker.summary.locker')" :value="worker.locker" />
diff --git a/test/cypress/integration/invoiceIn/invoiceInList.spec.js b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
index a7d59883c..ce79dc976 100644
--- a/test/cypress/integration/invoiceIn/invoiceInList.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
@@ -5,11 +5,12 @@ describe('InvoiceInList', () => {
         ':nth-child(1) > :nth-child(1) > .justify-between > .flex > .q-chip > .q-chip__content';
     const firstDetailBtn = '.q-card:nth-child(1) .q-btn:nth-child(2)';
     const summaryHeaders = '.summaryBody .header';
+    const screen = '.q-page-container > .q-drawer-container > .fullscreen';
 
     beforeEach(() => {
-        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/invoice-in/list`);
+        cy.get(screen).click();
     });
 
     it('should redirect on clicking a invoice', () => {