From a131cb559dbbc8f012f650bd6cbdd0130042a6d4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 21 Aug 2024 13:34:40 +0200
Subject: [PATCH 01/16] feat: add max rule

---
 src/components/common/VnInput.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 75d4b8a28..e79a235d5 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -67,9 +67,13 @@ const mixinRules = [
     requiredFieldRule,
     ...($attrs.rules ?? []),
     (val) => {
-        const { min } = vnInputRef.value.$attrs;
+        const { min, max } = vnInputRef.value.$attrs;
         if (!min) return null;
         if (min >= 0) if (Math.floor(val) < min) return t('inputMin', { value: min });
+        if (!max) return null;
+        if (max > 0) {
+            if (Math.floor(val) > max) return t('inputMax', { value: max });
+        }
     },
 ];
 </script>
@@ -116,6 +120,8 @@ const mixinRules = [
 <i18n>
     en:
         inputMin: Must be more than {value}
+        inputMax: Must be less than {value}
     es:
         inputMin: Debe ser mayor a {value}
+        inputMax: Debe ser menor a {value}
 </i18n>

From 2b012d2de4ce72f253b9d8d7e2a99f4ceb03f34f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Sep 2024 10:04:40 +0200
Subject: [PATCH 02/16] fix: refs #7353 use same datakey

---
 src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue b/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue
index 4950ab381..f1c347588 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketSearchbar.vue
@@ -3,7 +3,7 @@ import VnSearchbar from 'components/ui/VnSearchbar.vue';
 </script>
 <template>
     <VnSearchbar
-        data-key="SalesMonitorTickets"
+        data-key="saleMonitorTickets"
         url="SalesMonitors/salesFilter"
         :redirect="false"
         :label="$t('searchBar.label')"

From b559f2f18c4a0fd370ac85e3f2e7254de8c9f8b4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Sep 2024 10:18:11 +0200
Subject: [PATCH 03/16] refactor: refs #7353 use global locales

---
 src/i18n/locale/en.yml                        |  9 +++++++
 src/i18n/locale/es.yml                        |  9 +++++++
 .../Monitor/Ticket/MonitorTicketFilter.vue    | 24 ++++---------------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 362c1ec9f..02f04c994 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -278,6 +278,15 @@ globals:
     createInvoiceIn: Create invoice in
     myAccount: My account
     noOne: No one
+    params:
+        search: General search
+        clientFk: Client id
+        salesPersonFk: Sales person
+        warehouseFk: Warehouse
+        provinceFk: Province
+        from: From
+        To: To
+        stateFk: State
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 34383686c..caa6b6788 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -282,6 +282,15 @@ globals:
     createInvoiceIn: Crear factura recibida
     myAccount: Mi cuenta
     noOne: Nadie
+    params:
+        search: Búsqueda general
+        clientFk: Id cliente
+        salesPersonFk: Comercial
+        warehouseFk: Almacén
+        provinceFk: Provincia
+        from: Desde
+        To: Hasta
+        stateFk: Estado
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 167a10465..17e26618d 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -64,7 +64,7 @@ const handleScopeDays = (params, days, callback) => {
             <QItem>
                 <QItemSection>
                     <VnInput
-                        :label="t('params.clientFk')"
+                        :label="t('globals.params.clientFk')"
                         v-model="params.clientFk"
                         is-outlined
                     />
@@ -105,7 +105,7 @@ const handleScopeDays = (params, days, callback) => {
                         outlined
                         dense
                         rounded
-                        :label="t('params.salesPersonFk')"
+                        :label="t('globals.params.salesPersonFk')"
                         v-model="params.salesPersonFk"
                         url="Workers/search"
                         :params="{ departmentCodes: ['VT'] }"
@@ -158,7 +158,7 @@ const handleScopeDays = (params, days, callback) => {
                         outlined
                         dense
                         rounded
-                        :label="t('params.stateFk')"
+                        :label="t('globals.params.stateFk')"
                         v-model="params.stateFk"
                         url="States"
                         is-outlined
@@ -184,7 +184,7 @@ const handleScopeDays = (params, days, callback) => {
                         outlined
                         dense
                         rounded
-                        :label="t('params.warehouseFk')"
+                        :label="t('globals.params.warehouseFk')"
                         v-model="params.warehouseFk"
                         :options="warehouses"
                     />
@@ -196,7 +196,7 @@ const handleScopeDays = (params, days, callback) => {
                         outlined
                         dense
                         rounded
-                        :label="t('params.provinceFk')"
+                        :label="t('globals.params.provinceFk')"
                         v-model="params.provinceFk"
                         url="Provinces"
                     />
@@ -235,22 +235,15 @@ const handleScopeDays = (params, days, callback) => {
 <i18n>
 en:
     params:
-        clientFk: Client id
         orderFk: Order id
         scopeDays: Days onward
         nickname: Nickname
-        salesPersonFk: Sales person
         refFk: Invoice
         agencyModeFk: Agency
-        stateFk: State
         groupedStates: Grouped State
-        warehouseFk: Warehouse
-        provinceFk: Province
         myTeam: My team
         problems: With problems
         pending: Pending
-        from: From
-        to: To
         alertLevel: Grouped State
     FREE: Free
     DELIVERED: Delivered
@@ -261,22 +254,15 @@ en:
     
 es:
     params:
-        clientFk: Id cliente
         orderFk: Id cesta
         scopeDays: Días en adelante
         nickname: Nombre mostrado
-        salesPersonFk: Comercial
         refFk: Factura
         agencyModeFk: Agencia
-        stateFk: Estado
         groupedStates: Estado agrupado
-        warehouseFk: Almacén
-        provinceFk: Provincia
         myTeam: Mi equipo
         problems: Con problemas
         pending: Pendiente
-        from: Desde
-        To: Hasta
         alertLevel: Estado agrupado
     FREE: Libre
     DELIVERED: Servido

From 9219fa07f57b4a317de6dd59bc9d037c744c1021 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 11 Sep 2024 11:23:14 +0200
Subject: [PATCH 04/16] fix: refs #7353 hide search param

---
 src/i18n/locale/en.yml                           | 1 -
 src/i18n/locale/es.yml                           | 1 -
 src/pages/Monitor/Ticket/MonitorTicketFilter.vue | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 02f04c994..19372f698 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -279,7 +279,6 @@ globals:
     myAccount: My account
     noOne: No one
     params:
-        search: General search
         clientFk: Client id
         salesPersonFk: Sales person
         warehouseFk: Warehouse
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index caa6b6788..60e61d51c 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -283,7 +283,6 @@ globals:
     myAccount: Mi cuenta
     noOne: Nadie
     params:
-        search: Búsqueda general
         clientFk: Id cliente
         salesPersonFk: Comercial
         warehouseFk: Almacén
diff --git a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
index 17e26618d..3c95f5cdd 100644
--- a/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
+++ b/src/pages/Monitor/Ticket/MonitorTicketFilter.vue
@@ -40,7 +40,7 @@ const handleScopeDays = (params, days, callback) => {
     <VnFilterPanel
         :data-key="dataKey"
         :search-button="true"
-        :hidden-tags="['from', 'to']"
+        :hidden-tags="['from', 'to', 'search']"
         :custom-tags="['scopeDays']"
         :unremovable-params="['from', 'to', 'scopeDays']"
     >

From 6b79d70551f4bdc981c20816d1b014f6d4162fa7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 12 Sep 2024 09:14:55 +0200
Subject: [PATCH 05/16] refactor: refs #7828 wip

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 50 +++++++++------------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index abf60a078..2f66fbcc1 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -271,44 +271,38 @@ const fetchWorkerTimeControlMails = async (filter) => {
 
 const fetchWeekData = async () => {
     try {
-        const filter = {
-            where: {
-                workerFk: route.params.id,
-                year: selectedDate.value ? selectedDate.value?.getFullYear() : null,
-                week: selectedWeekNumber.value,
-            },
-        };
-
-        const data = await fetchWorkerTimeControlMails(filter);
-        if (!data.length) {
-            state.value = null;
-        } else {
+        const data = (
+            await axios.get(`WorkerTimeControlMails/${route.params.id}/getWeeklyMail`, {
+                params: {
+                    workerFk: route.params.id,
+                    year: selectedDate.value.getFullYear(),
+                    week: selectedWeekNumber.value,
+                },
+            })
+        ).data;
+        if (!data.length) state.value = null;
+        else {
             const [mail] = data;
             state.value = mail.state;
             reason.value = mail.reason;
         }
 
-        await canBeResend();
+        canResend.value = !!(
+            await axios.get('WorkerTimeControlMails/count', {
+                filter: {
+                    where: {
+                        year: selectedDate.value.getFullYear(),
+                        week: selectedWeekNumber.value,
+                        limit: 1,
+                    },
+                },
+            })
+        ).data.count;
     } catch (err) {
         console.error('Error fetching week data');
     }
 };
 
-const canBeResend = async () => {
-    canResend.value = false;
-
-    const filter = {
-        where: {
-            year: selectedDate.value.getFullYear(),
-            week: selectedWeekNumber.value,
-        },
-        limit: 1,
-    };
-
-    const data = await fetchWorkerTimeControlMails(filter);
-    if (data.length) canResend.value = true;
-};
-
 const setHours = (data) => {
     for (const weekDay of weekDays.value) {
         if (data) {

From 44fd356d63ee78589a3902ba1891ec41dd5d39ad Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 12 Sep 2024 13:19:31 +0200
Subject: [PATCH 06/16] feat: refs #7828 useAcl & cherry pick mail data worker

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 63 +++++++--------------
 1 file changed, 22 insertions(+), 41 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 2f66fbcc1..3893305a5 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -12,7 +12,6 @@ import WorkerTimeControlCalendar from 'pages/Worker/Card/WorkerTimeControlCalend
 
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
-import { useRole } from 'src/composables/useRole';
 import { useAcl } from 'src/composables/useAcl';
 import { useWeekdayStore } from 'src/stores/useWeekdayStore';
 import { useStateStore } from 'stores/useStateStore';
@@ -63,13 +62,16 @@ const selectedCalendarDates = ref([]);
 const selectedDateFormatted = ref(toDateString(defaultDate.value));
 
 const arrayData = useArrayData('workerData');
-
+const acl = useAcl();
 const worker = computed(() => arrayData.store?.data);
-
-const isHr = computed(() => useRole().hasAny(['hr']));
-
-const canSend = computed(() => useAcl().hasAny('WorkerTimeControl', 'sendMail', 'WRITE'));
-
+const canSend = computed(() =>
+    acl.hasAny([{ model: 'WorkerTimeControl', props: 'sendMail', accessType: 'WRITE' }])
+);
+const canUpdate = computed(() =>
+    acl.hasAny([
+        { model: 'WorkerTimeControl', props: 'updateMailState', accessType: 'WRITE' },
+    ])
+);
 const isHimself = computed(() => user.value.id === Number(route.params.id));
 
 const columns = computed(() => {
@@ -257,46 +259,25 @@ const fetchHours = async () => {
     }
 };
 
-const fetchWorkerTimeControlMails = async (filter) => {
-    try {
-        const { data } = await axios.get('WorkerTimeControlMails', {
-            params: { filter: JSON.stringify(filter) },
-        });
-
-        return data;
-    } catch (err) {
-        console.error('Error fetching worker time control mails');
-    }
-};
-
 const fetchWeekData = async () => {
+    const where = {
+        year: selectedDate.value.getFullYear(),
+        week: selectedWeekNumber.value,
+    };
     try {
-        const data = (
-            await axios.get(`WorkerTimeControlMails/${route.params.id}/getWeeklyMail`, {
-                params: {
-                    workerFk: route.params.id,
-                    year: selectedDate.value.getFullYear(),
-                    week: selectedWeekNumber.value,
-                },
+        const mail = (
+            await axios.get(`Workers/${route.params.id}/mail`, {
+                params: { filter: { where } },
             })
-        ).data;
-        if (!data.length) state.value = null;
+        ).data[0];
+        if (!mail) state.value = null;
         else {
-            const [mail] = data;
             state.value = mail.state;
             reason.value = mail.reason;
         }
 
         canResend.value = !!(
-            await axios.get('WorkerTimeControlMails/count', {
-                filter: {
-                    where: {
-                        year: selectedDate.value.getFullYear(),
-                        week: selectedWeekNumber.value,
-                        limit: 1,
-                    },
-                },
-            })
+            await axios.get('WorkerTimeControlMails/count', { params: { where } })
         ).data.count;
     } catch (err) {
         console.error('Error fetching week data');
@@ -443,7 +424,7 @@ onMounted(async () => {
         <div>
             <QBtnGroup push class="q-gutter-x-sm" flat>
                 <QBtn
-                    v-if="isHimself && state"
+                    v-if="canUpdate && state"
                     :label="t('Satisfied')"
                     color="primary"
                     type="submit"
@@ -451,7 +432,7 @@ onMounted(async () => {
                     @click="isSatisfied()"
                 />
                 <QBtn
-                    v-if="isHimself && state"
+                    v-if="canUpdate && state"
                     :label="t('Not satisfied')"
                     color="primary"
                     type="submit"
@@ -462,7 +443,7 @@ onMounted(async () => {
             </QBtnGroup>
             <QBtnGroup push class="q-gutter-x-sm q-ml-none" flat>
                 <QBtn
-                    v-if="reason && state && (isHimself || isHr)"
+                    v-if="reason && state && canUpdate"
                     :label="t('Reason')"
                     color="primary"
                     type="submit"

From 58be11df046f33259a794effec4bc84b9e0728b0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 13 Sep 2024 10:13:03 +0200
Subject: [PATCH 07/16] chore: refs #7828 fix e2e

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

diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index 516b0f13d..8192b7c7c 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -5,7 +5,7 @@ describe('Ticket descriptor', () => {
     const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
     const summaryHeader = '.summaryHeader > div';
     const weight = 25;
-    const weightValue = ':nth-child(10) > .value > span';
+    const weightValue = '.summaryBody.row :nth-child(1) > :nth-child(9) > .value > span';
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);

From 48a5c15b9d8a466676c4b069a0e67b41f4b5c14c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 13 Sep 2024 10:54:09 +0200
Subject: [PATCH 08/16] feat: refs #7828 create axios instance which no manage
 errors

---
 src/boot/axios.js                           | 8 ++++++--
 src/pages/Worker/Card/WorkerTimeControl.vue | 6 ++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/boot/axios.js b/src/boot/axios.js
index 9b32275bd..99a163cca 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -5,8 +5,10 @@ import useNotify from 'src/composables/useNotify.js';
 
 const session = useSession();
 const { notify } = useNotify();
+const baseUrl = '/api/';
 
-axios.defaults.baseURL = '/api/';
+axios.defaults.baseURL = baseUrl;
+const axiosNoError = axios.create({ baseURL: baseUrl });
 
 const onRequest = (config) => {
     const token = session.getToken();
@@ -79,5 +81,7 @@ const onResponseError = (error) => {
 
 axios.interceptors.request.use(onRequest, onRequestError);
 axios.interceptors.response.use(onResponse, onResponseError);
+axiosNoError.interceptors.request.use(onRequest);
+axiosNoError.interceptors.response.use(onResponse);
 
-export { onRequest, onResponseError };
+export { onRequest, onResponseError, axiosNoError };
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 3893305a5..9ae91f8ce 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -2,6 +2,7 @@
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { onMounted, ref, computed, onBeforeMount, nextTick, reactive } from 'vue';
+import { axiosNoError } from 'src/boot/axios';
 
 import FetchData from 'components/FetchData.vue';
 import WorkerTimeHourChip from 'pages/Worker/Card/WorkerTimeHourChip.vue';
@@ -266,10 +267,11 @@ const fetchWeekData = async () => {
     };
     try {
         const mail = (
-            await axios.get(`Workers/${route.params.id}/mail`, {
+            await axiosNoError.get(`Workers/${route.params.id}/mail`, {
                 params: { filter: { where } },
             })
         ).data[0];
+
         if (!mail) state.value = null;
         else {
             state.value = mail.state;
@@ -277,7 +279,7 @@ const fetchWeekData = async () => {
         }
 
         canResend.value = !!(
-            await axios.get('WorkerTimeControlMails/count', { params: { where } })
+            await axiosNoError.get('WorkerTimeControlMails/count', { params: { where } })
         ).data.count;
     } catch (err) {
         console.error('Error fetching week data');

From 0f604ea8b5eaf3485a4678326aa5e327f9154a81 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 13 Sep 2024 11:34:45 +0200
Subject: [PATCH 09/16] fix: refs #7500 fixed e2e test

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

diff --git a/test/cypress/integration/entry/entryDms.spec.js b/test/cypress/integration/entry/entryDms.spec.js
index ed4a3d79c..47dcdba9e 100644
--- a/test/cypress/integration/entry/entryDms.spec.js
+++ b/test/cypress/integration/entry/entryDms.spec.js
@@ -23,7 +23,7 @@ describe('EntryDms', () => {
             expect(value).to.have.length(newFileTd++);
             const newRowSelector = `tbody > :nth-child(${newFileTd})`;
             cy.waitForElement(newRowSelector);
-            cy.validateRow(newRowSelector, [u, u, u, u, 'ENTRADA ID 1']);
+            cy.validateRow(newRowSelector, [u, u, u, u, u, 'ENTRADA ID 1']);
 
             //Edit new dms
             const newDescription = 'entry id 1 modified';
@@ -38,7 +38,7 @@ describe('EntryDms', () => {
             cy.saveCard();
             cy.reload();
 
-            cy.validateRow(newRowSelector, [u, u, u, u, newDescription]);
+            cy.validateRow(newRowSelector, [u, u, u, u, u, newDescription]);
         });
     });
 });

From eca34e2c0fb1eef9d4ab4e2d86d4e952d61766bd Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 13 Sep 2024 14:57:33 +0200
Subject: [PATCH 10/16] feat: refs #7644 Icon

---
 src/pages/Entry/EntryBuysTableDialog.vue | 4 ++--
 src/pages/Entry/locale/en.yml            | 2 +-
 src/pages/Entry/locale/es.yml            | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue
index 9a76770aa..0f9be6298 100644
--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@@ -116,7 +116,7 @@ const entriesTableColumns = computed(() => [
                                         {{ col.value }}
                                     </QTd>
                                     <QBtn
-                                        icon="print"
+                                        icon="visibility"
                                         v-if="props.row.stickers > 0"
                                         :loading="isLoading"
                                         @click="
@@ -126,7 +126,7 @@ const entriesTableColumns = computed(() => [
                                         "
                                         unelevated
                                     >
-                                        <QTooltip>{{ t('printLabel') }}</QTooltip>
+                                        <QTooltip>{{ t('viewLabel') }}</QTooltip>
                                     </QBtn>
                                 </QTr>
                             </template>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index f0965b097..a9faa814b 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -11,4 +11,4 @@ shipped: Shipped
 fromShipped: Shipped(from)
 toShipped: Shipped(to)
 printLabels: Print stickers
-printLabel: Print sticker
+viewLabel: View sticker
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index aba04571e..eb1e3f88a 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -15,4 +15,4 @@ shipped: F. salida
 fromShipped: F. salida(desde)
 toShipped: F. salida(hasta)
 printLabels: Imprimir etiquetas
-printLabel: Imprimir etiqueta
+viewLabel: Ver etiqueta

From 6e6af0af8085fb1e82da7f3c3c17620ba2ecf0e7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 15:16:40 +0200
Subject: [PATCH 11/16] perf: improve style

---
 src/pages/Item/ItemFixedPrice.vue | 110 ++++++++++++------------------
 1 file changed, 44 insertions(+), 66 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index d91b5189e..bd8c4b78c 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -76,16 +76,8 @@ const columns = computed(() => [
         name: 'rate2',
         ...defaultColumnAttrs,
         cardVisible: true,
-        columnField: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
-        columnFilter: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
+        component: 'input',
+        type: 'number',
     },
     {
         label: t('item.fixedPrice.packingPrice'),
@@ -93,35 +85,18 @@ const columns = computed(() => [
         name: 'rate3',
         ...defaultColumnAttrs,
         cardVisible: true,
-        columnField: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
-        columnFilter: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
+        component: 'input',
+        type: 'number',
     },
 
     {
         label: t('item.fixedPrice.minPrice'),
         field: 'minPrice',
-        columnClass: 'shrink',
         name: 'minPrice',
         ...defaultColumnAttrs,
         cardVisible: true,
-        columnField: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
-        columnFilter: {
-            class: 'expand',
-            component: 'input',
-            type: 'number',
-        },
+        component: 'input',
+        type: 'number',
     },
     {
         label: t('item.fixedPrice.started'),
@@ -162,16 +137,9 @@ const columns = computed(() => [
         name: 'warehouseFk',
         ...defaultColumnAttrs,
         columnClass: 'shrink',
-        columnFilter: {
-            component: 'select',
-        },
-        columnField: {
-            component: 'select',
-            class: 'expand',
-        },
-        attrs: {
-            options: warehousesOptions,
-        },
+        component: 'select',
+
+        options: warehousesOptions,
     },
     {
         align: 'right',
@@ -518,29 +486,35 @@ function handleOnDataSave({ CrudModelRef }) {
                 </span>
                 <span class="subName">{{ row.subName }}</span>
                 <ItemDescriptorProxy :id="row.itemFk" />
-                <FetchedTags style="width: max-content; max-width: 220px" :item="row" />
+                <FetchedTags :item="row" />
             </template>
             <template #column-rate2="props">
-                <VnInput
-                    mask="###.##"
-                    v-model.number="props.row.rate2"
-                    v-on="getRowUpdateInputEvents(props)"
-                >
-                    <template #append>€</template>
-                </VnInput>
+                <QTd class="col">
+                    <VnInput
+                        type="currency"
+                        style="width: 75px"
+                        v-model.number="props.row.rate2"
+                        v-on="getRowUpdateInputEvents(props)"
+                    >
+                        <template #append>€</template>
+                    </VnInput>
+                </QTd>
             </template>
             <template #column-rate3="props">
-                <VnInput
-                    mask="###.##"
-                    v-model.number="props.row.rate3"
-                    v-on="getRowUpdateInputEvents(props)"
-                >
-                    <template #append>€</template>
-                </VnInput>
+                <QTd class="col">
+                    <VnInput
+                        style="width: 75px"
+                        type="currency"
+                        v-model.number="props.row.rate3"
+                        v-on="getRowUpdateInputEvents(props)"
+                    >
+                        <template #append>€</template>
+                    </VnInput>
+                </QTd>
             </template>
             <template #column-minPrice="props">
                 <QTd class="col">
-                    <div class="row" style="width: 115px">
+                    <div class="row">
                         <QCheckbox
                             :model-value="props.row.hasMinPrice"
                             @update:model-value="updateMinPrice($event, props)"
@@ -549,6 +523,8 @@ function handleOnDataSave({ CrudModelRef }) {
                         />
                         <VnInput
                             class="col"
+                            type="currency"
+                            mask="###.##"
                             :disable="props.row.hasMinPrice === 1"
                             v-model.number="props.row.minPrice"
                             v-on="getRowUpdateInputEvents(props)"
@@ -577,15 +553,17 @@ function handleOnDataSave({ CrudModelRef }) {
                 />
             </template>
             <template #column-warehouseFk="props">
-                <VnSelect
-                    style="max-width: 150px"
-                    :options="warehousesOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="props.row.warehouseFk"
-                    v-on="getRowUpdateInputEvents(props, false, 'select')"
-                />
+                <QTd class="col">
+                    <VnSelect
+                        style="max-width: 150px"
+                        :options="warehousesOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="props.row.warehouseFk"
+                        v-on="getRowUpdateInputEvents(props, false, 'select')"
+                    />
+                </QTd>
             </template>
             <template #column-deleteAction="{ row, rowIndex }">
                 <QIcon

From 401400bdcfc8b03eab00a4e40dc78ad1ea1fe9e7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 22:52:26 +0200
Subject: [PATCH 12/16] fix: remove FetchData

---
 src/components/common/VnSelect.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 837a3d9f6..e767fb201 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -1,6 +1,7 @@
 <script setup>
-import { ref, toRefs, computed, watch, onMounted } from 'vue';
+import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
+import FetchData from 'src/components/FetchData.vue';
 import { useValidator } from 'src/composables/useValidator';
 
 const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
@@ -225,6 +226,16 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 </script>
 
 <template>
+    <FetchData
+        ref="dataRef"
+        :url="$props.url"
+        @on-fetch="(data) => setOptions(data)"
+        :where="where || { [optionValue]: value }"
+        :limit="limit"
+        :sort-by="sortBy"
+        :fields="fields"
+        :params="params"
+    />
     <QSelect
         v-model="value"
         :options="myOptions"

From b6cce74449dfbf28c95ab36832635d41e20011bd Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 23:11:18 +0200
Subject: [PATCH 13/16] fix: merge conflicts

---
 src/components/common/VnInputDate.vue | 53 ++++++++++++++-------------
 src/components/common/VnInputTime.vue |  6 ++-
 src/components/common/VnSelect.vue    | 12 +++---
 3 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 96e47d6d7..7113cadf9 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -2,6 +2,7 @@
 import { onMounted, watch, computed, ref } from 'vue';
 import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
+import { useAttrs } from 'vue';
 
 const model = defineModel({ type: [String, Date] });
 const $props = defineProps({
@@ -14,29 +15,19 @@ const $props = defineProps({
         default: true,
     },
 });
+import { useValidator } from 'src/composables/useValidator';
+const { validations } = useValidator();
 
 const { t } = useI18n();
-const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
 
 const dateFormat = 'DD/MM/YYYY';
 const isPopupOpen = ref();
 const hover = ref();
 const mask = ref();
+const $attrs = useAttrs();
 
-onMounted(() => {
-    // fix quasar bug
-    mask.value = '##/##/####';
-});
-
-const styleAttrs = computed(() => {
-    return $props.isOutlined
-        ? {
-              dense: true,
-              outlined: true,
-              rounded: true,
-          }
-        : {};
-});
+const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 
 const formattedDate = computed({
     get() {
@@ -48,15 +39,12 @@ const formattedDate = computed({
         let newDate;
         if (value) {
             // parse input
-            if (value.includes('/')) {
-                if (value.length == 6) value = value + new Date().getFullYear();
-                if (value.length >= 10) {
-                    if (value.at(2) == '/') value = value.split('/').reverse().join('/');
-                    value = date.formatDate(
-                        new Date(value).toISOString(),
-                        'YYYY-MM-DDTHH:mm:ss.SSSZ'
-                    );
-                }
+            if (value.includes('/') && value.length >= 10) {
+                if (value.at(2) == '/') value = value.split('/').reverse().join('/');
+                value = date.formatDate(
+                    new Date(value).toISOString(),
+                    'YYYY-MM-DDTHH:mm:ss.SSSZ'
+                );
             }
             const [year, month, day] = value.split('-').map((e) => parseInt(e));
             newDate = new Date(year, month - 1, day);
@@ -79,12 +67,25 @@ const formattedDate = computed({
 const popupDate = computed(() =>
     model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value
 );
-
+onMounted(() => {
+    // fix quasar bug
+    mask.value = '##/##/####';
+});
 watch(
     () => model.value,
     (val) => (formattedDate.value = val),
     { immediate: true }
 );
+
+const styleAttrs = computed(() => {
+    return $props.isOutlined
+        ? {
+              dense: true,
+              outlined: true,
+              rounded: true,
+          }
+        : {};
+});
 </script>
 
 <template>
@@ -96,7 +97,7 @@ watch(
             placeholder="dd/mm/aaaa"
             v-bind="{ ...$attrs, ...styleAttrs }"
             :class="{ required: $attrs.required }"
-            :rules="$attrs.required ? [requiredFieldRule] : null"
+            :rules="mixinRules"
             :clearable="false"
             @click="isPopupOpen = true"
         >
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index b610dc1e9..27395aa9e 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -1,8 +1,10 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
-
+import { useValidator } from 'src/composables/useValidator';
+const { validations } = useValidator();
+const $attrs = useAttrs();
 const model = defineModel({ type: String });
 const props = defineProps({
     timeOnly: {
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index e767fb201..ed842103f 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -3,7 +3,6 @@ import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import FetchData from 'src/components/FetchData.vue';
 import { useValidator } from 'src/composables/useValidator';
-
 const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
 
 const $props = defineProps({
@@ -84,10 +83,11 @@ const $props = defineProps({
         default: false,
     },
 });
-
+const { validations } = useValidator();
+const requiredFieldRule = (val) => validations().required($attrs.required, val);
+const $attrs = useAttrs();
 const { t } = useI18n();
-const requiredFieldRule = (val) => val ?? t('globals.fieldRequired');
-
+const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 const { optionLabel, optionValue, optionFilter, optionFilterValue, options, modelValue } =
     toRefs($props);
 const myOptions = ref([]);
@@ -100,7 +100,6 @@ const noOneOpt = ref({
     [optionValue.value]: false,
     [optionLabel.value]: noOneText,
 });
-const { validations } = useValidator();
 
 const value = computed({
     get() {
@@ -251,8 +250,9 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
         ref="vnSelectRef"
         lazy-rules
         :class="{ required: $attrs.required }"
-        :rules="$attrs.required ? [requiredFieldRule] : null"
+        :rules="mixinRules"
         virtual-scroll-slice-size="options.length"
+        hide-bottom-space
     >
         <template v-if="isClearable" #append>
             <QIcon

From 93488a5750b2a3de2c49ddff952defa55a3f3386 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 13 Sep 2024 23:19:16 +0200
Subject: [PATCH 14/16] fix: styles

---
 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 7113cadf9..fd8993d6f 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -100,6 +100,7 @@ const styleAttrs = computed(() => {
             :rules="mixinRules"
             :clearable="false"
             @click="isPopupOpen = true"
+            hide-bottom-space
         >
             <template #append>
                 <QIcon
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 27395aa9e..42ec79479 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -79,6 +79,7 @@ function dateToTime(newDate) {
             :rules="mixinRules"
             @click="isPopupOpen = false"
             type="time"
+            hide-bottom-space
         >
             <template #append>
                 <QIcon

From 8c4e4a16af99c429d3abbf0a355184df5a6e9769 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 16 Sep 2024 09:19:08 +0200
Subject: [PATCH 15/16] fix(VnSectionMain): add QPage

---
 src/components/common/VnSectionMain.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnSectionMain.vue b/src/components/common/VnSectionMain.vue
index 0c1641ce1..97a150cf4 100644
--- a/src/components/common/VnSectionMain.vue
+++ b/src/components/common/VnSectionMain.vue
@@ -20,6 +20,8 @@ onMounted(() => (stateStore.leftDrawer = $props.leftDrawer));
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
-        <RouterView></RouterView>
+        <QPage>
+            <RouterView></RouterView>
+        </QPage>
     </QPageContainer>
 </template>

From 4c8238455f9a21da8a59376a249d067352052fd0 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 16 Sep 2024 10:03:12 +0200
Subject: [PATCH 16/16] fix(ClaimList): fix summary

---
 src/components/VnTable/VnTable.vue      | 4 ++--
 src/components/common/VnSectionMain.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 899e4d000..6f678d5c1 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -633,7 +633,7 @@ function handleOnDataSaved(_, res) {
             </QTable>
         </template>
     </CrudModel>
-    <QPageSticky :offset="[20, 20]" style="z-index: 2">
+    <QPageSticky v-if="$props.create" :offset="[20, 20]" style="z-index: 2">
         <QBtn
             @click="
                 () =>
@@ -645,7 +645,7 @@ function handleOnDataSaved(_, res) {
             shortcut="+"
         />
         <QTooltip>
-            {{ createForm.title }}
+            {{ createForm?.title }}
         </QTooltip>
     </QPageSticky>
     <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
diff --git a/src/components/common/VnSectionMain.vue b/src/components/common/VnSectionMain.vue
index 97a150cf4..9975b1011 100644
--- a/src/components/common/VnSectionMain.vue
+++ b/src/components/common/VnSectionMain.vue
@@ -21,7 +21,7 @@ onMounted(() => (stateStore.leftDrawer = $props.leftDrawer));
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <RouterView></RouterView>
+            <RouterView />
         </QPage>
     </QPageContainer>
 </template>