From 21958cfdb43cbf941d8e2d723cfcf0ae8632467f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 15 Jan 2025 16:10:33 +0100
Subject: [PATCH 1/4] fix: catch mail err

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 27 +++++++++++----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 65fbf4b43..919331e2d 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -283,21 +283,22 @@ const fetchWeekData = async () => {
         year: selectedDateYear.value,
         week: selectedWeekNumber.value,
     };
-    const mail = (
-        await axiosNoError.get(`Workers/${route.params.id}/mail`, {
-            params: { filter: { where } },
-        })
-    ).data[0];
+    try {
+        const [{ data: mailData }, { data: countData }] = await Promise.all([
+            axiosNoError.get(`Workers/${route.params.id}/mail`, {
+                params: { filter: { where } },
+            }),
+            axiosNoError.get('WorkerTimeControlMails/count', { params: { where } }),
+        ]);
 
-    if (!mail) state.value = null;
-    else {
-        state.value = mail.state;
-        reason.value = mail.reason;
+        const mail = mailData[0];
+
+        state.value = mail?.state;
+        reason.value = mail?.reason;
+        canResend.value = !!countData.count;
+    } catch {
+        state.value = null;
     }
-
-    canResend.value = !!(
-        await axiosNoError.get('WorkerTimeControlMails/count', { params: { where } })
-    ).data.count;
 };
 
 const setHours = (data) => {

From e335322d5ffb94248db66f0b64ac7801839238d1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 16 Jan 2025 09:45:15 +0100
Subject: [PATCH 2/4] fix: refs #7936 allow negative values

---
 src/pages/Customer/Card/CustomerGreuges.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index dcf297d12..47a589aaa 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -84,6 +84,7 @@ const columns = computed(() => [
             component: 'number',
             autofocus: true,
             required: true,
+            positive: false,
         },
         format: ({ amount }) => toCurrency(amount),
         create: true,

From 6c2fbea6d59cf61e0f8ff9c4fd6259143a4ec682 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 16 Jan 2025 11:59:08 +0100
Subject: [PATCH 3/4] fix: refs #8407 close date and time popups on keydown

---
 src/components/common/VnInputDate.vue | 1 +
 src/components/common/VnInputTime.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index fdef6a9a8..db8e25195 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -107,6 +107,7 @@ const manageDate = (date) => {
             :rules="mixinRules"
             :clearable="false"
             @click="isPopupOpen = !isPopupOpen"
+            @keydown="isPopupOpen = false"
             hide-bottom-space
         >
             <template #append>
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index b4b246618..cb1f723ba 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -81,6 +81,7 @@ function dateToTime(newDate) {
             style="min-width: 100px"
             :rules="mixinRules"
             @click="isPopupOpen = !isPopupOpen"
+            @keydown="isPopupOpen = false"
             type="time"
             hide-bottom-space
         >

From 3ab3f146d47b66b04cf882ec43c3f6313c8322a9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 16 Jan 2025 12:45:24 +0100
Subject: [PATCH 4/4] feat: add acl in description button

---
 src/pages/Ticket/Card/TicketService.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 950e6e8be..18dcaea7e 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -166,6 +166,7 @@ async function handleSave() {
                             v-model="row.ticketServiceTypeFk"
                             :options="ticketServiceOptions"
                             option-label="name"
+                            :roles-allowed-to-create="['administrative']"
                             option-value="id"
                             hide-selected
                         >