diff --git a/src/boot/quasar.js b/src/boot/quasar.js
index a4f2ba0fe..7fb814c1f 100644
--- a/src/boot/quasar.js
+++ b/src/boot/quasar.js
@@ -7,7 +7,7 @@ import { QLayout } from 'quasar';
 import mainShortcutMixin from './mainShortcutMixin';
 import { useCau } from 'src/composables/useCau';
 
-export default boot(({ app }) => {
+export default boot(({ app, router }) => {
     QForm.mixins = [qFormMixin];
     QLayout.mixins = [mainShortcutMixin];
 
@@ -22,6 +22,14 @@ export default boot(({ app }) => {
         }
 
         switch (response?.status) {
+            case 401:
+                if (!router.currentRoute.value.name.toLowerCase().includes('login')) {
+                    message = 'errors.sessionExpired';
+                } else message = 'login.loginError';
+                break;
+            case 403:
+                if (!message || message.toLowerCase() === 'access denied')
+                    message = 'errors.accessDenied';
             case 422:
                 if (error.name == 'ValidationError')
                     message += ` "${responseError.details.context}.${Object.keys(
diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index 3ce62c5de..b6cc5665f 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -180,7 +180,11 @@ const col = computed(() => {
     )
         newColumn.component = 'checkbox';
     if ($props.default && !newColumn.component) newColumn.component = $props.default;
-
+    
+    if (typeof newColumn.component !== 'string') {
+        newColumn.attrs = { ...newColumn.component.attrs, autofocus: $props.autofocus };
+        newColumn.event = { ...newColumn.component.event, ...$props?.eventHandlers };
+    }
     return newColumn;
 });
 
diff --git a/src/components/common/VnSelectExpense.vue b/src/components/common/VnSelectExpense.vue
new file mode 100644
index 000000000..406715b84
--- /dev/null
+++ b/src/components/common/VnSelectExpense.vue
@@ -0,0 +1,49 @@
+<script setup>
+import { ref, useTemplateRef } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
+import VnSelectDialog from './VnSelectDialog.vue';
+import CreateNewExpenseForm from '../CreateNewExpenseForm.vue';
+import FetchData from '../FetchData.vue';
+
+const model = defineModel({ type: [String, Number, Object] });
+const { t } = useI18n();
+const expenses = ref([]);
+const selectDialogRef = useTemplateRef('selectDialogRef');
+
+async function autocompleteExpense(evt) {
+    const val = evt.target.value;
+    if (!val || isNaN(val)) return;
+    const lookup = expenses.value.find(({ id }) => id == useAccountShortToStandard(val));
+    if (selectDialogRef.value)
+        selectDialogRef.value.vnSelectDialogRef.vnSelectRef.toggleOption(lookup);
+}
+</script>
+<template>
+    <VnSelectDialog
+        v-bind="$attrs"
+        ref="selectDialogRef"
+        v-model="model"
+        :options="expenses"
+        option-value="id"
+        :option-label="(x) => `${x.id}: ${x.name}`"
+        :filter-options="['id', 'name']"
+        :tooltip="t('Create a new expense')"
+        :acls="[{ model: 'Expense', props: '*', accessType: 'WRITE' }]"
+        @keydown.tab.prevent="autocompleteExpense"
+    >
+        <template #form>
+            <CreateNewExpenseForm @on-data-saved="$refs.expensesRef.fetch()" />
+        </template>
+    </VnSelectDialog>
+    <FetchData
+        ref="expensesRef"
+        url="Expenses"
+        auto-load
+        @on-fetch="(data) => (expenses = data)"
+    />
+</template>
+<i18n>
+es:
+    Create a new expense: Crear nuevo gasto
+</i18n>
diff --git a/src/composables/useValidator.js b/src/composables/useValidator.js
index ae6c47d91..e887c0c4f 100644
--- a/src/composables/useValidator.js
+++ b/src/composables/useValidator.js
@@ -47,7 +47,9 @@ export function useValidator() {
                 return !validator.isEmpty(value ? String(value) : '') || message;
             },
             required: (required, value) => {
-                return required ? !!value || t('globals.fieldRequired') : null;
+                return required
+                    ? value === 0 || !!value || t('globals.fieldRequired')
+                    : null;
             },
             length: (value) => {
                 const options = {
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 070d384bf..d39a8232a 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -401,6 +401,8 @@ errors:
     updateUserConfig: Error updating user config
     tokenConfig: Error fetching token config
     writeRequest: The requested operation could not be completed
+    sessionExpired: Your session has expired. Please log in again
+    accessDenied: Access denied
     claimBeginningQuantity: Cannot import a line with a claimed quantity of 0
 login:
     title: Login
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 463ac2d40..55b35f14c 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -397,6 +397,8 @@ errors:
     updateUserConfig: Error al actualizar la configuración de usuario
     tokenConfig: Error al obtener configuración de token
     writeRequest: No se pudo completar la operación solicitada
+    sessionExpired: Tu sesión ha expirado, por favor vuelve a iniciar sesión
+    accessDenied: Acceso denegado
     claimBeginningQuantity: No se puede importar una linea sin una cantidad reclamada
 login:
     title: Inicio de sesión
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index aa5841ce2..cee671eda 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -6,7 +6,6 @@ import { useQuasar } from 'quasar';
 import axios from 'axios';
 
 import useNotify from 'src/composables/useNotify.js';
-import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -21,9 +20,6 @@ const { t } = useI18n();
 const route = useRoute();
 const { notify } = useNotify();
 
-const typesTaxes = ref([]);
-const typesTransactions = ref([]);
-
 function handleLocation(data, location) {
     const { town, code, provinceFk, countryFk } = location ?? {};
     data.postcode = code;
@@ -39,6 +35,7 @@ function onBeforeSave(formData, originalData) {
 }
 
 async function checkEtChanges(data, _, originalData) {
+    isTaxDataChecked.value = data.isTaxDataChecked;
     const equalizatedHasChanged = originalData.isEqualizated != data.isEqualizated;
     const hasToInvoiceByAddress =
         originalData.hasToInvoiceByAddress || data.hasToInvoiceByAddress;
@@ -62,15 +59,18 @@ async function acceptPropagate({ isEqualizated }) {
     });
     notify(t('Equivalent tax spreaded'), 'warning');
 }
+const isTaxDataChecked = ref(false);
+
+function isRequired({ isTaxDataChecked: taxDataChecked }) {
+    if (!isTaxDataChecked.value) {
+        return false;
+    } else {
+        return taxDataChecked;
+    }
+}
 </script>
 
 <template>
-    <FetchData auto-load @on-fetch="(data) => (typesTaxes = data)" url="SageTaxTypes" />
-    <FetchData
-        auto-load
-        @on-fetch="(data) => (typesTransactions = data)"
-        url="SageTransactionTypes"
-    />
     <FormModel
         :url-update="`Clients/${route.params.id}/updateFiscalData`"
         auto-load
@@ -80,6 +80,7 @@ async function acceptPropagate({ isEqualizated }) {
         @on-data-saved="checkEtChanges"
     >
         <template #form="{ data, validate, validations }">
+            {{ isTaxDataChecked }} {{ data.isTaxDataChecked }}
             <VnRow>
                 <VnInput
                     :label="t('Social name')"
@@ -111,21 +112,27 @@ async function acceptPropagate({ isEqualizated }) {
             <VnRow>
                 <VnSelect
                     :label="t('Sage tax type')"
-                    :options="typesTaxes"
+                    url="SageTaxTypes"
                     hide-selected
                     option-label="vat"
                     option-value="id"
                     v-model="data.sageTaxTypeFk"
                     data-cy="sageTaxTypeFk"
+                    :required="isRequired(data)"
+                    :rules="[(val) => validations.required(data.sageTaxTypeFk, val)]"
                 />
                 <VnSelect
                     :label="t('Sage transaction type')"
-                    :options="typesTransactions"
+                    url="SageTransactionTypes"
                     hide-selected
                     option-label="transaction"
                     option-value="id"
                     data-cy="sageTransactionTypeFk"
                     v-model="data.sageTransactionTypeFk"
+                    :required="isRequired(data)"
+                    :rules="[
+                        (val) => validations.required(data.sageTransactionTypeFk, val),
+                    ]"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
@@ -151,11 +158,11 @@ async function acceptPropagate({ isEqualizated }) {
                 />
             </VnRow>
             <VnRow>
-                <QCheckbox :label="t('Active')" v-model="data.isActive" />
-                <QCheckbox :label="t('Frozen')" v-model="data.isFreezed" />
+                <VnCheckbox :label="t('Active')" v-model="data.isActive" />
+                <VnCheckbox :label="t('Frozen')" v-model="data.isFreezed" />
             </VnRow>
             <VnRow>
-                <QCheckbox :label="t('Has to invoice')" v-model="data.hasToInvoice" />
+                <VnCheckbox :label="t('Has to invoice')" v-model="data.hasToInvoice" />
                 <VnCheckbox
                     v-model="data.isVies"
                     :label="t('globals.isVies')"
@@ -164,8 +171,8 @@ async function acceptPropagate({ isEqualizated }) {
             </VnRow>
 
             <VnRow>
-                <QCheckbox :label="t('Notify by email')" v-model="data.isToBeMailed" />
-                <QCheckbox
+                <VnCheckbox :label="t('Notify by email')" v-model="data.isToBeMailed" />
+                <VnCheckbox
                     :label="t('Invoice by address')"
                     v-model="data.hasToInvoiceByAddress"
                 />
@@ -177,16 +184,18 @@ async function acceptPropagate({ isEqualizated }) {
                     :label="t('Is equalizated')"
                     :info="t('inOrderToInvoice')"
                 />
-                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
+                <VnCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
             </VnRow>
 
             <VnRow>
-                <QCheckbox
+                <VnCheckbox
                     :label="t('Electronic invoice')"
                     v-model="data.hasElectronicInvoice"
-                /><QCheckbox
+                />
+                <VnCheckbox
                     :label="t('Verified data')"
                     v-model="data.isTaxDataChecked"
+                    @update:model-value="isTaxDataChecked = !isTaxDataChecked"
                 />
             </VnRow>
         </template>
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index bc76f5985..5a7684e5e 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -179,6 +179,11 @@ function handleLocation(data, location) {
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;
 }
+
+function onAgentCreated({ id, fiscalName }, data) {
+    customsAgents.value.push({ id, fiscalName });
+    data.customsAgentFk = id;
+}
 </script>
 
 <template>
@@ -292,9 +297,14 @@ function handleLocation(data, location) {
                     option-value="id"
                     v-model="data.customsAgentFk"
                     :tooltip="t('New customs agent')"
+                    :acls="[{ model: 'CustomsAgent', props: '*', accessType: 'WRITE' }]"
                 >
                     <template #form>
-                        <CustomerNewCustomsAgent />
+                        <CustomerNewCustomsAgent
+                            @on-data-saved="
+                                (requestResponse) => onAgentCreated(requestResponse, data)
+                            "
+                        />
                     </template>
                 </VnSelectDialog>
             </VnRow>
diff --git a/src/pages/Customer/components/CustomerNewCustomsAgent.vue b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
index ec9806334..69ecb0d27 100644
--- a/src/pages/Customer/components/CustomerNewCustomsAgent.vue
+++ b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
@@ -16,6 +16,7 @@ const onDataSaved = (dataSaved) => {
 
 <template>
     <FormModelPopup
+        :form-initial-data="{}"
         :title="t('New customs agent')"
         @on-data-saved="onDataSaved($event)"
         model="customer"
diff --git a/src/pages/Entry/EntryPreAccount.vue b/src/pages/Entry/EntryPreAccount.vue
index 26683b6f4..feb26604c 100644
--- a/src/pages/Entry/EntryPreAccount.vue
+++ b/src/pages/Entry/EntryPreAccount.vue
@@ -73,6 +73,7 @@ const columns = computed(() => [
             optionLabel: 'code',
             options: companies.value,
         },
+        orderBy: false,
     },
     {
         name: 'warehouse',
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 98237a8db..822fd68a6 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -1,21 +1,16 @@
 <script setup>
-import { ref, computed, nextTick } from 'vue';
+import { ref, computed, markRaw } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import { getTotal } from 'src/composables/getTotal';
 import { toCurrency } from 'src/filters';
 import FetchData from 'src/components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import CrudModel from 'src/components/CrudModel.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
-import CreateNewExpenseForm from 'src/components/CreateNewExpenseForm.vue';
 import { getExchange } from 'src/composables/getExchange';
-import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import VnSelectExpense from 'src/components/common/VnSelectExpense.vue';
 
 const { t } = useI18n();
-
 const arrayData = useArrayData();
 const route = useRoute();
 const invoiceIn = computed(() => arrayData.store.data);
@@ -24,100 +19,142 @@ const expenses = ref([]);
 const sageTaxTypes = ref([]);
 const sageTransactionTypes = ref([]);
 const rowsSelected = ref([]);
-const invoiceInFormRef = ref();
+const invoiceInVatTableRef = ref();
 
-defineProps({
-    actionIcon: {
-        type: String,
-        default: 'add',
-    },
-});
+defineProps({ actionIcon: { type: String, default: 'add' } });
+
+function taxRate(invoiceInTax) {
+    const sageTaxTypeId = invoiceInTax.taxTypeSageFk;
+    const taxRateSelection = sageTaxTypes.value.find(
+        (transaction) => transaction.id == sageTaxTypeId,
+    );
+    const taxTypeSage = taxRateSelection?.rate ?? 0;
+    const taxableBase = invoiceInTax?.taxableBase ?? 0;
+
+    return (taxTypeSage / 100) * taxableBase;
+}
 
 const columns = computed(() => [
     {
-        name: 'expense',
+        name: 'expenseFk',
         label: t('Expense'),
-        field: (row) => row.expenseFk,
-        options: expenses.value,
-        model: 'expenseFk',
-        optionValue: 'id',
-        optionLabel: (row) => `${row.id}: ${row.name}`,
+        component: markRaw(VnSelectExpense),
+        format: (row) => {
+            const expense = expenses.value.find((e) => e.id === row.expenseFk);
+            return expense ? `${expense.id}: ${expense.name}` : row.expenseFk;
+        },
         sortable: true,
         align: 'left',
+        isEditable: true,
+        create: true,
+        width: '250px',
     },
     {
-        name: 'taxablebase',
+        name: 'taxableBase',
         label: t('Taxable base'),
-        field: (row) => row.taxableBase,
-        model: 'taxableBase',
+        component: 'number',
+        attrs: {
+            clearable: true,
+            'clear-icon': 'close',
+        },
         sortable: true,
         align: 'left',
+        isEditable: true,
+        create: true,
     },
     {
         name: 'isDeductible',
         label: t('invoiceIn.isDeductible'),
-        field: (row) => row.isDeductible,
-        model: 'isDeductible',
+        component: 'checkbox',
         align: 'center',
+        isEditable: true,
+        create: true,
+        createAttrs: {
+            defaultValue: true,
+        },
+        width: '100px',
     },
     {
-        name: 'sageiva',
+        name: 'taxTypeSageFk',
         label: t('Sage iva'),
-        field: (row) => row.taxTypeSageFk,
-        options: sageTaxTypes.value,
-        model: 'taxTypeSageFk',
-        optionValue: 'id',
-        optionLabel: (row) => `${row.id}: ${row.vat}`,
+        component: 'select',
+        attrs: {
+            options: sageTaxTypes.value,
+            optionValue: 'id',
+            optionLabel: (row) => `${row.id}: ${row.vat}`,
+            filterOptions: ['id', 'vat'],
+            'data-cy': 'vat-sageiva',
+        },
+        format: (row) => {
+            const taxType = sageTaxTypes.value.find((t) => t.id === row.taxTypeSageFk);
+            return taxType ? `${taxType.id}: ${taxType.vat}` : row.taxTypeSageFk;
+        },
         sortable: true,
         align: 'left',
+        isEditable: true,
+        create: true,
     },
     {
-        name: 'sagetransaction',
+        name: 'transactionTypeSageFk',
         label: t('Sage transaction'),
-        field: (row) => row.transactionTypeSageFk,
-        options: sageTransactionTypes.value,
-        model: 'transactionTypeSageFk',
-        optionValue: 'id',
-        optionLabel: (row) => `${row.id}: ${row.transaction}`,
+        component: 'select',
+        attrs: {
+            options: sageTransactionTypes.value,
+            optionValue: 'id',
+            optionLabel: (row) => `${row.id}: ${row.transaction}`,
+            filterOptions: ['id', 'transaction'],
+        },
+        format: (row) => {
+            const transType = sageTransactionTypes.value.find(
+                (t) => t.id === row.transactionTypeSageFk,
+            );
+            return transType
+                ? `${transType.id}: ${transType.transaction}`
+                : row.transactionTypeSageFk;
+        },
         sortable: true,
         align: 'left',
+        isEditable: true,
+        create: true,
     },
     {
         name: 'rate',
         label: t('Rate'),
-        sortable: true,
-        field: (row) => taxRate(row, row.taxTypeSageFk),
+        sortable: false,
+        format: (row) => taxRate(row).toFixed(2),
         align: 'left',
     },
     {
-        name: 'foreignvalue',
+        name: 'foreignValue',
         label: t('Foreign value'),
+        component: 'number',
         sortable: true,
-        field: (row) => row.foreignValue,
         align: 'left',
+        create: true,
+        disable: !isNotEuro(currency.value),
     },
     {
         name: 'total',
-        label: 'Total',
+        label: t('Total'),
         align: 'left',
+        format: (row) => (Number(row.taxableBase || 0) + Number(taxRate(row))).toFixed(2),
     },
 ]);
 
+const tableRows = computed(
+    () => invoiceInVatTableRef.value?.CrudModelRef?.formData || [],
+);
 const taxableBaseTotal = computed(() => {
-    return getTotal(invoiceInFormRef.value.formData, 'taxableBase');
+    return getTotal(tableRows.value, 'taxableBase');
 });
-
 const taxRateTotal = computed(() => {
-    return getTotal(invoiceInFormRef.value.formData, null, {
-        cb: taxRate,
-    });
+    return tableRows.value.reduce((sum, row) => sum + Number(taxRate(row)), 0);
 });
-
 const combinedTotal = computed(() => {
     return +taxableBaseTotal.value + +taxRateTotal.value;
 });
 
-const filter = {
+const filter = computed(() => ({
     fields: [
         'id',
         'invoiceInFk',
@@ -131,389 +168,75 @@ const filter = {
     where: {
         invoiceInFk: route.params.id,
     },
-};
+}));
 
 const isNotEuro = (code) => code != 'EUR';
 
-function taxRate(invoiceInTax) {
-    const sageTaxTypeId = invoiceInTax.taxTypeSageFk;
-    const taxRateSelection = sageTaxTypes.value.find(
-        (transaction) => transaction.id == sageTaxTypeId,
+async function handleForeignValueUpdate(val, row) {
+    if (!isNotEuro(currency.value)) return;
+    row.taxableBase = await getExchange(
+        val,
+        invoiceIn.value?.currencyFk,
+        invoiceIn.value?.issued,
     );
-    const taxTypeSage = taxRateSelection?.rate ?? 0;
-    const taxableBase = invoiceInTax?.taxableBase ?? 0;
-
-    return ((taxTypeSage / 100) * taxableBase).toFixed(2);
-}
-
-function autocompleteExpense(evt, row, col, ref) {
-    const val = evt.target.value;
-    if (!val) return;
-
-    const param = isNaN(val) ? row[col.model] : val;
-    const lookup = expenses.value.find(
-        ({ id }) => id == useAccountShortToStandard(param),
-    );
-
-    ref.vnSelectDialogRef.vnSelectRef.toggleOption(lookup);
-}
-
-function setCursor(ref) {
-    nextTick(() => {
-        const select = ref.vnSelectDialogRef
-            ? ref.vnSelectDialogRef.vnSelectRef
-            : ref.vnSelectRef;
-        select.$el.querySelector('input').setSelectionRange(0, 0);
-    });
 }
 </script>
 <template>
-    <FetchData
-        ref="expensesRef"
-        url="Expenses"
-        auto-load
-        @on-fetch="(data) => (expenses = data)"
-    />
+    <FetchData url="Expenses" auto-load @on-fetch="(data) => (expenses = data)" />
     <FetchData url="SageTaxTypes" auto-load @on-fetch="(data) => (sageTaxTypes = data)" />
     <FetchData
         url="sageTransactionTypes"
         auto-load
         @on-fetch="(data) => (sageTransactionTypes = data)"
     />
-    <CrudModel
-        ref="invoiceInFormRef"
+    <VnTable
         v-if="invoiceIn"
+        ref="invoiceInVatTableRef"
         data-key="InvoiceInTaxes"
         url="InvoiceInTaxes"
+        save-url="InvoiceInTaxes/crud"
         :filter="filter"
         :data-required="{ invoiceInFk: $route.params.id }"
         :insert-on-load="true"
         auto-load
         v-model:selected="rowsSelected"
-        :go-to="`/invoice-in/${$route.params.id}/due-day`"
+        :columns="columns"
+        :is-editable="true"
+        :table="{ selection: 'multiple', 'row-key': '$index' }"
+        footer
+        :right-search="false"
+        :column-search="false"
+        :disable-option="{ card: true }"
+        class="q-pa-none"
+        :create="{
+            urlCreate: 'InvoiceInTaxes',
+            title: t('Add tax'),
+            formInitialData: { invoiceInFk: $route.params.id, isDeductible: true },
+            onDataSaved: () => invoiceInVatTableRef.reload(),
+        }"
+        :crud-model="{ goTo: `/invoice-in/${$route.params.id}/due-day` }"
     >
-        <template #body="{ rows }">
-            <QTable
-                v-model:selected="rowsSelected"
-                selection="multiple"
-                :columns="columns"
-                :rows="rows"
-                row-key="$index"
-                :grid="$q.screen.lt.sm"
-            >
-                <template #body-cell-expense="{ row, col }">
-                    <QTd>
-                        <VnSelectDialog
-                            :ref="`expenseRef-${row.$index}`"
-                            v-model="row[col.model]"
-                            :options="col.options"
-                            :option-value="col.optionValue"
-                            :option-label="col.optionLabel"
-                            :filter-options="['id', 'name']"
-                            :tooltip="t('Create a new expense')"
-                            :acls="[
-                                { model: 'Expense', props: '*', accessType: 'WRITE' },
-                            ]"
-                            @keydown.tab.prevent="
-                                autocompleteExpense(
-                                    $event,
-                                    row,
-                                    col,
-                                    $refs[`expenseRef-${row.$index}`],
-                                )
-                            "
-                            @update:model-value="
-                                setCursor($refs[`expenseRef-${row.$index}`])
-                            "
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    {{ `${scope.opt.id}: ${scope.opt.name}` }}
-                                </QItem>
-                            </template>
-                            <template #form>
-                                <CreateNewExpenseForm
-                                    @on-data-saved="$refs.expensesRef.fetch()"
-                                />
-                            </template>
-                        </VnSelectDialog>
-                    </QTd>
-                </template>
-                <template #body-cell-isDeductible="{ row }">
-                    <QTd align="center">
-                        <QCheckbox
-                            v-model="row.isDeductible"
-                            data-cy="isDeductible_checkbox"
-                        />
-                    </QTd>
-                </template>
-                <template #body-cell-taxablebase="{ row }">
-                    <QTd shrink>
-                        <VnInputNumber
-                            clear-icon="close"
-                            v-model="row.taxableBase"
-                            clearable
-                        />
-                    </QTd>
-                </template>
-                <template #body-cell-sageiva="{ row, col }">
-                    <QTd>
-                        <VnSelect
-                            :ref="`sageivaRef-${row.$index}`"
-                            v-model="row[col.model]"
-                            :options="col.options"
-                            :option-value="col.optionValue"
-                            :option-label="col.optionLabel"
-                            :filter-options="['id', 'vat']"
-                            data-cy="vat-sageiva"
-                            @update:model-value="
-                                setCursor($refs[`sageivaRef-${row.$index}`])
-                            "
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ scope.opt.vat }}</QItemLabel>
-                                        <QItemLabel>
-                                            {{ `#${scope.opt.id}` }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </QTd>
-                </template>
-                <template #body-cell-sagetransaction="{ row, col }">
-                    <QTd>
-                        <VnSelect
-                            :ref="`sagetransactionRef-${row.$index}`"
-                            v-model="row[col.model]"
-                            :options="col.options"
-                            :option-value="col.optionValue"
-                            :option-label="col.optionLabel"
-                            :filter-options="['id', 'transaction']"
-                            @update:model-value="
-                                setCursor($refs[`sagetransactionRef-${row.$index}`])
-                            "
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{
-                                            scope.opt.transaction
-                                        }}</QItemLabel>
-                                        <QItemLabel>
-                                            {{ `#${scope.opt.id}` }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </QTd>
-                </template>
-                <template #body-cell-foreignvalue="{ row }">
-                    <QTd shrink>
-                        <VnInputNumber
-                            :class="{
-                                'no-pointer-events': !isNotEuro(currency),
-                            }"
-                            :disable="!isNotEuro(currency)"
-                            v-model="row.foreignValue"
-                            @update:model-value="
-                                async (val) => {
-                                    if (!isNotEuro(currency)) return;
-                                    row.taxableBase = await getExchange(
-                                        val,
-                                        row.currencyFk,
-                                        invoiceIn.issued,
-                                    );
-                                }
-                            "
-                        />
-                    </QTd>
-                </template>
-                <template #bottom-row>
-                    <QTr class="bg">
-                        <QTd />
-                        <QTd />
-                        <QTd>
-                            {{ toCurrency(taxableBaseTotal) }}
-                        </QTd>
-                        <QTd />
-                        <QTd />
-                        <QTd />
-                        <QTd>
-                            {{ toCurrency(taxRateTotal) }}
-                        </QTd>
-                        <QTd />
-                        <QTd>
-                            {{ toCurrency(combinedTotal) }}
-                        </QTd>
-                    </QTr>
-                </template>
-
-                <template #item="props">
-                    <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
-                        <QCard bordered flat class="q-my-xs">
-                            <QCardSection>
-                                <QCheckbox v-model="props.selected" dense />
-                            </QCardSection>
-                            <QSeparator />
-                            <QList>
-                                <QItem>
-                                    <VnSelectDialog
-                                        :label="t('Expense')"
-                                        class="full-width"
-                                        v-model="props.row['expenseFk']"
-                                        :options="expenses"
-                                        option-value="id"
-                                        :option-label="(row) => `${row.id}:${row.name}`"
-                                        :filter-options="['id', 'name']"
-                                        :tooltip="t('Create a new expense')"
-                                    >
-                                        <template #option="scope">
-                                            <QItem v-bind="scope.itemProps">
-                                                {{ `${scope.opt.id}: ${scope.opt.name}` }}
-                                            </QItem>
-                                        </template>
-                                        <template #form>
-                                            <CreateNewExpenseForm />
-                                        </template>
-                                    </VnSelectDialog>
-                                </QItem>
-                                <QItem>
-                                    <VnInputNumber
-                                        :label="t('Taxable base')"
-                                        :class="{
-                                            'no-pointer-events': isNotEuro(currency),
-                                        }"
-                                        class="full-width"
-                                        :disable="isNotEuro(currency)"
-                                        clear-icon="close"
-                                        v-model="props.row.taxableBase"
-                                        clearable
-                                    />
-                                </QItem>
-                                <QItem>
-                                    <VnSelect
-                                        :label="t('Sage iva')"
-                                        class="full-width"
-                                        v-model="props.row['taxTypeSageFk']"
-                                        :options="sageTaxTypes"
-                                        option-value="id"
-                                        :option-label="(row) => `${row.id}:${row.vat}`"
-                                        :filter-options="['id', 'vat']"
-                                    >
-                                        <template #option="scope">
-                                            <QItem v-bind="scope.itemProps">
-                                                <QItemSection>
-                                                    <QItemLabel>{{
-                                                        scope.opt.vat
-                                                    }}</QItemLabel>
-                                                    <QItemLabel>
-                                                        {{ `#${scope.opt.id}` }}
-                                                    </QItemLabel>
-                                                </QItemSection>
-                                            </QItem>
-                                        </template>
-                                    </VnSelect>
-                                </QItem>
-                                <QItem>
-                                    <VnSelect
-                                        class="full-width"
-                                        v-model="props.row['transactionTypeSageFk']"
-                                        :options="sageTransactionTypes"
-                                        option-value="id"
-                                        :option-label="
-                                            (row) => `${row.id}:${row.transaction}`
-                                        "
-                                        :filter-options="['id', 'transaction']"
-                                    >
-                                        <template #option="scope">
-                                            <QItem v-bind="scope.itemProps">
-                                                <QItemSection>
-                                                    <QItemLabel>{{
-                                                        scope.opt.transaction
-                                                    }}</QItemLabel>
-                                                    <QItemLabel>
-                                                        {{ `#${scope.opt.id}` }}
-                                                    </QItemLabel>
-                                                </QItemSection>
-                                            </QItem>
-                                        </template>
-                                    </VnSelect>
-                                </QItem>
-                                <QItem>
-                                    {{ toCurrency(taxRate(props.row), currency) }}
-                                </QItem>
-                                <QItem>
-                                    <VnInputNumber
-                                        :label="t('Foreign value')"
-                                        class="full-width"
-                                        :class="{
-                                            'no-pointer-events': !isNotEuro(currency),
-                                        }"
-                                        :disable="!isNotEuro(currency)"
-                                        v-model="props.row.foreignValue"
-                                    />
-                                </QItem>
-                            </QList>
-                        </QCard>
-                    </div>
-                </template>
-            </QTable>
+        <template #column-footer-taxableBase>
+            {{ toCurrency(taxableBaseTotal) }}
         </template>
-    </CrudModel>
-    <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn
-            color="primary"
-            icon="add"
-            size="lg"
-            v-shortcut="'+'"
-            round
-            @click="invoiceInFormRef.insert()"
-        >
-            <QTooltip>{{ t('Add tax') }}</QTooltip>
-        </QBtn>
-    </QPageSticky>
+        <template #column-footer-rate>
+            {{ toCurrency(taxRateTotal) }}
+        </template>
+        <template #column-footer-total>
+            {{ toCurrency(combinedTotal) }}
+        </template>
+    </VnTable>
 </template>
-
-<style lang="scss" scoped>
-.bg {
-    background-color: var(--vn-light-gray);
-}
-@media (max-width: $breakpoint-xs) {
-    .q-dialog {
-        .q-card {
-            &__section:not(:first-child) {
-                .q-item {
-                    flex-direction: column;
-
-                    .q-checkbox {
-                        margin-top: 2rem;
-                    }
-                }
-            }
-        }
-    }
-}
-.q-item {
-    min-height: 0;
-}
-.default-icon {
-    cursor: pointer;
-    border-radius: 50px;
-    background-color: $primary;
-}
-</style>
 <i18n>
 es:
     Expense: Gasto
     Create a new expense: Crear nuevo gasto
-    Add tax: Crear gasto
+    Add tax: Añadir Gasto/IVA # Changed label slightly
     Taxable base: Base imp.
-    Sage tax: Sage iva
+    Sage iva: Sage iva # Kept original label
     Sage transaction: Sage transacción
-    Rate: Tasa
+    Rate: Cuota # Changed label
     Foreign value: Divisa
+    Total: Total
+    invoiceIn.isDeductible: Deducible
 </i18n>
diff --git a/src/pages/Login/LoginMain.vue b/src/pages/Login/LoginMain.vue
index a4c3566a9..0a84f8d02 100644
--- a/src/pages/Login/LoginMain.vue
+++ b/src/pages/Login/LoginMain.vue
@@ -1,12 +1,11 @@
 <script setup>
 import { ref } from 'vue';
-import { Notify } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import VnInputPassword from 'src/components/common/VnInputPassword.vue';
 import { useSession } from 'src/composables/useSession';
 import { useLogin } from 'src/composables/useLogin';
-
+import useNotify from 'src/composables/useNotify';
 import VnLogo from 'components/ui/VnLogo.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import axios from 'axios';
@@ -15,16 +14,14 @@ const session = useSession();
 const loginCache = useLogin();
 const router = useRouter();
 const { t } = useI18n();
+const { notify } = useNotify();
 
 const username = ref('');
 const password = ref('');
 const keepLogin = ref(true);
 
 async function onSubmit() {
-    const params = {
-        user: username.value,
-        password: password.value,
-    };
+    const params = { user: username.value, password: password.value };
     try {
         const { data } = await axios.post('Accounts/login', params);
         if (!data) return;
@@ -33,11 +30,7 @@ async function onSubmit() {
         await session.setLogin(data);
     } catch (res) {
         if (res.response?.data?.error?.code === 'REQUIRES_2FA') {
-            Notify.create({
-                message: t('login.twoFactorRequired'),
-                icon: 'phoneLink_lock',
-                type: 'warning',
-            });
+            notify(t('login.twoFactorRequired'), 'warning', 'phoneLink_lock');
             params.keepLogin = keepLogin.value;
             loginCache.setUser(params);
             return router.push({
@@ -45,10 +38,7 @@ async function onSubmit() {
                 query: router.currentRoute.value?.query,
             });
         }
-        Notify.create({
-            message: t('login.loginError'),
-            type: 'negative',
-        });
+        throw res;
     }
 }
 </script>
diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index 89a6e02f8..fd3e588af 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -66,6 +66,8 @@ const excludeType = computed({
 const arrayData = useArrayData('ZoneEvents');
 
 const exclusionGeoCreate = async () => {
+    if (await zoneHasTickets(route.params.id, dated.value)) return;
+
     const params = {
         zoneFk: parseInt(route.params.id),
         date: dated.value,
@@ -87,6 +89,8 @@ const exclusionCreate = async () => {
     };
     const zoneIds = props.zoneIds?.length ? props.zoneIds : [route.params.id];
     for (const id of zoneIds) {
+        if (await zoneHasTickets(id, dated.value)) return;
+
         const url = `Zones/${id}/exclusions`;
         let today = moment(dated.value);
         let lastDay = today.clone().add(nMonths, 'months').endOf('month');
@@ -123,6 +127,26 @@ const exclusionCreate = async () => {
     await refetchEvents();
 };
 
+const zoneHasTickets = async (zoneId, date) => {
+    const filter = {
+        where: {
+            zoneFk: zoneId,
+            shipped: date,
+        },
+    };
+    const params = { filter: JSON.stringify(filter) };
+    const { data } = await axios.get('Tickets', { params });
+    if (data.length > 0) {
+        quasar.notify({
+            message: t('eventsExclusionForm.cantCloseZone'),
+            type: 'negative',
+        });
+        await refetchEvents();
+        return true;
+    }
+    return false;
+};
+
 const onSubmit = async () => {
     if (excludeType.value === 'all') exclusionCreate();
     else exclusionGeoCreate();
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index f46a98ee6..b69a05719 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -80,6 +80,7 @@ eventsExclusionForm:
     all: All
     specificLocations: Specific locations
     rootTreeLabel: Locations where it is not distributed
+    cantCloseZone: Can not close this zone because there are tickets programmed for that day
 eventsInclusionForm:
     addEvent: Add event
     editEvent: Edit event
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index 7a23bdc02..942a61162 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -81,6 +81,7 @@ eventsExclusionForm:
     all: Todo
     specificLocations: Localizaciones concretas
     rootTreeLabel: Localizaciones en las que no se reparte
+    cantCloseZone: No se puede cerrar la zona porque hay tickets programados para ese día
 eventsInclusionForm:
     addEvent: Añadir evento
     editEvent: Editar evento
diff --git a/test/cypress/docker/run.sh b/test/cypress/docker/run.sh
index f62f57960..54d94bbc4 100755
--- a/test/cypress/docker/run.sh
+++ b/test/cypress/docker/run.sh
@@ -24,13 +24,8 @@ export CI=true
 export TZ=Europe/Madrid
 
 # IMAGES
-docker build -t registry.verdnatura.es/salix-back:dev -f "$salix_dir/back/Dockerfile" "$salix_dir"
-cd "$salix_dir" && npx myt run -t
-docker exec vn-database sh -c "rm -rf /mysql-template"
-docker exec vn-database sh -c "cp -a /var/lib/mysql /mysql-template"
-docker commit vn-database registry.verdnatura.es/salix-db:dev
-docker rm -f vn-database
-cd "$current_dir"
+docker-compose -f test/cypress/docker-compose.yml --project-directory . pull db
+docker-compose -f test/cypress/docker-compose.yml --project-directory . pull back
 docker build -f ./docs/Dockerfile.dev -t lilium-dev .
 # END IMAGES
 
diff --git a/test/cypress/integration/customer/clientCredits.spec.js b/test/cypress/integration/customer/clientCredits.spec.js
index 5f303b40d..f39f3c06c 100644
--- a/test/cypress/integration/customer/clientCredits.spec.js
+++ b/test/cypress/integration/customer/clientCredits.spec.js
@@ -7,7 +7,27 @@ describe('Client credits', () => {
             timeout: 5000,
         });
     });
-    it('Should load layout', () => {
+
+    it('Should put a new credit', () => {
         cy.get('.q-page').should('be.visible');
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.dataCy('Credit_input').type('100');
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data saved');
+    });
+
+    it('Should put a new credit with value 0 to close the client card', () => {
+        cy.get('.q-page').should('be.visible');
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.dataCy('Credit_input').type('0');
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data saved');
+    });
+
+    it('Should not create the credit if there is no value in the input', () => {
+        cy.get('.q-page').should('be.visible');
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.dataCy('FormModelPopup_save').click();
+        cy.get('.q-notification__message').should('not.exist');
     });
 });
diff --git a/test/cypress/integration/customer/clientFiscalData.spec.js b/test/cypress/integration/customer/clientFiscalData.spec.js
index 691dc1ad3..e80f7762e 100644
--- a/test/cypress/integration/customer/clientFiscalData.spec.js
+++ b/test/cypress/integration/customer/clientFiscalData.spec.js
@@ -1,37 +1,54 @@
 /// <reference types="cypress" />
-describe('Client fiscal data', { testIsolation: true }, () => {
-    beforeEach(() => {
-        cy.viewport(1280, 720);
-        cy.login('developer');
-        cy.visit('#/customer/1107/fiscal-data');
-    });
-    it.skip('Should change required value when change customer', () => {
-        cy.get('.q-card').should('be.visible');
-        cy.dataCy('sageTaxTypeFk').filter('input').should('not.have.attr', 'required');
-        cy.get('#searchbar input').clear();
-        cy.get('#searchbar input').type('1{enter}');
-        cy.get('.q-item > .q-item__label').should('have.text', ' #1');
-        cy.dataCy('sageTaxTypeFk').filter('input').should('have.attr', 'required');
+function checkSageFields(isRequired = false) {
+    const haveAttr = isRequired ? 'have.attr' : 'not.have.attr';
+    cy.dataCy('sageTaxTypeFk').filter('input').should(haveAttr, 'required');
+    cy.dataCy('sageTransactionTypeFk').filter('input').should(haveAttr, 'required');
+}
+describe('Client fiscal data', () => {
+    describe('#1008', () => {
+        beforeEach(() => {
+            cy.viewport(1280, 720);
+            cy.login('developer');
+            cy.visit('#/customer/1108/fiscal-data');
+        });
+        it('Should change required value when change customer', () => {
+            cy.get('.q-card').should('be.visible');
+            checkSageFields();
+            cy.get('[data-cy="vnCheckboxVerified data"]').click();
+            cy.get('.q-btn-group > .q-btn--standard > .q-btn__content').click();
+            checkSageFields();
+            cy.get('[data-cy="vnCheckboxVerified data"]').click();
+            checkSageFields(true);
+            cy.get('#searchbar input').clear();
+            cy.get('#searchbar input').type('1{enter}');
+            cy.get('.q-item > .q-item__label').should('have.text', ' #1');
+            checkSageFields();
+        });
     });
+    describe('#1007', () => {
+        beforeEach(() => {
+            cy.viewport(1280, 720);
+            cy.login('developer');
+            cy.visit('#/customer/1107/fiscal-data');
+        });
 
-    it('check as equalizated', () => {
-        cy.get(
-            ':nth-child(1) > .q-checkbox > .q-checkbox__inner > .q-checkbox__bg',
-        ).click();
-        cy.get('.q-btn-group > .q-btn--standard > .q-btn__content').click();
+        it('check as equalizated', () => {
+            cy.dataCy('vnCheckboxIs equalizated').click();
+            cy.get('.q-btn-group > .q-btn--standard > .q-btn__content').click();
 
-        cy.get('.q-card > :nth-child(1) > span').should(
-            'contain',
-            'You changed the equalization tax',
-        );
+            cy.get('.q-card > :nth-child(1) > span').should(
+                'contain',
+                'You changed the equalization tax',
+            );
 
-        cy.get('.q-card > :nth-child(2) > span').should(
-            'have.text',
-            'Do you want to spread the change?',
-        );
-        cy.get('[data-cy="VnConfirm_confirm"] > .q-btn__content > .block').click();
-        cy.get(
-            '.bg-warning > .q-notification__wrapper > .q-notification__content > .q-notification__message',
-        ).should('have.text', 'Equivalent tax spreaded');
+            cy.get('.q-card > :nth-child(2) > span').should(
+                'have.text',
+                'Do you want to spread the change?',
+            );
+            cy.get('[data-cy="VnConfirm_confirm"] > .q-btn__content > .block').click();
+            cy.get(
+                '.bg-warning > .q-notification__wrapper > .q-notification__content > .q-notification__message',
+            ).should('have.text', 'Equivalent tax spreaded');
+        });
     });
 });
diff --git a/test/cypress/integration/login/logout.spec.js b/test/cypress/integration/login/logout.spec.js
index 19568c83b..6ade6912d 100644
--- a/test/cypress/integration/login/logout.spec.js
+++ b/test/cypress/integration/login/logout.spec.js
@@ -5,33 +5,28 @@ describe('Logout', { testIsolation: true }, () => {
         cy.visit(`/#/dashboard`);
         cy.waitForElement('.q-page', 6000);
     });
-    describe('by user', () => {
-        it('should logout', () => {
-            cy.get('#user').click();
-            cy.get('#logout').click();
-        });
+
+    it('should logout', () => {
+        cy.get('#user').click();
+        cy.get('#logout').click();
     });
-    describe('not user', () => {
-        beforeEach(() => {
-            cy.intercept('GET', '**StarredModules**', {
-                statusCode: 401,
-                body: {
-                    error: {
-                        statusCode: 401,
-                        name: 'Error',
-                        message: 'Authorization Required',
-                        code: 'AUTHORIZATION_REQUIRED',
-                    },
+
+    it('should throw session expired error if token has expired or is not valid during navigation', () => {
+        cy.intercept('GET', '**StarredModules**', {
+            statusCode: 401,
+            body: {
+                error: {
+                    statusCode: 401,
+                    name: 'Error',
+                    message: 'Authorization Required',
+                    code: 'AUTHORIZATION_REQUIRED',
                 },
-                statusMessage: 'AUTHORIZATION_REQUIRED',
-            }).as('badRequest');
-        });
+            },
+            statusMessage: 'AUTHORIZATION_REQUIRED',
+        }).as('badRequest');
+        cy.get('.q-list').should('be.visible').first().should('be.visible').click();
+        cy.wait('@badRequest');
 
-        it('when token not exists', () => {
-            cy.get('.q-list').should('be.visible').first().should('be.visible').click();
-            cy.wait('@badRequest');
-
-            cy.checkNotification('Authorization Required');
-        });
+        cy.checkNotification('Your session has expired. Please log in again');
     });
 });
diff --git a/test/cypress/integration/route/roadMap/roadmapList.spec.js b/test/cypress/integration/route/roadMap/roadmapList.spec.js
index bacf130a7..2483611bc 100644
--- a/test/cypress/integration/route/roadMap/roadmapList.spec.js
+++ b/test/cypress/integration/route/roadMap/roadmapList.spec.js
@@ -1,4 +1,4 @@
-describe('RoadMap', () => {
+describe.skip('RoadMap', () => {
     const getSelector = (colField) =>
         `tr:last-child > [data-col-field="${colField}"] > .no-padding`;
 
diff --git a/test/cypress/integration/zone/zoneCalendar.spec.js b/test/cypress/integration/zone/zoneCalendar.spec.js
index 68b85d1d2..da2a52fda 100644
--- a/test/cypress/integration/zone/zoneCalendar.spec.js
+++ b/test/cypress/integration/zone/zoneCalendar.spec.js
@@ -1,4 +1,4 @@
-describe('ZoneCalendar', () => {
+describe('ZoneCalendar', { testIsolation: true }, () => {
     const addEventBtn = '.q-page-sticky > div > .q-btn';
     const submitBtn = '.q-mt-lg > .q-btn--standard';
     const deleteBtn = 'ZoneEventsPanelDeleteBtn';
@@ -47,4 +47,20 @@ describe('ZoneCalendar', () => {
         cy.dataCy('ZoneEventExclusionDeleteBtn').click();
         cy.dataCy('VnConfirm_confirm').click();
     });
+
+    it(
+        'should not exclude an event if there are tickets for that zone and day',
+        { testIsoaltion: true },
+        () => {
+            cy.visit(`/#/zone/3/events`);
+            cy.get('.q-mb-sm > .q-radio__inner').click();
+            cy.get(
+                '.q-current-day > .q-calendar-month__day--content > [data-cy="ZoneCalendarDay"]',
+            ).click();
+            cy.get('.q-mt-lg > .q-btn--standard').click();
+            cy.checkNotification(
+                'Can not close this zone because there are tickets programmed for that day',
+            );
+        },
+    );
 });
diff --git a/test/cypress/integration/zone/zoneDeliveryDays.spec.js b/test/cypress/integration/zone/zoneDeliveryDays.spec.js
index 6d19edb77..51c65df05 100644
--- a/test/cypress/integration/zone/zoneDeliveryDays.spec.js
+++ b/test/cypress/integration/zone/zoneDeliveryDays.spec.js
@@ -26,27 +26,8 @@ describe('ZoneDeliveryDays', () => {
             });
         }).as('events');
 
-        cy.dataCy('ZoneDeliveryDaysPostcodeSelect').type(postcode);
-        cy.get('.q-menu .q-item').contains(postcode).click();
-        cy.get('.q-menu').then(($menu) => {
-            if ($menu.is(':visible')) {
-                cy.get('[data-cy="ZoneDeliveryDaysPostcodeSelect"]')
-                    .as('focusedElement')
-                    .focus();
-                cy.get('@focusedElement').blur();
-            }
-        });
-
-        cy.dataCy('ZoneDeliveryDaysAgencySelect').type(agency);
-        cy.get('.q-menu .q-item').contains(agency).click();
-        cy.get('.q-menu').then(($menu) => {
-            if ($menu.is(':visible')) {
-                cy.get('[data-cy="ZoneDeliveryDaysAgencySelect"]')
-                    .as('focusedElement')
-                    .focus();
-                cy.get('@focusedElement').blur();
-            }
-        });
+        cy.selectOption('[data-cy="ZoneDeliveryDaysPostcodeSelect"]', postcode);
+        cy.selectOption('[data-cy="ZoneDeliveryDaysAgencySelect"]', agency);
 
         cy.get(submitForm).click();
         cy.wait('@events').then((interception) => {