From 0e48701bc709fdb7a11ae34323ce429bef561330 Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Fri, 28 Feb 2025 11:36:24 +0100
Subject: [PATCH 01/28] feat: refs #8118 add VnDropdown component and integrate
 it into Claim and Ticket summaries

---
 src/components/common/VnDropdown.vue    | 60 +++++++++++++++++++++++++
 src/pages/Claim/Card/ClaimSummary.vue   | 49 +++++++-------------
 src/pages/Ticket/Card/TicketSummary.vue | 30 ++++---------
 3 files changed, 86 insertions(+), 53 deletions(-)
 create mode 100644 src/components/common/VnDropdown.vue

diff --git a/src/components/common/VnDropdown.vue b/src/components/common/VnDropdown.vue
new file mode 100644
index 000000000..63d6b96f6
--- /dev/null
+++ b/src/components/common/VnDropdown.vue
@@ -0,0 +1,60 @@
+<script setup>
+import { ref } from 'vue';
+import VnSelect from './VnSelect.vue';
+
+const stateBtnDropdownRef = ref();
+
+const emit = defineEmits(['changeState']);
+
+const $props = defineProps({
+    disable: {
+        type: Boolean,
+        default: null,
+    },
+    moduleName: {
+        type: String,
+        default: null,
+    },
+    options: {
+        type: Array,
+        default: null,
+    },
+});
+
+async function changeState(value) {
+    stateBtnDropdownRef.value?.hide();
+    emit('changeState', value);
+}
+</script>
+
+<template>
+    <QBtnDropdown
+        ref="stateBtnDropdownRef"
+        color="black"
+        text-color="white"
+        :label="$t('globals.changeState')"
+        :disable="$props.disable"
+    >
+        <VnSelect
+            :options="$props.options"
+            hide-selected
+            option-value="code"
+            hide-dropdown-icon
+            focus-on-mount
+            @update:model-value="changeState"
+        >
+            <template #option="scope">
+                <QItem v-bind="scope.itemProps">
+                    <QItemSection>
+                        <QItemLabel v-if="$props.moduleName === 'Ticket'">
+                            {{ scope.opt?.name }}
+                        </QItemLabel>
+                        <QItemLabel v-if="$props.moduleName === 'Claim'">
+                            {{ scope.opt?.description }}
+                        </QItemLabel>
+                    </QItemSection>
+                </QItem>
+            </template>
+        </VnSelect>
+    </QBtnDropdown>
+</template>
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 210b0c982..b0476716b 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate, toCurrency } from 'src/filters';
@@ -20,6 +20,7 @@ import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import ClaimDescriptorMenu from './ClaimDescriptorMenu.vue';
+import VnDropdown from 'src/components/common/VnDropdown.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -35,7 +36,7 @@ const $props = defineProps({
 });
 
 const entityId = computed(() => $props.id || route.params.id);
-const ClaimStates = ref([]);
+const claimStates = ref([]);
 const claimDmsRef = ref();
 const claimDms = ref([]);
 const multimediaDialog = ref();
@@ -172,13 +173,21 @@ function openDialog(dmsId) {
 }
 
 async function changeState(value) {
-    await axios.patch(`Claims/updateClaim/${entityId.value}`, { claimStateFk: value });
+    const newState = claimStates.value.find((state) => state.code == value);
+    await axios.patch(`Claims/updateClaim/${entityId.value}`, {
+        claimStateFk: newState.id,
+    });
     router.go(route.fullPath);
 }
 
 function claimUrl(section) {
     return '#/claim/' + entityId.value + '/' + section;
 }
+
+onMounted(async () => {
+    const { data } = await axios.get('ClaimStates');
+    claimStates.value = data;
+});
 </script>
 
 <template>
