diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 6d9110ed4..9c9d1b50b 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -52,7 +52,12 @@ function onBeforeSave(formData, originalData) {
         @on-fetch="(data) => (businessTypes = data)"
         auto-load
     />
-    <FormModel :url-update="`Clients/${route.params.id}`" auto-load model="Customer">
+    <FormModel
+        :url-update="`Clients/${route.params.id}`"
+        auto-load
+        :mapper="onBeforeSave"
+        model="Customer"
+    >
         <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 518bf1242..93909eb9c 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -31,6 +31,12 @@ function handleLocation(data, location) {
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;
 }
+function onBeforeSave(formData, originalData) {
+    return getUpdatedValues(
+        Object.keys(getDifferences(formData, originalData)),
+        formData,
+    );
+}
 
 async function checkEtChanges(data, _, originalData) {
     const equalizatedHasChanged = originalData.isEqualizated != data.isEqualizated;
@@ -69,6 +75,7 @@ async function acceptPropagate({ isEqualizated }) {
         :url-update="`Clients/${route.params.id}/updateFiscalData`"
         auto-load
         model="Customer"
+        :mapper="onBeforeSave"
         observe-form-changes
         @on-data-saved="checkEtChanges"
     >
diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
index 5b351d598..ac80fdaa4 100644
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -103,6 +103,17 @@ const calculateFromDeliveredAmount = (event) => {
     initialData.amountToReturn = parseFloat(event) - initialData.amountPaid;
 };
 
+function onBeforeSave(data) {
+    const exceededAmount = data.amountPaid > maxAmount.value;
+    if (isCash.value && exceededAmount)
+        return notify(t('Amount exceeded', { maxAmount: maxAmount.value }), 'negative');
+
+    if (isCash.value && shouldSendEmail.value && !data.email)
+        return notify(t('There is no assigned email for this client'), 'negative');
+
+    return data;
+}
+
 async function onDataSaved(formData, { id }) {
     try {
         if (shouldSendEmail.value && isCash.value)
@@ -171,6 +182,7 @@ async function getAmountPaid() {
             ref="formModelRef"
             :form-initial-data="initialData"
             :url-create="urlCreate"
+            :mapper="onBeforeSave"
             @on-data-saved="onDataSaved"
             :prevent-submit="true"
         >
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index 286ce7dad..76191b099 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter, useRoute } from 'vue-router';
+import { useRouter } from 'vue-router';
 
 import TicketBasicData from './TicketBasicData.vue';
 import TicketBasicDataForm from './TicketBasicDataForm.vue';
@@ -13,7 +13,6 @@ import { useArrayData } from 'src/composables/useArrayData';
 
 const { notify } = useNotify();
 const router = useRouter();
-const route = useRoute();
 const { t } = useI18n();
 const stepperRef = ref(null);
 const { openConfirmationModal } = useVnConfirm();
@@ -22,7 +21,6 @@ const step = ref(1);
 const haveNegatives = ref(true);
 
 const ticket = computed(() => useArrayData('Ticket').store?.data);
-const entityId = computed(() => +route?.params?.id);
 
 const isFormInvalid = () => {
     return (
diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
index 4cfc49290..06171366d 100644
--- a/src/pages/Ticket/Card/TicketTracking.vue
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, reactive } from 'vue';
+import { ref, reactive, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -17,14 +17,6 @@ const user = state.getUser();
 const route = useRoute();
 const { t } = useI18n();
 const tableRef = ref(null);
-
-// watch(
-//     () => route.params.id,
-//     async (val) => {
-//         paginateFilter.where.ticketFk = val;
-//         paginateRef.value.fetch();
-//     },
-// );
 const onStateFkChange = (formData) => (formData.userFk = user.value.id);
 const paginateFilter = reactive({
     include: [
@@ -54,7 +46,7 @@ const paginateFilter = reactive({
     },
 });
 
-const columns = [
+const columns = computed(() => [
     {
         label: t('ticketList.state'),
         name: 'state',
@@ -73,9 +65,9 @@ const columns = [
         name: 'created',
         field: 'created',
         align: 'left',
-        format: (row) => toDateTimeFormat(row.created),
+        format: ({ created }) => toDateTimeFormat(created),
     },
-];
+]);
 </script>
 
 <template>
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index 8d7c4a165..d86530fb3 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -260,7 +260,6 @@ const closeEventForm = () => {
                             onDataSaved: ({ id }) => tableRef.redirect(`${id}/location`),
                             formInitialData: {},
                         }"
-                        table-height="85vh"
                         v-model:selected="selectedRows"
                         :table="{
                             'row-key': 'id',
diff --git a/test/cypress/integration/route/routeAutonomous.spec.js b/test/cypress/integration/route/routeAutonomous.spec.js
index 3c5c2cede..08fd7d7ea 100644
--- a/test/cypress/integration/route/routeAutonomous.spec.js
+++ b/test/cypress/integration/route/routeAutonomous.spec.js
@@ -22,7 +22,7 @@ describe.skip('RouteAutonomous', () => {
     };
 
     const data = {
-        reference: '1234',
+        reference: 'Test invoice',
         total: '€206.40',
         supplier: 'PLANTS SL',
         route: 'first route',