@@ -188,7 +197,6 @@ function claimUrl(section) {
         @on-fetch="(data) => setClaimDms(data)"
         ref="claimDmsRef"
     />
-    <FetchData url="ClaimStates" @on-fetch="(data) => (ClaimStates = data)" auto-load />
     <CardSummary
         ref="summary"
         :url="`Claims/${entityId}/getSummary`"
@@ -200,34 +208,11 @@ function claimUrl(section) {
             {{ claim.id }} - {{ claim.client.name }} ({{ claim.client.id }})
         </template>
         <template #header-right>
-            <QBtnDropdown
-                side
-                top
-                color="black"
-                text-color="white"
-                :label="t('globals.changeState')"
-            >
-                <QList>
-                    <QVirtualScroll
-                        class="max-container-height"
-                        :items="ClaimStates"
-                        separator
-                        v-slot="{ item, index }"
-                    >
-                        <QItem
-                            :key="index"
-                            dense
-                            clickable
-                            v-close-popup
-                            @click="changeState(item.id)"
-                        >
-                            <QItemSection>
-                                <QItemLabel>{{ item.description }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QVirtualScroll>
-                </QList>
-            </QBtnDropdown>
+            <VnDropdown
+                :moduleName="route.meta.moduleName"
+                :options="claimStates"
+                @change-state="changeState($event)"
+            />
         </template>
         <template #menu="{ entity }">
             <ClaimDescriptorMenu :claim="entity.claim" />
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 5838efa88..a575d66e7 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -21,6 +21,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnToSummary from 'src/components/ui/VnToSummary.vue';
 import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
 import TicketProblems from 'src/components/TicketProblems.vue';
+import VnDropdown from 'src/components/common/VnDropdown.vue';
 
 const route = useRoute();
 const { notify } = useNotify();
@@ -40,7 +41,7 @@ const ticket = computed(() => summary.value?.entity);
 const editableStates = ref([]);
 const ticketUrl = ref();
 const grafanaUrl = 'https://grafana.verdnatura.es';
-const stateBtnDropdownRef = ref();
+
 const descriptorData = useArrayData('Ticket');
 
 onMounted(async () => {
@@ -67,7 +68,6 @@ function isEditable() {
 }
 
 async function changeState(value) {
-    stateBtnDropdownRef.value?.hide();
     const formData = {
         ticketFk: entityId.value,
         code: value,
@@ -113,25 +113,13 @@ onMounted(async () => {
             </div>
         </template>
         <template #header-right>
-            <div>
-                <QBtnDropdown
-                    ref="stateBtnDropdownRef"
-                    color="black"
-                    text-color="white"
-                    :label="t('globals.changeState')"
-                    :disable="!isEditable()"
-                >
-                    <VnSelect
-                        :options="editableStates"
-                        hide-selected
-                        option-label="name"
-                        option-value="code"
-                        hide-dropdown-icon
-                        focus-on-mount
-                        @update:model-value="changeState"
-                    />
-                </QBtnDropdown>
-            </div>
+            <VnDropdown
+                :moduleName="route.meta.moduleName"
+                :moduleId="entityId"
+                :options="editableStates"
+                :disable="!isEditable()"
+                @change-state="changeState($event)"
+            />
         </template>
         <template #menu="{ entity }">
             <TicketDescriptorMenu :ticket="entity" />

From df3bbfe5e4f2937b095e80fa065d0046d9eb0ac7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 11 Mar 2025 13:41:52 +0100
Subject: [PATCH 02/28] fix: refs #8388 update file attachment logic and
 redirect after invoice creation

---
 src/components/common/VnDms.vue       | 4 +++-
 src/pages/InvoiceIn/InvoiceInList.vue | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/common/VnDms.vue b/src/components/common/VnDms.vue
index 35308c2c4..03f85f855 100644
--- a/src/components/common/VnDms.vue
+++ b/src/components/common/VnDms.vue
@@ -46,9 +46,11 @@ const dms = ref({});
 
 onMounted(() => {
     defaultData();
-    if (!$props.formInitialData)
+    if (!$props.formInitialData) {
         dms.value.description =
             $props.description ?? t($props.model + 'Description', dms.value);
+        dms.value.hasFile = false;
+    }
 });
 function onFileChange(files) {
     dms.value.hasFileAttached = !!files;
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 0960d0d6c..8dbee6501 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -156,7 +156,7 @@ const cols = computed(() => [
                 :create="{
                     urlCreate: 'InvoiceIns',
                     title: t('globals.createInvoiceIn'),
-                    onDataSaved: ({ id }) => tableRef.redirect(id),
+                    onDataSaved: ({ id }) => tableRef.redirect(`${id}/basic-data`),
                     formInitialData: { companyFk: user.companyFk, issued: Date.vnNew() },
                 }"
                 redirect="invoice-in"

From bce7e2ad565f31d4f3f374d4fe082186f25c43f8 Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Thu, 13 Mar 2025 08:06:39 +0100
Subject: [PATCH 03/28] feat: refs #8118 enhance VnDropdown component; simplify
 usage in Claim and Ticket summaries

---
 src/components/common/VnDropdown.vue    | 22 ++++++++++++----------
 src/pages/Claim/Card/ClaimSummary.vue   |  9 ++-------
 src/pages/Ticket/Card/TicketSummary.vue |  1 -
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/components/common/VnDropdown.vue b/src/components/common/VnDropdown.vue
index 63d6b96f6..75b6878a0 100644
--- a/src/components/common/VnDropdown.vue
+++ b/src/components/common/VnDropdown.vue
@@ -11,14 +11,18 @@ const $props = defineProps({
         type: Boolean,
         default: null,
     },
-    moduleName: {
-        type: String,
-        default: null,
-    },
     options: {
         type: Array,
         default: null,
     },
+    optionLabel: {
+        type: String,
+        default: 'name',
+    },
+    optionValue: {
+        type: String,
+        default: 'id',
+    },
 });
 
 async function changeState(value) {
@@ -37,8 +41,9 @@ async function changeState(value) {
     >
         <VnSelect
             :options="$props.options"
+            :option-label="$props.optionLabel"
+            :option-value="$props.optionValue"
             hide-selected
-            option-value="code"
             hide-dropdown-icon
             focus-on-mount
             @update:model-value="changeState"
@@ -46,11 +51,8 @@ async function changeState(value) {
             <template #option="scope">
                 <QItem v-bind="scope.itemProps">
                     <QItemSection>
-                        <QItemLabel v-if="$props.moduleName === 'Ticket'">
-                            {{ scope.opt?.name }}
-                        </QItemLabel>
-                        <QItemLabel v-if="$props.moduleName === 'Claim'">
-                            {{ scope.opt?.description }}
+                        <QItemLabel>
+                            {{ scope.opt?.name || scope.opt?.description }}
                         </QItemLabel>
                     </QItemSection>
                 </QItem>
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 23a9f1073..25910cfc0 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -173,9 +173,8 @@ function openDialog(dmsId) {
 }
 
 async function changeState(value) {
-    const newState = claimStates.value.find((state) => state.code == value);
     await axios.patch(`Claims/updateClaim/${entityId.value}`, {
-        claimStateFk: newState.id,
+        claimStateFk: value,
     });
     router.go(route.fullPath);
 }
@@ -208,11 +207,7 @@ onMounted(async () => {
             {{ claim.id }} - {{ claim.client.name }} ({{ claim.client.id }})
         </template>
         <template #header-right>
-            <VnDropdown
-                :moduleName="route.meta.moduleName"
-                :options="claimStates"
-                @change-state="changeState($event)"
-            />
+            <VnDropdown :options="claimStates" @change-state="changeState($event)" />
         </template>
         <template #menu="{ entity }">
             <ClaimDescriptorMenu :claim="entity.claim" />
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index a575d66e7..907276849 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -114,7 +114,6 @@ onMounted(async () => {
         </template>
         <template #header-right>
             <VnDropdown
-                :moduleName="route.meta.moduleName"
                 :moduleId="entityId"
                 :options="editableStates"
                 :disable="!isEditable()"

From 96b02a3b223591ad98226291d4101b37368bdc1a Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Thu, 13 Mar 2025 13:10:55 +0100
Subject: [PATCH 04/28] fix: refs #8118 correct spelling in success message for
 work center removal

---
 test/cypress/integration/route/agency/agencyWorkCenter.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/route/agency/agencyWorkCenter.spec.js b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
index a3e0aac81..79dcd6f70 100644
--- a/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
+++ b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
@@ -9,7 +9,7 @@ describe('AgencyWorkCenter', () => {
     const messages = {
         dataCreated: 'Data created',
         alreadyAssigned: 'This workCenter is already assigned to this agency',
-        removed: 'WorkCenter removed successfully',
+        removed: 'Work center removed successfully',
     };
 
     beforeEach(() => {

From 01d1ca83ea12fcb02fd00496438694ee1fcb5d61 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 17 Mar 2025 13:25:40 +0100
Subject: [PATCH 05/28] fix: refs #8388 improve error handling and notification
 for invoice booking

---
 src/pages/InvoiceIn/InvoiceInToBook.vue | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/pages/InvoiceIn/InvoiceInToBook.vue b/src/pages/InvoiceIn/InvoiceInToBook.vue
index 5bdbe197b..7bb465d70 100644
--- a/src/pages/InvoiceIn/InvoiceInToBook.vue
+++ b/src/pages/InvoiceIn/InvoiceInToBook.vue
@@ -56,22 +56,21 @@ async function checkToBook(id) {
             componentProps: {
                 title: t('Are you sure you want to book this invoice?'),
                 message: messages.reduce((acc, msg) => `${acc}<p>${msg}</p>`, ''),
+                promise: () => toBook(id),
             },
-        }).onOk(() => toBook(id));
+        });
 }
 
 async function toBook(id) {
-    let type = 'positive';
-    let message = t('globals.dataSaved');
-
+    let err;
     try {
         await axios.post(`InvoiceIns/${id}/toBook`);
         store.data.isBooked = true;
     } catch (e) {
-        type = 'negative';
-        message = t('It was not able to book the invoice');
+        err = true;
+        throw e;
     } finally {
-        notify({ type, message });
+        if (!err) notify({ type: 'positive', message: t('globals.dataSaved') });
     }
 }
 </script>

From 6546d06f60d62356e86c50d9386a30756b49bab2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 18 Mar 2025 12:04:54 +0100
Subject: [PATCH 06/28] refactor: refs #8388 update UI feedback

---
 src/pages/InvoiceIn/Card/InvoiceInDueDay.vue | 36 +++++++++++++++-----
 src/pages/InvoiceIn/locale/en.yml            |  1 +
 src/pages/InvoiceIn/locale/es.yml            |  2 ++
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index 20cc1cc71..59bebcae2 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -25,7 +25,8 @@ const invoiceInFormRef = ref();
 const invoiceId = +route.params.id;
 const filter = { where: { invoiceInFk: invoiceId } };
 const areRows = ref(false);
-const totals = ref();
+const totalTaxableBase = ref();
+const noMatch = computed(() => totalAmount.value != totalTaxableBase.value);
 const columns = computed(() => [
     {
         name: 'duedate',
@@ -74,9 +75,12 @@ async function insert() {
     notify(t('globals.dataSaved'), 'positive');
 }
 
-onBeforeMount(async () => {
-    totals.value = (await axios.get(`InvoiceIns/${invoiceId}/getTotals`)).data;
-});
+async function setTaxableBase() {
+    const { data } = await axios.get(`InvoiceIns/${invoiceId}/getTotals`);
+    totalTaxableBase.value = data.totalTaxableBase;
+}
+
+onBeforeMount(async () => await setTaxableBase());
 </script>
 <template>
     <CrudModel
@@ -89,13 +93,14 @@ onBeforeMount(async () => {
         :data-required="{ invoiceInFk: invoiceId }"
         v-model:selected="rowsSelected"
         @on-fetch="(data) => (areRows = !!data.length)"
+        @save-changes="setTaxableBase"
     >
         <template #body="{ rows }">
             <QTable
                 v-model:selected="rowsSelected"
                 selection="multiple"
-                :columns="columns"
-                :rows="rows"
+                :columns
+                :rows
                 row-key="$index"
                 :grid="$q.screen.lt.sm"
             >
@@ -151,7 +156,18 @@ onBeforeMount(async () => {
                         <QTd />
                         <QTd />
                         <QTd>
-                            {{ toCurrency(totalAmount) }}
+                            <QChip
+                                dense
+                                :color="noMatch ? 'negative' : 'transparent'"
+                                class="q-pa-xs"
+                                :title="
+                                    noMatch
+                                        ? t('invoiceIn.noMatch', { totalTaxableBase })
+                                        : ''
+                                "
+                            >
+                                {{ toCurrency(totalAmount) }}
+                            </QChip>
                         </QTd>
                         <QTd>
                             <template v-if="isNotEuro(invoiceIn.currency.code)">
@@ -237,7 +253,7 @@ onBeforeMount(async () => {
                     if (!areRows) insert();
                     else
                         invoiceInFormRef.insert({
-                            amount: (totals.totalTaxableBase - totalAmount).toFixed(2),
+                            amount: (totalTaxableBase - totalAmount).toFixed(2),
                             invoiceInFk: invoiceId,
                         });
                 }
@@ -249,6 +265,10 @@ onBeforeMount(async () => {
 .bg {
     background-color: var(--vn-light-gray);
 }
+
+.q-chip {
+    color: var(--vn-text-color);
+}
 </style>
 <i18n>
     es:
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index 548e6c201..085f351b2 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -68,3 +68,4 @@ invoiceIn:
         isBooked: Is booked
         account: Ledger account
         correctingFk: Rectificative
+    noMatch: No match with the vat({totalTaxableBase})
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index 142d95f92..516da1149 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -60,9 +60,11 @@ invoiceIn:
         net: Neto
         stems: Tallos
         country: País
+        noMatch: No cuadra
     params:
         search: Id o nombre proveedor
         correctedFk: Rectificada
         isBooked: Contabilizada
         account: Cuenta contable
         correctingFk: Rectificativa
+    noMatch: No cuadra con el iva({totalTaxableBase})

From b7309298aa591f06059a389f8e8f0320a760fb95 Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Thu, 20 Mar 2025 10:04:27 +0100
Subject: [PATCH 07/28] refactor: refs #8118 simplify VnDropdown usage and
 replace onMounted data fetching with FetchData component

---
 src/components/common/VnDropdown.vue    |  9 ---------
 src/pages/Claim/Card/ClaimSummary.vue   | 18 ++++++++++++------
 src/pages/Ticket/Card/TicketSummary.vue |  2 ++
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/components/common/VnDropdown.vue b/src/components/common/VnDropdown.vue
index 75b6878a0..1b3f2237b 100644
--- a/src/components/common/VnDropdown.vue
+++ b/src/components/common/VnDropdown.vue
@@ -48,15 +48,6 @@ async function changeState(value) {
             focus-on-mount
             @update:model-value="changeState"
         >
-            <template #option="scope">
-                <QItem v-bind="scope.itemProps">
-                    <QItemSection>
-                        <QItemLabel>
-                            {{ scope.opt?.name || scope.opt?.description }}
-                        </QItemLabel>
-                    </QItemSection>
-                </QItem>
-            </template>
         </VnSelect>
     </QBtnDropdown>
 </template>
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index f43ba4dad..37e73a99d 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -183,14 +183,15 @@ async function changeState(value) {
 function claimUrl(section) {
     return '#/claim/' + entityId.value + '/' + section;
 }
-
-onMounted(async () => {
-    const { data } = await axios.get('ClaimStates');
-    claimStates.value = data;
-});
 </script>
 
 <template>
+    <FetchData
+        url="ClaimStates"
+        :filter="{ fields: ['id', 'description'] }"
+        @on-fetch="(data) => (claimStates = data)"
+        auto-load
+    />
     <FetchData
         url="ClaimDms"
         :filter="claimDmsFilter"
@@ -208,7 +209,12 @@ onMounted(async () => {
             {{ claim.id }} - {{ claim.client.name }} ({{ claim.client.id }})
         </template>
         <template #header-right>
-            <VnDropdown :options="claimStates" @change-state="changeState($event)" />
+            <VnDropdown
+                :options="claimStates"
+                option-value="id"
+                option-label="description"
+                @change-state="changeState($event)"
+            />
         </template>
         <template #menu="{ entity }">
             <ClaimDescriptorMenu :claim="entity.claim" />
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index f1c5a1072..9cd8a75d2 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -117,6 +117,8 @@ onMounted(async () => {
                 :moduleId="entityId"
                 :options="editableStates"
                 :disable="!isEditable()"
+                :option-label="'name'"
+                :option-value="'code'"
                 @change-state="changeState($event)"
             />
         </template>

From efb6c2357bd4c491472642878a63a9f948e39b78 Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Thu, 20 Mar 2025 12:55:46 +0100
Subject: [PATCH 08/28] fix: refs #8118 update Cypress parallel test execution
 to run with a single instance

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 7f4144a54..05ef34791 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -126,7 +126,7 @@ pipeline {
                             sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
 
                             image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
-                                sh 'sh test/cypress/cypressParallel.sh 2'
+                                sh 'sh test/cypress/cypressParallel.sh 1'
                             }
                         }
                     }

From 7de4bd4f4a4ce1de7a4fc3ed990b09c475272262 Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Thu, 20 Mar 2025 13:01:13 +0100
Subject: [PATCH 09/28] fix: refs #8118 update Cypress parallel test execution
 to run with two instances

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 05ef34791..7f4144a54 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -126,7 +126,7 @@ pipeline {
                             sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
 
                             image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
-                                sh 'sh test/cypress/cypressParallel.sh 1'
+                                sh 'sh test/cypress/cypressParallel.sh 2'
                             }
                         }
                     }

From 3e956cda6998f4b6bc5c59f91bd09aa49baa09d9 Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Fri, 21 Mar 2025 09:26:09 +0100
Subject: [PATCH 10/28] fix: refs #8118 update VnDropdown options in
 ClaimSummary and TicketSummary components

---
 src/pages/Claim/Card/ClaimSummary.vue   | 2 +-
 src/pages/Ticket/Card/TicketSummary.vue | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 37e73a99d..85f37f440 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -211,8 +211,8 @@ function claimUrl(section) {
         <template #header-right>
             <VnDropdown
                 :options="claimStates"
-                option-value="id"
                 option-label="description"
+                option-value="id"
                 @change-state="changeState($event)"
             />
         </template>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 9cd8a75d2..d79c5a9ac 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -114,9 +114,8 @@ onMounted(async () => {
         </template>
         <template #header-right>
             <VnDropdown
-                :moduleId="entityId"
-                :options="editableStates"
                 :disable="!isEditable()"
+                :options="editableStates"
                 :option-label="'name'"
                 :option-value="'code'"
                 @change-state="changeState($event)"

From a74ff042bcc0ad4866a728eb0a0dec25b8c6ab0c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 21 Mar 2025 11:09:42 +0100
Subject: [PATCH 11/28] feat: refs #7358 added chip in navbar to show
 environment

---
 src/components/NavBar.vue | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index dbb6f1fe6..605d8786a 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -18,7 +18,18 @@ const state = useState();
 const user = state.getUser();
 const appName = 'Lilium';
 const pinnedModulesRef = ref();
+const env = process.env.NODE_ENV;
 
+function getEnvironment() {
+    switch (env) {
+        case 'development':
+            return 'dev';
+        case 'production':
+            return;
+        default:
+            return env;
+    }
+}
 onMounted(() => stateStore.setMounted());
 const refresh = () => window.location.reload();
 </script>
@@ -50,6 +61,9 @@ const refresh = () => window.location.reload();
                     </QTooltip>
                 </QBtn>
             </RouterLink>
+            <QChip class="q-ml-xs q-mr-xs envChip">
+                {{ getEnvironment() }}
+            </QChip>
             <VnBreadcrumbs v-if="$q.screen.gt.sm" />
             <QSpinner
                 color="primary"
@@ -118,4 +132,7 @@ const refresh = () => window.location.reload();
 .q-header {
     background-color: var(--vn-section-color);
 }
+.envChip {
+    background-color: $primary;
+}
 </style>

From d8b9f3467a5fab53b7739c99c3c8c0c2fd5824f4 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 21 Mar 2025 13:25:59 +0100
Subject: [PATCH 12/28] refactor: refs #7358 changed function to computed

---
 src/components/NavBar.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 605d8786a..6365fcd07 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
@@ -20,16 +20,16 @@ const appName = 'Lilium';
 const pinnedModulesRef = ref();
 const env = process.env.NODE_ENV;
 
-function getEnvironment() {
+const getEnvironment = computed(() => {
     switch (env) {
         case 'development':
-            return 'dev';
+            return 'DEV';
         case 'production':
             return;
         default:
-            return env;
+            return env.toUpperCase();
     }
-}
+});
 onMounted(() => stateStore.setMounted());
 const refresh = () => window.location.reload();
 </script>
@@ -62,7 +62,7 @@ const refresh = () => window.location.reload();
                 </QBtn>
             </RouterLink>
             <QChip class="q-ml-xs q-mr-xs envChip">
-                {{ getEnvironment() }}
+                {{ getEnvironment }}
             </QChip>
             <VnBreadcrumbs v-if="$q.screen.gt.sm" />
             <QSpinner

From 517dc49cefc8604ebbb111c72e3d398aa4761f38 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 21 Mar 2025 15:41:40 +0100
Subject: [PATCH 13/28] fix: refs #8388 update translation for invoice summary
 mismatch message

---
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 5 ++++-
 src/pages/InvoiceIn/locale/en.yml             | 1 -
 src/pages/InvoiceIn/locale/es.yml             | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index f6beecd3d..5af6a94f7 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -305,7 +305,10 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                                 :color="amountsNotMatch ? 'negative' : 'transparent'"
                                 :title="
                                     amountsNotMatch
-                                        ? t('invoiceIn.summary.noMatch')
+                                        ? t('invoiceIn.noMatch', {
+                                              totalTaxableBase:
+                                                  entity.totals.totalTaxableBase,
+                                          })
                                         : t('invoiceIn.summary.dueTotal')
                                 "
                             >
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index 085f351b2..2f9435b00 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -57,7 +57,6 @@ invoiceIn:
         bank: Bank
         foreignValue: Foreign value
         dueTotal: Due day
-        noMatch: Do not match
         code: Code
         net: Net
         stems: Stems
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index 516da1149..9144d6ab1 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -60,7 +60,6 @@ invoiceIn:
         net: Neto
         stems: Tallos
         country: País
-        noMatch: No cuadra
     params:
         search: Id o nombre proveedor
         correctedFk: Rectificada

From 028477ecbeb760559f8999aa9f77bdab6f52d01c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 24 Mar 2025 11:12:15 +0100
Subject: [PATCH 14/28] feat: refs #8388 add hasFile prop to VnDms component

---
 src/components/common/VnDms.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnDms.vue b/src/components/common/VnDms.vue
index e667e1558..8f5cc73c4 100644
--- a/src/components/common/VnDms.vue
+++ b/src/components/common/VnDms.vue
@@ -35,6 +35,10 @@ const $props = defineProps({
         type: String,
         default: null,
     },
+    hasFile: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const warehouses = ref();
@@ -49,7 +53,7 @@ onMounted(() => {
     if (!$props.formInitialData) {
         dms.value.description =
             $props.description ?? t($props.model + 'Description', dms.value);
-        dms.value.hasFile = false;
+        dms.value.hasFile = $props.hasFile;
     }
 });
 function onFileChange(files) {

From 2fabff05be50ab957997e7cd371dc4a5e1e9efb3 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 24 Mar 2025 11:15:59 +0100
Subject: [PATCH 15/28] feat: refs #8388 add hasFile property handling in VnDms
 component

---
 src/components/common/VnDms.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnDms.vue b/src/components/common/VnDms.vue
index 8f5cc73c4..de22e4857 100644
--- a/src/components/common/VnDms.vue
+++ b/src/components/common/VnDms.vue
@@ -50,11 +50,9 @@ const dms = ref({});
 
 onMounted(() => {
     defaultData();
-    if (!$props.formInitialData) {
+    if (!$props.formInitialData)
         dms.value.description =
             $props.description ?? t($props.model + 'Description', dms.value);
-        dms.value.hasFile = $props.hasFile;
-    }
 });
 function onFileChange(files) {
     dms.value.hasFileAttached = !!files;
@@ -96,6 +94,7 @@ function defaultData() {
     if ($props.formInitialData) return (dms.value = $props.formInitialData);
     return addDefaultData({
         reference: route.params.id,
+        hasFile: $props.hasFile,
     });
 }
 

From 43701bd58607b6cfb415fcd570b4816b73a60feb Mon Sep 17 00:00:00 2001
From: benjaminedc <benjaminedc@verdnatura.es>
Date: Mon, 24 Mar 2025 12:24:49 +0100
Subject: [PATCH 16/28] refactor: refs #8118 simplify dropdown change event
 handling in ClaimSummary and TicketSummary components

---
 src/pages/Claim/Card/ClaimSummary.vue   | 5 ++---
 src/pages/Ticket/Card/TicketSummary.vue | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 85f37f440..67d57004f 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate, toCurrency } from 'src/filters';
@@ -212,8 +212,7 @@ function claimUrl(section) {
             <VnDropdown
                 :options="claimStates"
                 option-label="description"
-                option-value="id"
-                @change-state="changeState($event)"
+                @change-state="changeState"
             />
         </template>
         <template #menu="{ entity }">
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index d79c5a9ac..f865abfc4 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -116,9 +116,8 @@ onMounted(async () => {
             <VnDropdown
                 :disable="!isEditable()"
                 :options="editableStates"
-                :option-label="'name'"
-                :option-value="'code'"
-                @change-state="changeState($event)"
+                option-value="code"
+                @change-state="changeState"
             />
         </template>
         <template #menu="{ entity }">

From 65d21c9fe5f6000c9084e449f1a2280e588a4cda Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 24 Mar 2025 16:15:17 +0100
Subject: [PATCH 17/28] test: refs #8388 update invoice creation test to
 include spinner wait and company field validation

---
 .../integration/invoiceIn/invoiceInList.spec.js        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInList.spec.js b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
index 44a61609e..3338684d6 100644
--- a/test/cypress/integration/invoiceIn/invoiceInList.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
@@ -36,17 +36,17 @@ describe('InvoiceInList', () => {
         cy.get(summaryHeaders).eq(4).contains('Vat');
     });
 
-    it('should create a new Invoice', () => {
+    it.only('should create a new Invoice', () => {
         cy.dataCy('vnTableCreateBtn').click();
         cy.fillInForm({ ...mock }, { attr: 'data-cy' });
         cy.dataCy('FormModelPopup_save').click();
         cy.intercept('GET', /\/api\/InvoiceIns\/\d+\/getTotals$/).as('invoice');
-        cy.wait('@invoice').then(() =>
+        cy.wait('@invoice').then(() => {
             cy.validateDescriptor({
                 title: mockInvoiceRef,
                 listBox: { 0: '11/16/2001', 3: 'The farmer' },
-            }),
-        );
-        cy.get('[data-cy="vnLvCompany"]').should('contain.text', 'ORN');
+            });
+            cy.dataCy('invoiceInBasicDataCompanyFk').should('have.value', 'ORN');
+        });
     });
 });

From 0361958b47c47ef94819d0fec2ca67b99a5cc103 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 25 Mar 2025 09:37:46 +0100
Subject: [PATCH 18/28] test: refs #8388 remove exclusive focus from Invoice
 creation test

---
 test/cypress/integration/invoiceIn/invoiceInList.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInList.spec.js b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
index 3338684d6..d0d87d9f0 100644
--- a/test/cypress/integration/invoiceIn/invoiceInList.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
@@ -36,7 +36,7 @@ describe('InvoiceInList', () => {
         cy.get(summaryHeaders).eq(4).contains('Vat');
     });
 
-    it.only('should create a new Invoice', () => {
+    it('should create a new Invoice', () => {
         cy.dataCy('vnTableCreateBtn').click();
         cy.fillInForm({ ...mock }, { attr: 'data-cy' });
         cy.dataCy('FormModelPopup_save').click();

From 90f6486fc1495cdd347a79d1971c1e94513ce9fd Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 25 Mar 2025 14:20:38 +0100
Subject: [PATCH 19/28] refactor: refs #7358 use QBadge instead of QChip

---
 src/components/NavBar.vue | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 6365fcd07..c71a0a887 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -25,9 +25,9 @@ const getEnvironment = computed(() => {
         case 'development':
             return 'DEV';
         case 'production':
-            return;
+            return null;
         default:
-            return env.toUpperCase();
+            return env;
     }
 });
 onMounted(() => stateStore.setMounted());
@@ -60,10 +60,10 @@ const refresh = () => window.location.reload();
                         {{ t('globals.backToDashboard') }}
                     </QTooltip>
                 </QBtn>
+                <QBadge v-if="getEnvironment" color="primary" align="top">
+                    {{ getEnvironment }}
+                </QBadge>
             </RouterLink>
-            <QChip class="q-ml-xs q-mr-xs envChip">
-                {{ getEnvironment }}
-            </QChip>
             <VnBreadcrumbs v-if="$q.screen.gt.sm" />
             <QSpinner
                 color="primary"
@@ -132,7 +132,4 @@ const refresh = () => window.location.reload();
 .q-header {
     background-color: var(--vn-section-color);
 }
-.envChip {
-    background-color: $primary;
-}
 </style>

From ef3a2c0ee99b5f23f7ad2ef737c4f96174730888 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 25 Mar 2025 15:10:57 +0100
Subject: [PATCH 20/28] refactor: refs #7358 use location.hostname

---
 src/components/NavBar.vue | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index c71a0a887..7329ddae2 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -18,18 +18,15 @@ const state = useState();
 const user = state.getUser();
 const appName = 'Lilium';
 const pinnedModulesRef = ref();
-const env = process.env.NODE_ENV;
+const hostname = window.location.hostname;
+const env = ref();
 
 const getEnvironment = computed(() => {
-    switch (env) {
-        case 'development':
-            return 'DEV';
-        case 'production':
-            return null;
-        default:
-            return env;
-    }
+    env.value = hostname.split('-');
+    if (env.value.length <= 1) return;
+    return env.value[0];
 });
+
 onMounted(() => stateStore.setMounted());
 const refresh = () => window.location.reload();
 </script>

From 73c6b7dea9ee720d44411424be758ec95c42012b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 25 Mar 2025 17:34:10 +0100
Subject: [PATCH 21/28] fix: refs #8388 update tooltip message in
 InvoiceInSummary to include total taxable base

---
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index dad1da8d6..74936f00a 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -304,7 +304,10 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                                     :color="amountsNotMatch ? 'negative' : 'transparent'"
                                     :title="
                                         amountsNotMatch
-                                            ? t('invoiceIn.summary.noMatch')
+                                            ? t('invoiceIn.noMatch', {
+                                                  totalTaxableBase:
+                                                      entity.totals.totalTaxableBase,
+                                              })
                                             : t('invoiceIn.summary.dueTotal')
                                     "
                                 >

From 02e29c167a38a4ef1c391d25f378f238fdf36285 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 26 Mar 2025 07:46:39 +0100
Subject: [PATCH 22/28] feat: add rounded CC field to travel summary and
 translations

---
 src/i18n/locale/en.yml                  |  1 +
 src/i18n/locale/es.yml                  |  1 +
 src/pages/Travel/Card/TravelSummary.vue | 25 +++++++++++++++++++++----
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index d0911d41d..09431dce0 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -841,6 +841,7 @@ travel:
         availabledHour: Availabled hour
         thermographs: Thermographs
         hb: HB
+        roundedCc: Rounded CC
     basicData:
         daysInForward: Automatic movement (Raid)
         isRaid: Raid
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index ac441d28d..10ff812df 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -924,6 +924,7 @@ travel:
         availabled: F. Disponible
         availabledHour: Hora Disponible
         hb: HB
+        roundedCc: CC redondeado
     basicData:
         daysInForward: Desplazamiento automatico (redada)
         isRaid: Redada
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 9f9552611..5a824ddc3 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -91,6 +91,13 @@ const entriesTableColumns = computed(() => {
             showValue: true,
         },
         { label: 'CC', field: 'cc', name: 'cc', align: 'left', showValue: true },
+        {
+            label: t('travel.summary.roundedCc'),
+            field: 'cc',
+            name: 'roundedCc',
+            align: 'left',
+            showValue: true,
+        },
         {
             label: 'Pallet',
             field: 'pallet',
@@ -193,13 +200,18 @@ const entriesTotals = computed(() => {
         freightValue: 0,
         packageValue: 0,
         cc: 0,
+        roundedCc: 0,
         pallet: 0,
         m3: 0,
     };
 
     entriesTableRows.value.forEach((row) => {
         for (const key in totals) {
-            totals[key] += row[key] || 0;
+            if (key === 'roundedCc') {
+                totals['roundedCc'] += Math.ceil(row['cc'] || 0);
+            } else {
+                totals[key] += row[key] || 0;
+            }
         }
     });
 
@@ -208,6 +220,7 @@ const entriesTotals = computed(() => {
         freight: toCurrency(totals.freightValue),
         packageValue: toCurrency(totals.packageValue),
         cc: totals.cc.toFixed(2),
+        roundedCc: totals.roundedCc,
         pallet: totals.pallet.toFixed(2),
         m3: totals.m3.toFixed(2),
     };
@@ -337,9 +350,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 <VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
                 <VnLv
                     :label="t('travel.summary.availabled')"
-                    :value="
-                        dashIfEmpty(toDateTimeFormat(travel.availabled))
-                    "
+                    :value="dashIfEmpty(toDateTimeFormat(travel.availabled))"
                 />
             </QCard>
             <QCard class="full-width">
@@ -376,6 +387,11 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                             </QBtn>
                         </QTd>
                     </template>
+                    <template #body-cell-roundedCc="{ col, value }">
+                        <QTd>
+                            {{ Math.ceil(value) || 0 }}
+                        </QTd>
+                    </template>
                     <template #body-cell-observation="{ value }">
                         <QTd>
                             <QIcon name="insert_drive_file" color="primary" size="24px">
@@ -392,6 +408,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                         <QTd class="text-bold">{{ entriesTotals.freight }}</QTd>
                         <QTd class="text-bold">{{ entriesTotals.packageValue }}</QTd>
                         <QTd class="text-bold">{{ entriesTotals.cc }}</QTd>
+                        <QTd class="text-bold">{{ entriesTotals.roundedCc }}</QTd>
                         <QTd class="text-bold">{{ entriesTotals.pallet }}</QTd>
                         <QTd class="text-bold">{{ entriesTotals.m3 }}</QTd>
                     </template>

From 42d613429fcbba851a7a4d31ded907d4b0e126f7 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 26 Mar 2025 09:55:26 +0100
Subject: [PATCH 23/28] test: mark specific tests as skipped for tasks 8814 and
 8779

---
 test/cypress/integration/route/routeExtendedList.spec.js | 3 ++-
 test/cypress/integration/ticket/ticketList.spec.js       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/route/routeExtendedList.spec.js b/test/cypress/integration/route/routeExtendedList.spec.js
index fb2885f35..2d59b5514 100644
--- a/test/cypress/integration/route/routeExtendedList.spec.js
+++ b/test/cypress/integration/route/routeExtendedList.spec.js
@@ -146,7 +146,8 @@ describe('Route extended list', () => {
         cy.readFile(`${downloadsFolder}/${fileName}`).should('exist');
     });
 
-    it('Should mark as served the selected route', () => {
+    // task https://redmine.verdnatura.es/issues/8814
+    xit('Should mark as served the selected route', () => {
         cy.get(selectors.lastRowSelectCheckBox).click();
         cy.get(selectors.markServedBtn).click();
 
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 5613a5854..85356ed15 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -35,7 +35,8 @@ describe('TicketList', () => {
         cy.get('.summaryBody').should('exist');
     });
 
-    it('filter client and create ticket', () => {
+    // task https://redmine.verdnatura.es/issues/8779
+    xit('filter client and create ticket', () => {
         cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketSearchbar');
         searchResults();
         cy.wait('@ticketSearchbar');

From 1a1b39960694139e855a03ec8f068cc3a9365297 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 26 Mar 2025 09:57:40 +0100
Subject: [PATCH 24/28] fix: move warning badge condition to the correct
 position in getBadgeAttrs function

---
 src/pages/Entry/EntryList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 5ebad3144..556f89b0e 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -249,7 +249,6 @@ function getBadgeAttrs(row) {
     let timeDiff = today - timeTicket;
 
     if (timeDiff > 0) return { color: 'info', 'text-color': 'black' };
-    if (timeDiff < 0) return { color: 'warning', 'text-color': 'black' };
     switch (row.entryTypeCode) {
         case 'regularization':
         case 'life':
@@ -274,6 +273,7 @@ function getBadgeAttrs(row) {
         default:
             break;
     }
+    if (timeDiff < 0) return { color: 'warning', 'text-color': 'black' };
     return { color: 'transparent' };
 }
 

From ef2ce0500e7e81bb15d254f2f06baa856438a280 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 26 Mar 2025 12:05:32 +0100
Subject: [PATCH 25/28] test: mark route cloning test as skipped for task 8814

---
 test/cypress/integration/route/routeExtendedList.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/route/routeExtendedList.spec.js b/test/cypress/integration/route/routeExtendedList.spec.js
index 2d59b5514..fee8369e3 100644
--- a/test/cypress/integration/route/routeExtendedList.spec.js
+++ b/test/cypress/integration/route/routeExtendedList.spec.js
@@ -118,8 +118,8 @@ describe('Route extended list', () => {
             cy.validateContent(selector, value);
         });
     });
-
-    it('Should clone selected route and add ticket', () => {
+    // task https://redmine.verdnatura.es/issues/8814
+    xit('Should clone selected route and add ticket', () => {
         cy.get(selectors.firstRowSelectCheckBox).click();
         cy.get(selectors.cloneBtn).click();
         cy.dataCy('Starting date_inputDate').type('01-01-2001');

From dcc45cf3d4a4b173ea18a9b7ddab3a6cb17e4e95 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 26 Mar 2025 12:38:53 +0100
Subject: [PATCH 26/28] test: skip TicketList test suite

---
 test/cypress/integration/ticket/ticketList.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 85356ed15..fb6a1a641 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('TicketList', () => {
+describe.skip('TicketList', () => {
     const firstRow = 'tbody.q-virtual-scroll__content tr:nth-child(1)';
 
     beforeEach(() => {

From 522e900e550835310b3f853551671138c188b74c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 26 Mar 2025 13:23:56 +0100
Subject: [PATCH 27/28] test: enable previously skipped tests in route and
 ticket list

---
 test/cypress/integration/route/routeExtendedList.spec.js | 7 +++----
 test/cypress/integration/ticket/ticketList.spec.js       | 5 ++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/test/cypress/integration/route/routeExtendedList.spec.js b/test/cypress/integration/route/routeExtendedList.spec.js
index fee8369e3..fb2885f35 100644
--- a/test/cypress/integration/route/routeExtendedList.spec.js
+++ b/test/cypress/integration/route/routeExtendedList.spec.js
@@ -118,8 +118,8 @@ describe('Route extended list', () => {
             cy.validateContent(selector, value);
         });
     });
-    // task https://redmine.verdnatura.es/issues/8814
-    xit('Should clone selected route and add ticket', () => {
+
+    it('Should clone selected route and add ticket', () => {
         cy.get(selectors.firstRowSelectCheckBox).click();
         cy.get(selectors.cloneBtn).click();
         cy.dataCy('Starting date_inputDate').type('01-01-2001');
@@ -146,8 +146,7 @@ describe('Route extended list', () => {
         cy.readFile(`${downloadsFolder}/${fileName}`).should('exist');
     });
 
-    // task https://redmine.verdnatura.es/issues/8814
-    xit('Should mark as served the selected route', () => {
+    it('Should mark as served the selected route', () => {
         cy.get(selectors.lastRowSelectCheckBox).click();
         cy.get(selectors.markServedBtn).click();
 
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index fb6a1a641..5613a5854 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe.skip('TicketList', () => {
+describe('TicketList', () => {
     const firstRow = 'tbody.q-virtual-scroll__content tr:nth-child(1)';
 
     beforeEach(() => {
@@ -35,8 +35,7 @@ describe.skip('TicketList', () => {
         cy.get('.summaryBody').should('exist');
     });
 
-    // task https://redmine.verdnatura.es/issues/8779
-    xit('filter client and create ticket', () => {
+    it('filter client and create ticket', () => {
         cy.intercept('GET', /\/api\/Tickets\/filter/).as('ticketSearchbar');
         searchResults();
         cy.wait('@ticketSearchbar');

From bca84c54afe4dc3e0668da211dbee00d0cc978dd Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 26 Mar 2025 14:19:09 +0100
Subject: [PATCH 28/28] fix: update filter in EntryCard to include route
 parameter

---
 src/pages/Entry/Card/EntryCard.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index 50f8b8e55..e9d07889f 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -8,6 +8,6 @@ import filter from './EntryFilter.js';
         data-key="Entry"
         url="Entries"
         :descriptor="EntryDescriptor"
-        :filter="filter"
+        :filter="{ ...filter, where: { id: $route.params.id } }"
     />
 </template>