From 3f1c0b95faf7d8ff00b10fa93acdbed4047d6b9a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 10 Jul 2024 15:03:25 +0200
Subject: [PATCH 001/131] fix: proposal to avoid notify error

---
 src/pages/Customer/Card/CustomerUnpaid.vue               | 2 +-
 src/pages/Customer/Card/CustomerWebAccess.vue            | 2 +-
 src/pages/Customer/components/CustomerChangePassword.vue | 2 +-
 src/pages/Customer/components/CustomerSamplesCreate.vue  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerUnpaid.vue b/src/pages/Customer/Card/CustomerUnpaid.vue
index a9d4a3d66..6c61b92a1 100644
--- a/src/pages/Customer/Card/CustomerUnpaid.vue
+++ b/src/pages/Customer/Card/CustomerUnpaid.vue
@@ -92,7 +92,7 @@ const onSubmit = async () => {
         notify('globals.dataSaved', 'positive');
         unpaidClient.value = true;
     } catch (error) {
-        notify('errors.create', 'negative');
+        notify('errors.writeRequest', 'negative');
     } finally {
         isLoading.value = false;
     }
diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index 33659dd77..4468c52f0 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -70,7 +70,7 @@ const onSubmit = async () => {
         notify('globals.dataSaved', 'positive');
         if (usersPreviewRef.value) usersPreviewRef.value.fetch();
     } catch (error) {
-        notify('errors.create', 'negative');
+        notify('errors.writeRequest', 'negative');
     } finally {
         isLoading.value = false;
     }
diff --git a/src/pages/Customer/components/CustomerChangePassword.vue b/src/pages/Customer/components/CustomerChangePassword.vue
index 1bfc5e103..632b11dc9 100644
--- a/src/pages/Customer/components/CustomerChangePassword.vue
+++ b/src/pages/Customer/components/CustomerChangePassword.vue
@@ -48,7 +48,7 @@ const onSubmit = async () => {
         await axios.patch(`Clients/${$props.id}/setPassword`, payload);
         await $props.promise();
     } catch (error) {
-        notify('errors.create', 'negative');
+        notify('errors.writeRequest', 'negative');
     } finally {
         isLoading.value = false;
         if (closeButton.value) closeButton.value.click();
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index be614aa0b..283b8fa97 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -150,7 +150,7 @@ const onSubmit = async () => {
         notify('globals.dataSaved', 'positive');
         onDataSaved(data);
     } catch (error) {
-        notify('errors.create', 'negative');
+        notify('errors.writeRequest', 'negative');
     } finally {
         isLoading.value = false;
     }

From e90b78c4c5867f2afd48b9029c9b443d5291c385 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 13 Sep 2024 12:27:37 +0200
Subject: [PATCH 002/131] fix: refs #7702 rollback

---
 src/pages/Customer/Card/CustomerWebAccess.vue | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index 3dc025d9c..f990e720c 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
-import useNotify from 'src/composables/useNotify';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue';
 import FormModel from 'components/FormModel.vue';
@@ -13,7 +12,6 @@ const { t } = useI18n();
 const quasar = useQuasar();
 const route = useRoute();
 const canChangePassword = ref(0);
-const { notify } = useNotify();
 
 const filter = computed(() => {
     return {
@@ -32,13 +30,8 @@ const showChangePasswordDialog = () => {
 };
 
 async function hasCustomerRole() {
-    try {
-        canChangePassword.value = (
-            await axios(`Clients/${route.params.id}/hasCustomerRole`)
-        ).data;
-    } catch (e) {
-        notify('errors.writeRequest', 'negative');
-    }
+    const { data } = await axios(`Clients/${route.params.id}/hasCustomerRole`);
+    canChangePassword.value = data;
 }
 </script>
 

From 4bf8e1224d1d8cd0082174fe7830baeeddc45b0c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 13 Sep 2024 12:28:07 +0200
Subject: [PATCH 003/131] chore: refs #7702 rollback

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

diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index f990e720c..8d025a365 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
 import { useQuasar } from 'quasar';
+
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue';
 import FormModel from 'components/FormModel.vue';

From 98cdeabe9f91791faa4a623ed9e67237180b0666 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 13 Sep 2024 18:15:28 +0200
Subject: [PATCH 004/131] feat: refs #7702 vnChangePassword

---
 src/components/common/VnChangePassword.vue    | 112 ++++++++++++++++++
 src/pages/Customer/Card/CustomerWebAccess.vue |  28 ++---
 2 files changed, 124 insertions(+), 16 deletions(-)
 create mode 100644 src/components/common/VnChangePassword.vue

diff --git a/src/components/common/VnChangePassword.vue b/src/components/common/VnChangePassword.vue
new file mode 100644
index 000000000..d7c9ad02f
--- /dev/null
+++ b/src/components/common/VnChangePassword.vue
@@ -0,0 +1,112 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnRow from '../ui/VnRow.vue';
+import VnInput from './VnInput.vue';
+import FetchData from '../FetchData.vue';
+import useNotify from 'src/composables/useNotify';
+
+const props = defineProps({ submitFn: { type: Function, default: () => {} } });
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const form = ref();
+const changePassDialog = ref();
+const passwords = ref({ newPassword: null, repeatPassword: null });
+const requirements = ref([]);
+
+const validate = async () => {
+    const { newPassword, repeatPassword } = passwords.value;
+    if (newPassword !== repeatPassword) {
+        notify(t("Passwords don't match"), 'negative');
+        return;
+    }
+    try {
+        await props.submitFn(newPassword);
+    } catch (e) {
+        notify('errors.writeRequest', 'negative');
+    } finally {
+        changePassDialog.value.hide();
+    }
+};
+
+defineExpose({ show: () => changePassDialog.value.show() });
+</script>
+<template>
+    <FetchData
+        url="UserPasswords/findOne"
+        auto-load
+        @on-fetch="(data) => (requirements = data)"
+    />
+    <QDialog ref="changePassDialog">
+        <QCard style="width: 350px">
+            <QCardSection>
+                <slot name="header">
+                    <VnRow class="items-center" style="flex-direction: row">
+                        <span class="text-h6" v-text="t('Change password')" />
+                        <QIcon
+                            class="cursor-pointer"
+                            name="close"
+                            size="xs"
+                            style="flex: 0"
+                            v-close-popup
+                        />
+                    </VnRow>
+                </slot>
+            </QCardSection>
+            <QForm ref="form">
+                <QCardSection>
+                    <VnInput
+                        :label="t('New password')"
+                        v-model="passwords.newPassword"
+                        type="password"
+                        :required="true"
+                        :info="
+                            t('passwordRequirements', {
+                                length: requirements.length,
+                                nAlpha: requirements.nAlpha,
+                                nUpper: requirements.nUpper,
+                                nDigits: requirements.nDigits,
+                                nPunct: requirements.nPunct,
+                            })
+                        "
+                        autofocus
+                    />
+
+                    <VnInput
+                        :label="t('Repeat password')"
+                        v-model="passwords.repeatPassword"
+                        type="password"
+                    />
+                </QCardSection>
+            </QForm>
+            <QCardActions>
+                <slot name="actions">
+                    <QBtn
+                        :label="t('globals.cancel')"
+                        class="q-ml-sm"
+                        color="primary"
+                        flat
+                        type="reset"
+                        v-close-popup
+                    />
+                    <QBtn
+                        :label="t('globals.confirm')"
+                        color="primary"
+                        @click="validate"
+                    />
+                </slot>
+            </QCardActions>
+        </QCard>
+    </QDialog>
+</template>
+
+<i18n>
+es:
+    Change password: Cambiar contraseña
+    New password: Nueva contraseña
+    Repeat password: Repetir contraseña
+    You must enter a new password: Debes introducir la nueva contraseña
+    Passwords don't match: Las contraseñas no coinciden
+</i18n>
diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index 8d025a365..ba906a144 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -3,14 +3,11 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
-import { useQuasar } from 'quasar';
-
 import VnInput from 'src/components/common/VnInput.vue';
-import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue';
 import FormModel from 'components/FormModel.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 
 const { t } = useI18n();
-const quasar = useQuasar();
 const route = useRoute();
 const canChangePassword = ref(0);
 
@@ -21,21 +18,11 @@ const filter = computed(() => {
     };
 });
 
-const showChangePasswordDialog = () => {
-    quasar.dialog({
-        component: CustomerChangePassword,
-        componentProps: {
-            id: route.params.id,
-        },
-    });
-};
-
 async function hasCustomerRole() {
     const { data } = await axios(`Clients/${route.params.id}/hasCustomerRole`);
     canChangePassword.value = data;
 }
 </script>
-
 <template>
     <FormModel
         url="VnUsers/preview"
@@ -73,12 +60,21 @@ async function hasCustomerRole() {
                 color="primary"
                 icon="edit"
                 :disable="!canChangePassword"
-                @click="showChangePasswordDialog()"
+                @click="$refs.changePassRef.show"
             />
         </template>
     </FormModel>
+    <VnChangePassword
+        ref="changePassRef"
+        :submit-fn="
+            async (newPass) => {
+                await axios.patch(`Clients/${$route.params.id}/setPassword`, {
+                    newPassword: newPass,
+                });
+            }
+        "
+    />
 </template>
-
 <i18n>
 es:
     Enable web access: Habilitar acceso web

From 9ec2fb4c77edede9e5b80a34a80263a33ac80a1c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 16 Sep 2024 10:36:56 +0200
Subject: [PATCH 005/131] feat: refs #7702 fine tunning

---
 src/components/common/VnChangePassword.vue | 14 +++++++-
 src/pages/Worker/Card/WorkerDescriptor.vue | 40 ++++++++++------------
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/src/components/common/VnChangePassword.vue b/src/components/common/VnChangePassword.vue
index d7c9ad02f..a36c6bcff 100644
--- a/src/components/common/VnChangePassword.vue
+++ b/src/components/common/VnChangePassword.vue
@@ -7,7 +7,7 @@ import FetchData from '../FetchData.vue';
 import useNotify from 'src/composables/useNotify';
 
 const props = defineProps({ submitFn: { type: Function, default: () => {} } });
-
+const emit = defineEmits(['onSubmit']);
 const { t } = useI18n();
 const { notify } = useNotify();
 
@@ -15,19 +15,27 @@ const form = ref();
 const changePassDialog = ref();
 const passwords = ref({ newPassword: null, repeatPassword: null });
 const requirements = ref([]);
+const isLoading = ref(false);
 
 const validate = async () => {
     const { newPassword, repeatPassword } = passwords.value;
+    if (!newPassword) {
+        notify(t('You must enter a new password'), 'negative');
+        return;
+    }
     if (newPassword !== repeatPassword) {
         notify(t("Passwords don't match"), 'negative');
         return;
     }
     try {
+        isLoading.value = true;
         await props.submitFn(newPassword);
+        emit('onSubmit');
     } catch (e) {
         notify('errors.writeRequest', 'negative');
     } finally {
         changePassDialog.value.hide();
+        isLoading.value = false;
     }
 };
 
@@ -84,6 +92,8 @@ defineExpose({ show: () => changePassDialog.value.show() });
             <QCardActions>
                 <slot name="actions">
                     <QBtn
+                        :disabled="isLoading"
+                        :loading="isLoading"
                         :label="t('globals.cancel')"
                         class="q-ml-sm"
                         color="primary"
@@ -92,6 +102,8 @@ defineExpose({ show: () => changePassDialog.value.show() });
                         v-close-popup
                     />
                     <QBtn
+                        :disabled="isLoading"
+                        :loading="isLoading"
                         :label="t('globals.confirm')"
                         color="primary"
                         @click="validate"
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index be30537df..b48859e9b 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
-import WorkerChangePasswordForm from 'src/pages/Worker/Card/WorkerChangePasswordForm.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import VnImg from 'src/components/ui/VnImg.vue';
@@ -24,18 +24,13 @@ const route = useRoute();
 const { t } = useI18n();
 const state = useState();
 const user = state.getUser();
-const changePasswordFormDialog = ref(null);
-const cardDescriptorRef = ref(null);
 const showEditPhotoForm = ref(false);
 const toggleEditPictureForm = () => {
     showEditPhotoForm.value = !showEditPhotoForm.value;
 };
-
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-
-const worker = ref();
 const workerExcluded = ref(false);
 
 const getIsExcluded = async () => {
@@ -61,10 +56,10 @@ const handleExcluded = async () => {
 
     workerExcluded.value = !workerExcluded.value;
 };
+
 const handlePhotoUpdated = (evt = false) => {
     image.value.reload(evt);
 };
-const refetch = async () => await cardDescriptorRef.value.getData();
 </script>
 <template>
     <CardDescriptor
@@ -74,15 +69,10 @@ const refetch = async () => await cardDescriptorRef.value.getData();
         url="Workers/descriptor"
         :filter="{ where: { id: entityId } }"
         title="user.nickname"
-        @on-fetch="
-            (data) => {
-                worker = data;
-                getIsExcluded();
-            }
-        "
+        @on-fetch="getIsExcluded"
     >
-        <template #menu="{}">
-            <QItem v-ripple clickable @click="handleExcluded()">
+        <template #menu="{ entity }">
+            <QItem v-ripple clickable @click="handleExcluded">
                 <QItemSection>
                     {{
                         workerExcluded
@@ -92,16 +82,13 @@ const refetch = async () => await cardDescriptorRef.value.getData();
                 </QItemSection>
             </QItem>
             <QItem
-                v-if="!worker.user.emailVerified && user.id != worker.id"
+                v-if="!entity.user.emailVerified && user.id != entity.id"
                 v-ripple
                 clickable
-                @click="$refs.changePasswordFormDialog.show()"
+                @click="$refs.changePassRef.show"
             >
                 <QItemSection>
                     {{ t('Change password') }}
-                    <QDialog ref="changePasswordFormDialog">
-                        <WorkerChangePasswordForm @on-submit="refetch()" :id="entityId" />
-                    </QDialog>
                 </QItemSection>
             </QItem>
         </template>
@@ -163,10 +150,10 @@ const refetch = async () => await cardDescriptorRef.value.getData();
                     <VnLinkPhone :phone-number="entity.phone" />
                 </template>
             </VnLv>
-            <VnLv :value="worker?.sip?.extension">
+            <VnLv :value="entity?.sip?.extension">
                 <template #label>
                     {{ t('worker.summary.sipExtension') }}
-                    <VnLinkPhone :phone-number="worker?.sip?.extension" />
+                    <VnLinkPhone :phone-number="entity?.sip?.extension" />
                 </template>
             </VnLv>
         </template>
@@ -197,6 +184,15 @@ const refetch = async () => await cardDescriptorRef.value.getData();
             </QCardActions>
         </template>
     </CardDescriptor>
+    <VnChangePassword
+        ref="changePassRef"
+        :submit-fn="
+            async (newPass) => {
+                await axios.patch(`Workers/${$route.params.id}/setPassword`, { newPass });
+            }
+        "
+        @on-submit="$refs.cardDescriptorRef?.getData"
+    />
 </template>
 
 <style lang="scss" scoped>

From 91dccd10d370263d0e9c7087efd0b9e8156b2b8d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 16 Sep 2024 10:39:39 +0200
Subject: [PATCH 006/131] feat: refs #7702 drop old components

---
 .../components/CustomerChangePassword.vue     | 139 ------------------
 .../Worker/Card/WorkerChangePasswordForm.vue  |  99 -------------
 2 files changed, 238 deletions(-)
 delete mode 100644 src/pages/Customer/components/CustomerChangePassword.vue
 delete mode 100644 src/pages/Worker/Card/WorkerChangePasswordForm.vue

diff --git a/src/pages/Customer/components/CustomerChangePassword.vue b/src/pages/Customer/components/CustomerChangePassword.vue
deleted file mode 100644
index 632b11dc9..000000000
--- a/src/pages/Customer/components/CustomerChangePassword.vue
+++ /dev/null
@@ -1,139 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import axios from 'axios';
-import { useDialogPluginComponent } from 'quasar';
-
-import useNotify from 'src/composables/useNotify';
-
-import VnRow from 'components/ui/VnRow.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import FetchData from 'src/components/FetchData.vue';
-
-const { dialogRef } = useDialogPluginComponent();
-const { notify } = useNotify();
-const { t } = useI18n();
-
-const $props = defineProps({
-    id: {
-        type: String,
-        required: true,
-    },
-    promise: {
-        type: Function,
-        required: true,
-    },
-});
-const userPasswords = ref({});
-
-const closeButton = ref(null);
-const isLoading = ref(false);
-const newPassword = ref('');
-const requestPassword = ref('');
-
-const onSubmit = async () => {
-    isLoading.value = true;
-
-    if (newPassword.value !== requestPassword.value) {
-        notify(t("Passwords don't match"), 'negative');
-        isLoading.value = false;
-        return;
-    }
-
-    const payload = {
-        newPassword: newPassword.value,
-    };
-    try {
-        await axios.patch(`Clients/${$props.id}/setPassword`, payload);
-        await $props.promise();
-    } catch (error) {
-        notify('errors.writeRequest', 'negative');
-    } finally {
-        isLoading.value = false;
-        if (closeButton.value) closeButton.value.click();
-    }
-};
-</script>
-
-<template>
-    <QDialog ref="dialogRef">
-        <FetchData
-            @on-fetch="(data) => (userPasswords = data[0])"
-            auto-load
-            url="UserPasswords"
-        />
-        <QCard class="q-pa-lg">
-            <QCardSection>
-                <QForm @submit.prevent="onSubmit">
-                    <span
-                        ref="closeButton"
-                        class="row justify-end close-icon"
-                        v-close-popup
-                    >
-                        <QIcon name="close" size="sm" />
-                    </span>
-
-                    <VnRow class="row q-gutter-md q-mb-md" style="flex-direction: column">
-                        <div class="col">
-                            <VnInput
-                                :label="t('New password')"
-                                clearable
-                                v-model="newPassword"
-                                type="password"
-                            >
-                                <template #append>
-                                    <QIcon name="info" class="cursor-info">
-                                        <QTooltip>
-                                            {{
-                                                t('customer.card.passwordRequirements', {
-                                                    ...userPasswords,
-                                                })
-                                            }}
-                                        </QTooltip>
-                                    </QIcon>
-                                </template>
-                            </VnInput>
-                        </div>
-                        <div class="col">
-                            <VnInput
-                                :label="t('Request password')"
-                                clearable
-                                v-model="requestPassword"
-                                type="password"
-                            />
-                        </div>
-                    </VnRow>
-
-                    <div class="q-mt-lg row justify-end">
-                        <QBtn
-                            :disabled="isLoading"
-                            :label="t('globals.cancel')"
-                            :loading="isLoading"
-                            class="q-ml-sm"
-                            color="primary"
-                            flat
-                            type="reset"
-                            v-close-popup
-                        />
-                        <QBtn
-                            :disabled="isLoading"
-                            :label="t('Change password')"
-                            :loading="isLoading"
-                            color="primary"
-                            type="submit"
-                        />
-                    </div>
-                </QForm>
-            </QCardSection>
-        </QCard>
-    </QDialog>
-</template>
-
-<i18n>
-es:
-    New password: Nueva contraseña
-    Request password: Repetir contraseña
-    Change password: Cambiar contraseña
-    Passwords don't match: Las contraseñas no coinciden
-</i18n>
diff --git a/src/pages/Worker/Card/WorkerChangePasswordForm.vue b/src/pages/Worker/Card/WorkerChangePasswordForm.vue
deleted file mode 100644
index 20132f21e..000000000
--- a/src/pages/Worker/Card/WorkerChangePasswordForm.vue
+++ /dev/null
@@ -1,99 +0,0 @@
-<script setup>
-import { ref, reactive, onMounted } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnRow from 'components/ui/VnRow.vue';
-import FormPopup from 'src/components/FormPopup.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
-
-const $props = defineProps({
-    id: {
-        type: Object,
-        default: () => {},
-    },
-});
-
-const emit = defineEmits(['onSubmit']);
-
-const { t } = useI18n();
-const { notify } = useNotify();
-
-const formData = reactive({
-    newPassword: null,
-    repeatPassword: null,
-});
-
-const passRequirements = ref([]);
-
-const setPassword = async () => {
-    try {
-        if (!formData.newPassword) {
-            notify(t('You must enter a new password'), 'negative');
-            return;
-        }
-
-        if (formData.newPassword != formData.repeatPassword) {
-            notify(t(`Passwords don't match`), 'negative');
-            return;
-        }
-
-        await axios.patch(`Workers/${$props.id}/setPassword`, {
-            newPass: formData.newPassword,
-        });
-        notify(t('Password changed!'), 'positive');
-        emit('onSubmit');
-    } catch (err) {
-        console.error('Error setting password', err);
-    }
-};
-
-const getPassRequirements = async () => {
-    const { data } = await axios.get('UserPasswords/findOne');
-    passRequirements.value = data;
-};
-
-onMounted(async () => await getPassRequirements());
-</script>
-
-<template>
-    <FormPopup :title="t('Reset password')" @on-submit="setPassword()">
-        <template #form-inputs>
-            <VnRow>
-                <VnInput
-                    :label="t('New password')"
-                    v-model="formData.newPassword"
-                    type="password"
-                    :required="true"
-                    :info="
-                        t('passwordRequirements', {
-                            length: passRequirements.length,
-                            nAlpha: passRequirements.nAlpha,
-                            nUpper: passRequirements.nUpper,
-                            nDigits: passRequirements.nDigits,
-                            nPunct: passRequirements.nPunct,
-                        })
-                    "
-                />
-            </VnRow>
-            <VnRow>
-                <VnInput
-                    :label="t('Repeat password')"
-                    v-model="formData.repeatPassword"
-                    type="password"
-                />
-            </VnRow>
-        </template>
-    </FormPopup>
-</template>
-
-<i18n>
-es:
-    Reset password: Restablecer contraseña
-    New password: Nueva contraseña
-    Repeat password: Repetir contraseña
-    You must enter a new password: Debes introducir la nueva contraseña
-    Passwords don't match: Las contraseñas no coinciden
-</i18n>

From b015397822a7c0212751672d5fa7d7a5761bb4ce Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 16 Sep 2024 10:59:32 +0200
Subject: [PATCH 007/131] feat: refs #7702 test wip

---
 .../common/VnChangePassword.spec.js           | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 test/vitest/__tests__/components/common/VnChangePassword.spec.js

diff --git a/test/vitest/__tests__/components/common/VnChangePassword.spec.js b/test/vitest/__tests__/components/common/VnChangePassword.spec.js
new file mode 100644
index 000000000..a481efa81
--- /dev/null
+++ b/test/vitest/__tests__/components/common/VnChangePassword.spec.js
@@ -0,0 +1,47 @@
+import { createWrapper } from 'app/test/vitest/helper';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
+import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
+
+describe('VnSmsDialog', () => {
+    let vm;
+
+    beforeAll(() => {
+        vm = createWrapper(VnChangePassword, {
+            propsData: {
+                submitFn: vi.fn(),
+            },
+        }).vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should notify when new password is empty', async () => {
+        vm.passwords.newPassword = '';
+        vm.passwords.repeatPassword = 'password';
+        vi.spyOn(vm, 'notify');
+        await vm.validate();
+        expect(vm.notify).toHaveBeenCalledWith(
+            expect.arguments({
+                message: 'You must enter a new password',
+                type: 'negative',
+            })
+        );
+    });
+
+    it("should notify when passwords don't match", async () => {
+        vm.passwords.newPassword = 'password1';
+        vm.passwords.repeatPassword = 'password2';
+        vi.spyOn(vm, 'notify');
+        await vm.validate();
+        expect(vm.notify).toHaveBeenCalledWith("Passwords don't match", 'negative');
+    });
+
+    it('should call submitFn and emit onSubmit when passwords match', async () => {
+        vm.passwords.newPassword = 'password';
+        vm.passwords.repeatPassword = 'password';
+        await vm.validate();
+        expect(vm.props.submitFn).toHaveBeenCalledWith('password');
+    });
+});

From 1ff15da8ca4ec1b5e39b2fb1c6cabe016d8eac5f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 16 Sep 2024 16:33:09 +0200
Subject: [PATCH 008/131] fix: refs #7323 workerList

---
 src/i18n/locale/en.yml            |  5 +++
 src/i18n/locale/es.yml            |  5 +++
 src/pages/Worker/WorkerFilter.vue | 30 ++++++++++-------
 src/pages/Worker/WorkerList.vue   | 53 ++++++++++++++++++++++++++++---
 src/pages/Worker/locale/en.yml    |  5 +++
 src/pages/Worker/locale/es.yml    |  5 +++
 6 files changed, 86 insertions(+), 17 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index f99244d42..3b1cb20fa 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -286,6 +286,7 @@ globals:
     myAccount: My account
     noOne: No one
     params:
+        id: ID
         clientFk: Client id
         salesPersonFk: Sales person
         warehouseFk: Warehouse
@@ -293,6 +294,10 @@ globals:
         from: From
         To: To
         stateFk: State
+        departmentFk: Department
+        email: Email
+        SSN: SSN
+        fi: FI
 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 360627fda..31010dfb0 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -290,6 +290,7 @@ globals:
     myAccount: Mi cuenta
     noOne: Nadie
     params:
+        id: Id
         clientFk: Id cliente
         salesPersonFk: Comercial
         warehouseFk: Almacén
@@ -297,6 +298,10 @@ globals:
         from: Desde
         To: Hasta
         stateFk: Estado
+        departmentFk: Departamento
+        email: Correo
+        SSN: NSS
+        fi: NIF
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue
index 765241341..61120f448 100644
--- a/src/pages/Worker/WorkerFilter.vue
+++ b/src/pages/Worker/WorkerFilter.vue
@@ -7,7 +7,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
-const { t } = useI18n();
+const { t, te } = useI18n();
 const props = defineProps({
     dataKey: {
         type: String,
@@ -16,6 +16,11 @@ const props = defineProps({
 });
 
 const departments = ref();
+
+const getLocale = (label) => {
+    const globalLocale = `globals.params.${label}`;
+    return te(globalLocale) ? t(globalLocale) : t(`params.${label}`);
+};
 </script>
 
 <template>
@@ -23,7 +28,7 @@ const departments = ref();
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <strong>{{ getLocale(tag.label) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
@@ -64,10 +69,7 @@ const departments = ref();
                 </QItemSection>
             </QItem>
             <QItem>
-                <QItemSection v-if="!departments">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="departments">
+                <QItemSection>
                     <VnSelect
                         :label="t('Department')"
                         v-model="params.departmentFk"
@@ -82,6 +84,16 @@ const departments = ref();
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('SSN')" v-model="params.SSN" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('Email')" v-model="params.email" is-outlined />
+                </QItemSection>
+            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -99,23 +111,17 @@ const departments = ref();
 en:
     params:
         search: Contains
-        fi: FI
         firstName: First name
         lastName: Last name
         userName: User
         extension: Extension
-        departmentFk: Department
-        id: ID
 es:
     params:
         search: Contiene
-        fi: NIF
         firstName: Nombre
         lastName: Apellidos
         userName: Usuario
         extension: Extensión
-        departmentFk: Departamento
-        id: ID
     FI: NIF
     First Name: Nombre
     Last Name: Apellidos
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index b8ef3f9d8..9b6bb8b69 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -39,13 +39,31 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'nickname',
+        name: 'firstName',
         label: t('tableColumns.name'),
         isTitle: true,
         columnFilter: {
             name: 'firstName',
         },
     },
+    {
+        align: 'left',
+        name: 'lastName',
+        label: t('tableColumns.lastName'),
+        isTitle: true,
+        columnFilter: {
+            name: 'lastName',
+        },
+    },
+    {
+        align: 'left',
+        name: 'nickname',
+        label: t('tableColumns.userName'),
+        isTitle: true,
+        columnFilter: {
+            name: 'userName',
+        },
+    },
     {
         align: 'left',
         name: 'departmentFk',
@@ -60,16 +78,41 @@ const columns = computed(() => [
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.department),
     },
+    {
+        align: 'left',
+        name: 'fi',
+        label: t('tableColumns.fi'),
+        isTitle: true,
+        columnFilter: {
+            name: 'fi',
+        },
+    },
+    {
+        align: 'left',
+        name: 'SSN',
+        label: t('tableColumns.SSN'),
+        isTitle: true,
+        columnFilter: {
+            name: 'SSN',
+        },
+    },
     {
         align: 'left',
         name: 'email',
         label: t('tableColumns.email'),
         cardVisible: true,
         columnFilter: {
-            alias: 'mu',
-            inWhere: true,
+            name: 'email',
+        },
+    },
+    {
+        align: 'left',
+        name: 'extension',
+        label: t('tableColumns.extension'),
+        cardVisible: true,
+        columnFilter: {
+            name: 'extension',
         },
-        hidden: true,
     },
     {
         align: 'right',
@@ -180,7 +223,7 @@ async function autofillBic(worker) {
         default-mode="table"
         redirect="worker"
         :right-search="false"
-        auto-load
+        :order="['id DESC']"
     >
         <template #more-create-dialog="{ data }">
             <div class="q-pa-lg full-width">
diff --git a/src/pages/Worker/locale/en.yml b/src/pages/Worker/locale/en.yml
index 96df37919..7081e8fd0 100644
--- a/src/pages/Worker/locale/en.yml
+++ b/src/pages/Worker/locale/en.yml
@@ -2,5 +2,10 @@ passwordRequirements: 'The password must have at least { length } length charact
 tableColumns:
     id: ID
     name: Name
+    lastName: Last Name
+    userName: User Name
     department: Department
     email: Email
+    fi: FI
+    SSN: SSN
+    extension: Extension
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
index 41812345f..61694dc83 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -7,5 +7,10 @@ passwordRequirements: 'La contraseña debe tener al menos { length } caracteres
 tableColumns:
     id: ID
     name: Nombre
+    lastName: Apellidos
+    userName: Nombre de usuario
     department: Departamento
     email: Email
+    fi: NIF
+    SSN: NSS
+    extension: Extensión

From da7d0326c091b4111296cbd9930a4cd2317a5957 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 16 Sep 2024 17:12:48 +0200
Subject: [PATCH 009/131] fix: refs #7323 workerBalance & arrayData
 setUserParams

---
 src/components/VnTable/VnTable.vue | 2 +-
 src/composables/useArrayData.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index d6008de0b..d71c85338 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -646,7 +646,7 @@ function handleOnDataSaved(_) {
             icon="add"
             shortcut="+"
         />
-        <QTooltip>
+        <QTooltip self="top right">
             {{ createForm?.title }}
         </QTooltip>
     </QPageSticky>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 651bcefb0..90cf45268 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -113,7 +113,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             for (const row of response.data) store.data.push(row);
         } else {
             store.data = response.data;
-            if (!document.querySelectorAll('[role="dialog"]').length)
+            if (!document.querySelectorAll('[role="dialog"][aria-modal="true"]').length)
                 updateRouter && updateStateParams();
         }
 

From 479f2a8e53ffe91a5c7842758e37912acb9505fc Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 17 Sep 2024 08:31:02 +0200
Subject: [PATCH 010/131] feat: refs #7884 added new filter field

---
 src/i18n/locale/en.yml        | 1 +
 src/i18n/locale/es.yml        | 1 +
 src/pages/Entry/MyEntries.vue | 8 +++++++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index f99244d42..27c904aaf 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -50,6 +50,7 @@ globals:
     summary:
         basicData: Basic data
     daysOnward: Days onward
+    daysAgo: Days ago
     today: Today
     yesterday: Yesterday
     dateFormat: en-GB
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 360627fda..e0614caaf 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -49,6 +49,7 @@ globals:
     summary:
         basicData: Datos básicos
     daysOnward: Días adelante
+    daysAgo: Días atras
     today: Hoy
     yesterday: Ayer
     dateFormat: es-ES
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 1c56427f4..17b1f91c5 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -78,7 +78,13 @@ const columns = computed(() => [
     {
         align: 'left',
         label: t('globals.daysOnward'),
-        name: 'days',
+        name: 'daysOnward',
+        visible: false,
+    },
+    {
+        align: 'left',
+        label: t('globals.daysAgo'),
+        name: 'daysAgo',
         visible: false,
     },
     {

From 41c43fde76c35cf4766b4900e73418f9e5ff6fcc Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 17 Sep 2024 16:08:48 +0200
Subject: [PATCH 011/131] feat: refs #7323 hide log section

---
 src/router/modules/worker.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index b2716474b..7258881be 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -168,6 +168,7 @@ export default {
                     meta: {
                         title: 'log',
                         icon: 'vn:History',
+                        acls: [{ model: 'WorkerLog', props: 'find', accessType: 'READ' }],
                     },
                     component: () => import('src/pages/Worker/Card/WorkerLog.vue'),
                 },

From 566d657f70d45934a4aa8b3368379d2c985ac6de Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 18 Sep 2024 08:23:15 +0200
Subject: [PATCH 012/131] feat: refs #7884 added default params and chip
 translations

---
 src/components/ui/VnFilterPanel.vue | 7 ++++++-
 src/pages/Entry/MyEntries.vue       | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 637180c22..4f71fdea9 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -252,7 +252,7 @@ function sanitizer(params) {
                     >
                         <slot name="tags" :tag="chip" :format-fn="formatValue">
                             <div class="q-gutter-x-xs">
-                                <strong>{{ chip.label }}:</strong>
+                                <strong>{{ t(`${chip.label}`) }}:</strong>
                                 <span>"{{ formatValue(chip.value) }}"</span>
                             </div>
                         </slot>
@@ -286,6 +286,9 @@ function sanitizer(params) {
 </style>
 
 <i18n>
+en:
+    daysOnward: Days onward
+    daysAgo: Days ago
 es:
     No filters applied: No se han aplicado filtros
     Applied filters: Filtros aplicados
@@ -294,4 +297,6 @@ es:
     Search: Buscar
     Yes: Si
     No: No
+    daysOnward: Días Adelante
+    daysAgo: Días Atrás
 </i18n>
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 17b1f91c5..b95c73847 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -9,6 +9,11 @@ import VnTable from 'components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
+const params = {
+    daysOnward: 7,
+    daysAgo: 3,
+};
+
 const columns = computed(() => [
     {
         align: 'left',
@@ -120,6 +125,7 @@ const printBuys = (rowId) => {
         data-key="myEntriesList"
         url="Entries/filter"
         :columns="columns"
+        :user-params="params"
         default-mode="card"
         order="shipped DESC"
         auto-load

From b822c7722bb3176120c87aa74abbb7c2c33ec88d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 20 Sep 2024 13:45:43 +0200
Subject: [PATCH 013/131] feat: formatLocation when field is null

---
 src/components/common/VnLocation.vue | 68 +++++++++++++++++++++++++---
 1 file changed, 61 insertions(+), 7 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 8256ec5b0..c1b921915 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -2,21 +2,68 @@
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectDialog from 'components/common/VnSelectDialog.vue';
 import { useI18n } from 'vue-i18n';
-
+import { ref } from 'vue';
 const { t } = useI18n();
-const value = defineModel({ type: [String, Number, Object] });
+const emit = defineEmits(['update:model-value', 'update:options']);
+
+const props = defineProps({
+    location: {
+        type: Object,
+        default: null,
+    },
+});
+const formatLocation = (obj, properties) => {
+    const parts = properties.map((prop) => {
+        if (typeof prop === 'string') {
+            return obj[prop];
+        } else if (typeof prop === 'function') {
+            return prop(obj);
+        }
+        return null;
+    });
+
+    const filteredParts = parts.filter(
+        (part) => part !== null && part !== undefined && part !== ''
+    );
+
+    return filteredParts.join(', ');
+};
+
+const locationProperties = [
+    'postcode',
+    (obj) =>
+        obj.city
+            ? `${obj.city}${obj.province?.name ? `(${obj.province.name})` : ''}`
+            : null,
+    (obj) => obj.country?.name,
+];
+
+const modelValue = ref(
+    props.location ? formatLocation(props.location, locationProperties) : null
+);
+
+const handleModelValue = (data) => {
+    emit('update:model-value', data);
+};
 
 function showLabel(data) {
-    return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
+    const dataProperties = [
+        'code',
+        (obj) => (obj.town ? `${obj.town}(${obj.province})` : null),
+        'country',
+    ];
+    return formatLocation(data, dataProperties);
 }
 </script>
 <template>
     <VnSelectDialog
-        v-model="value"
-        option-value="code"
+        v-model="modelValue"
         option-filter-value="search"
-        :option-label="(opt) => showLabel(opt)"
+        :option-label="
+            (opt) => (typeof modelValue === 'string' ? modelValue : showLabel(opt))
+        "
         url="Postcodes/filter"
+        @update:model-value="handleModelValue"
         :use-like="false"
         :label="t('Location')"
         :placeholder="t('search_by_postalcode')"
@@ -27,7 +74,14 @@ function showLabel(data) {
         :emit-value="false"
     >
         <template #form>
-            <CreateNewPostcode @on-data-saved="(newValue) => (value = newValue)" />
+            <CreateNewPostcode
+                @on-data-saved="
+                    (newValue) => {
+                        modelValue = newValue;
+                        emit('update:model-value', newValue);
+                    }
+                "
+            />
         </template>
         <template #option="{ itemProps, opt }">
             <QItem v-bind="itemProps">

From ddf42d9659d2fc0678885921ec58d38293e4dc3c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 20 Sep 2024 13:46:07 +0200
Subject: [PATCH 014/131] feat: update VnLocation instances

---
 .../Customer/Card/CustomerFiscalData.vue      |  5 +-
 src/pages/Customer/CustomerCreate.vue         |  2 +-
 src/pages/Customer/CustomerList.vue           | 52 ++++++++++++++++---
 .../components/CustomerAddressCreate.vue      |  6 +--
 .../components/CustomerAddressEdit.vue        | 26 ++++++----
 .../Supplier/Card/SupplierAddressesCreate.vue | 13 ++++-
 .../Supplier/Card/SupplierFiscalData.vue      | 25 ++++++++-
 src/pages/Worker/WorkerList.vue               |  4 +-
 8 files changed, 106 insertions(+), 27 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 5cc656bb3..a66fd8712 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -93,8 +93,9 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
-                    :roles-allowed-to-create="['deliveryAssistant']"
-                    v-model="data.postcode"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
+                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
+                    :location="data"
                     @update:model-value="(location) => handleLocation(data, location)"
                 />
             </VnRow>
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 041c92d17..79da63283 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -86,7 +86,7 @@ function handleLocation(data, location) {
                 <VnRow>
                     <VnLocation
                         :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                     >
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 0dc7f09be..f6758bf4e 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -2,6 +2,7 @@
 import { ref, computed, markRaw } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
@@ -69,7 +70,7 @@ const columns = computed(() => [
             optionFilter: 'firstName',
             useLike: false,
         },
-        create: true,
+        create: false,
         columnField: {
             component: null,
         },
@@ -195,6 +196,8 @@ const columns = computed(() => [
         component: 'select',
         attrs: {
             url: 'BusinessTypes',
+            fields: ['code', 'description'],
+            sortBy: 'description ASC ',
             optionLabel: 'description',
             optionValue: 'code',
         },
@@ -353,12 +356,13 @@ const columns = computed(() => [
             {
                 title: t('Client ticket list'),
                 icon: 'vn:ticket',
-                action: redirectToCreateView,
+                action: redirectToTicketsList,
                 isPrimary: true,
             },
             {
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
+                isPrimary: true,
                 action: (row) => viewSummary(row.id, CustomerSummary),
             },
         ],
@@ -366,11 +370,12 @@ const columns = computed(() => [
 ]);
 
 const { viewSummary } = useSummaryDialog();
-const redirectToCreateView = (row) => {
+const redirectToTicketsList = (row) => {
     router.push({
         name: 'TicketList',
+
         query: {
-            params: JSON.stringify({
+            table: JSON.stringify({
                 clientFk: row.id,
             }),
         },
@@ -395,10 +400,10 @@ function handleLocation(data, location) {
     <VnTable
         ref="tableRef"
         data-key="Customer"
-        url="Clients/extendedListFilter"
+        url="Clients/filter"
         :create="{
             urlCreate: 'Clients/createWithUser',
-            title: 'Create client',
+            title: t('globals.pageTitles.customerCreate'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
             formInitialData: {
                 active: true,
@@ -411,8 +416,41 @@ function handleLocation(data, location) {
         auto-load
     >
         <template #more-create-dialog="{ data }">
+            <VnSelect
+                url="Workers/search"
+                v-model="data.salesPersonFk"
+                :label="t('customer.basicData.salesPerson')"
+                :params="{
+                    departmentCodes: ['VT', 'shopping'],
+                }"
+                :fields="['id', 'nickname']"
+                sort-by="nickname ASC"
+                :use-like="false"
+                emit-value
+                auto-load
+            >
+                <template #prepend>
+                    <VnAvatar
+                        :worker-id="data.salesPersonFk"
+                        color="primary"
+                        :title="title"
+                    />
+                </template>
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                            <QItemLabel caption
+                                >{{ scope.opt?.nickname }},
+                                {{ scope.opt?.code }}</QItemLabel
+                            >
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
+
             <VnLocation
-                :roles-allowed-to-create="['deliveryAssistant']"
+                :acls="[{ model: 'Province', props: '*', accessType: 'WRITE' }]"
                 v-model="data.location"
                 @update:model-value="(location) => handleLocation(data, location)"
             />
diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
index 30e4b21d0..7826c3579 100644
--- a/src/pages/Customer/components/CustomerAddressCreate.vue
+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
@@ -57,12 +57,12 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (agencyModes = data)"
         auto-load
         url="AgencyModes/isActive"
     />
-    <fetch-data @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
+    <FetchData @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
 
     <FormModel
         :form-initial-data="formInitialData"
@@ -92,7 +92,7 @@ function handleLocation(data, location) {
 
             <VnLocation
                 :rules="validate('Worker.postcode')"
-                :roles-allowed-to-create="['deliveryAssistant']"
+                :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                 v-model="data.location"
                 @update:model-value="(location) => handleLocation(data, location)"
             />
diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 7a4c44014..82a190ae1 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -113,18 +113,18 @@ function handleLocation(data, location) {
 </script>
 
 <template>
-    <fetch-data
+    <FetchData
         @on-fetch="(data) => (agencyModes = data)"
         auto-load
         url="AgencyModes/isActive"
     />
-    <fetch-data @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
-    <fetch-data
+    <FetchData @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
+    <FetchData
         @on-fetch="(data) => (customsAgents = data)"
         auto-load
         url="CustomsAgents"
     />
-    <fetch-data @on-fetch="getData" auto-load url="ObservationTypes" />
+    <FetchData @on-fetch="getData" auto-load url="ObservationTypes" />
 
     <FormModel
         :observe-form-changes="false"
@@ -176,8 +176,13 @@ function handleLocation(data, location) {
                 <div class="col">
                     <VnLocation
                         :rules="validate('Worker.postcode')"
-                        :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.postalCode"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
+                        :location="{
+                            postcode: data.postalCode,
+                            city: data.city,
+                            province: data.province,
+                            country: data.province.country,
+                        }"
                         @update:model-value="(location) => handleLocation(data, location)"
                     ></VnLocation>
                 </div>
@@ -267,16 +272,17 @@ function handleLocation(data, location) {
                 </div>
             </VnRow>
 
-            <QIcon
+            <QBtn
                 @click.stop="addNote()"
                 class="cursor-pointer add-icon q-mt-md"
-                name="add"
-                size="sm"
+                flat
+                icon="add"
+                shortcut="+"
             >
                 <QTooltip>
                     {{ t('Add note') }}
                 </QTooltip>
-            </QIcon>
+            </QBtn>
         </template>
     </FormModel>
 </template>
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index da6549a24..0feceb74a 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -21,6 +21,7 @@ const newAddressForm = reactive({
     provinceFk: null,
     phone: null,
     mobile: null,
+    province: null,
 });
 
 const onDataSaved = () => {
@@ -84,7 +85,17 @@ function handleLocation(data, location) {
                     <VnLocation
                         :rules="validate('Worker.postcode')"
                         :roles-allowed-to-create="['deliveryAssistant']"
-                        v-model="data.location"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
+                        :location="
+                            data.postalCode
+                                ? {
+                                      postcode: data.postalCode,
+                                      city: data.city,
+                                      province: data.province,
+                                      country: data.province.country,
+                                  }
+                                : null
+                        "
                         @update:model-value="(location) => handleLocation(data, location)"
                     >
                     </VnLocation>
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index bcce93e53..396cf15a2 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -51,6 +51,23 @@ function handleLocation(data, location) {
         :url="`Suppliers/${route.params.id}`"
         :url-update="`Suppliers/${route.params.id}/updateFiscalData`"
         model="supplier"
+        :filter="{
+            fields: ['id', 'name', 'city', 'postCode', 'countryFk', 'provinceFk'],
+            include: [
+                {
+                    relation: 'province',
+                    scope: {
+                        fields: ['id', 'name'],
+                    },
+                },
+                {
+                    relation: 'country',
+                    scope: {
+                        fields: ['id', 'name'],
+                    },
+                },
+            ],
+        }"
         auto-load
         :clear-store-on-unmount="false"
     >
@@ -130,7 +147,13 @@ function handleLocation(data, location) {
                 <VnLocation
                     :rules="validate('Worker.postcode')"
                     :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
-                    v-model="data.postCode"
+                    :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
+                    :location="{
+                        postcode: data.postCode,
+                        city: data.city,
+                        province: data.province,
+                        country: data.country,
+                    }"
                     @update:model-value="(location) => handleLocation(data, location)"
                 >
                 </VnLocation>
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 91d96a162..6b3b117b6 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -263,8 +263,8 @@ async function autofillBic(worker) {
                 <VnRow>
                     <VnLocation
                         :roles-allowed-to-create="['deliveryAssistant']"
+                        :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :options="postcodesOptions"
-                        v-model="data.location"
                         @update:model-value="(location) => handleLocation(data, location)"
                         :disable="data.isFreelance"
                     >
@@ -311,7 +311,7 @@ async function autofillBic(worker) {
                         option-label="name"
                         option-value="id"
                         hide-selected
-                        :roles-allowed-to-create="['salesAssistant', 'hr']"
+                        :acls="[{ model: 'BankEntity', props: '*', accessType: 'WRITE' }]"
                         :disable="data.isFreelance"
                         @update:model-value="autofillBic(data)"
                         :filter-options="['bic', 'name']"

From 6cc8ca6731e0b691d0862dad0953366a8bf32d08 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 20 Sep 2024 17:38:02 +0200
Subject: [PATCH 015/131] chore: refs #7702 add tests

---
 src/components/common/VnChangePassword.vue    |  6 +++++
 .../common/VnChangePassword.spec.js           | 26 ++++++++++++++-----
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/components/common/VnChangePassword.vue b/src/components/common/VnChangePassword.vue
index a36c6bcff..18f538fc3 100644
--- a/src/components/common/VnChangePassword.vue
+++ b/src/components/common/VnChangePassword.vue
@@ -19,6 +19,8 @@ const isLoading = ref(false);
 
 const validate = async () => {
     const { newPassword, repeatPassword } = passwords.value;
+    console.log('Validating passwords:', newPassword, repeatPassword);
+
     if (!newPassword) {
         notify(t('You must enter a new password'), 'negative');
         return;
@@ -29,11 +31,15 @@ const validate = async () => {
     }
     try {
         isLoading.value = true;
+        console.log('Calling submitFn with:', newPassword);
+
         await props.submitFn(newPassword);
         emit('onSubmit');
     } catch (e) {
+        console.error('submitFn failed:', e);
         notify('errors.writeRequest', 'negative');
     } finally {
+        console.log('Entering finally block');
         changePassDialog.value.hide();
         isLoading.value = false;
     }
diff --git a/test/vitest/__tests__/components/common/VnChangePassword.spec.js b/test/vitest/__tests__/components/common/VnChangePassword.spec.js
index a481efa81..e7a3bdcf7 100644
--- a/test/vitest/__tests__/components/common/VnChangePassword.spec.js
+++ b/test/vitest/__tests__/components/common/VnChangePassword.spec.js
@@ -1,11 +1,15 @@
-import { createWrapper } from 'app/test/vitest/helper';
+import { createWrapper, axios } from 'app/test/vitest/helper';
 import VnChangePassword from 'src/components/common/VnChangePassword.vue';
-import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
+import { vi, beforeEach, afterEach, beforeAll, describe, expect, it } from 'vitest';
+import { Notify } from 'quasar';
 
 describe('VnSmsDialog', () => {
     let vm;
 
     beforeAll(() => {
+        vi.spyOn(axios, 'get').mockResolvedValue({
+            data: [],
+        });
         vm = createWrapper(VnChangePassword, {
             propsData: {
                 submitFn: vi.fn(),
@@ -13,6 +17,10 @@ describe('VnSmsDialog', () => {
         }).vm;
     });
 
+    beforeEach(() => {
+        Notify.create = vi.fn();
+    });
+
     afterEach(() => {
         vi.clearAllMocks();
     });
@@ -20,10 +28,10 @@ describe('VnSmsDialog', () => {
     it('should notify when new password is empty', async () => {
         vm.passwords.newPassword = '';
         vm.passwords.repeatPassword = 'password';
-        vi.spyOn(vm, 'notify');
+
         await vm.validate();
-        expect(vm.notify).toHaveBeenCalledWith(
-            expect.arguments({
+        expect(Notify.create).toHaveBeenCalledWith(
+            expect.objectContaining({
                 message: 'You must enter a new password',
                 type: 'negative',
             })
@@ -33,9 +41,13 @@ describe('VnSmsDialog', () => {
     it("should notify when passwords don't match", async () => {
         vm.passwords.newPassword = 'password1';
         vm.passwords.repeatPassword = 'password2';
-        vi.spyOn(vm, 'notify');
         await vm.validate();
-        expect(vm.notify).toHaveBeenCalledWith("Passwords don't match", 'negative');
+        expect(Notify.create).toHaveBeenCalledWith(
+            expect.objectContaining({
+                message: `Passwords don't match`,
+                type: 'negative',
+            })
+        );
     });
 
     it('should call submitFn and emit onSubmit when passwords match', async () => {

From 7bbad14f53c74f7ae64b4f610aa7d24eb89da095 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 23 Sep 2024 11:38:27 +0200
Subject: [PATCH 016/131] feat: refs #7323 delete btn

---
 src/components/VnTable/VnTable.vue        |  2 ++
 src/pages/Worker/Card/WorkerBalance.vue   | 22 +++++++++++++++++-----
 src/pages/Worker/Card/WorkerFormation.vue | 20 ++++++++++++++++++++
 src/pages/Worker/Card/WorkerMedical.vue   | 13 +++++++++++++
 4 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index d87c08395..4aa49ce38 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -472,6 +472,7 @@ function handleOnDataSaved(_) {
                         auto-width
                         class="no-margin q-px-xs"
                         :class="[getColAlign(col), col.columnClass]"
+                        :style="col.style"
                         v-if="col.visible ?? true"
                         @click.ctrl="
                             ($event) =>
@@ -500,6 +501,7 @@ function handleOnDataSaved(_) {
                         :class="getColAlign(col)"
                         class="sticky no-padding"
                         @click="stopEventPropagation($event)"
+                        :style="col.style"
                     >
                         <QBtn
                             v-for="(btn, index) of col.actions"
diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue
index 037a65eaf..88fc7c1df 100644
--- a/src/pages/Worker/Card/WorkerBalance.vue
+++ b/src/pages/Worker/Card/WorkerBalance.vue
@@ -57,9 +57,21 @@ const columns = computed(() => [
         field: 'concept',
         cardVisible: true,
     },
+    {
+        align: 'right',
+        name: 'tableActions',
+        style: 'max-width: 20px; text-align: initial;',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
+                isPrimary: true,
+            },
+        ],
+    },
 ]);
 </script>
-
 <template>
     <VnTable
         ref="tableRef"
@@ -69,8 +81,8 @@ const columns = computed(() => [
         save-url="WorkerIncomes/crud"
         :create="{
             urlCreate: 'workerIncomes',
-            title: t('Create workerBalance'),
-            onDataSaved: () => tableRef.reload(),
+            title: t('Create balance'),
+            onDataSaved: () => $refs.tableRef.reload(),
             formInitialData: {
                 workerFk: entityId,
             },
@@ -81,10 +93,10 @@ const columns = computed(() => [
         :right-search="false"
         :is-editable="true"
         :use-model="true"
+        :default-remove="false"
     />
 </template>
-
 <i18n>
     es:
-        Create workerBalance: Crear balance
+        Create balance: Crear balance
 </i18n>
diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index 71c5cba5d..c11dd019e 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -96,10 +96,23 @@ const columns = computed(() => [
         label: t('worker.formation.tableVisibleColumns.hasDiploma'),
         create: true,
     },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
+                isPrimary: true,
+            },
+        ],
+    },
 ]);
 </script>
 <template>
     <VnTable
+        class="worker-formation"
         ref="tableRef"
         data-key="WorkerFormation"
         :url="`Workers/${entityId}/trainingCourse`"
@@ -120,8 +133,15 @@ const columns = computed(() => [
         :right-search="false"
         :is-editable="true"
         :use-model="true"
+        :default-remove="false"
     />
 </template>
+<style lang="scss" scoped>
+:global(.worker-formation thead > tr > th:nth-child(7)),
+:global(.worker-formation thead > tr > th:nth-child(8)) {
+    max-width: 50px;
+}
+</style>
 <i18n>
 es:
     Create training course: Crear curso de formación
diff --git a/src/pages/Worker/Card/WorkerMedical.vue b/src/pages/Worker/Card/WorkerMedical.vue
index 6bca4ae85..fab1416c9 100644
--- a/src/pages/Worker/Card/WorkerMedical.vue
+++ b/src/pages/Worker/Card/WorkerMedical.vue
@@ -65,6 +65,18 @@ const columns = [
         create: true,
         component: 'input',
     },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: async (row) => await tableRef.value.CrudModelRef.remove([row]),
+                isPrimary: true,
+            },
+        ],
+    },
 ];
 </script>
 <template>
@@ -87,5 +99,6 @@ const columns = [
         :right-search="false"
         :is-editable="true"
         :use-model="true"
+        :default-remove="false"
     />
 </template>

From f809e0fb317de0c4762cb684bc3bb58f870d8958 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 23 Sep 2024 12:55:39 +0200
Subject: [PATCH 017/131] fix: refs #7323 show prev month week color

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index fbfd4b28d..c6ca9d74a 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -326,16 +326,21 @@ const updateData = async () => {
 };
 
 const getMailStates = async (date) => {
+    const url = `WorkerTimeControls/${route.params.id}/getMailStates`;
+    const month = date.getMonth() + 1;
+    const prevMonth = month == 1 ? 12 : month - 1;
+    let prevMonthStates = [];
+
     const params = {
-        month: date.getMonth() + 1,
+        month,
         year: date.getFullYear(),
     };
 
-    const { data } = await axios.get(
-        `WorkerTimeControls/${route.params.id}/getMailStates`,
-        { params }
-    );
-    workerTimeControlMails.value = data;
+    const curMonthStates = (await axios.get(url, { params })).data;
+    prevMonthStates = (await axios.get(url, { params: { ...params, month: prevMonth } }))
+        .data;
+
+    workerTimeControlMails.value = curMonthStates.concat(prevMonthStates);
 };
 
 const showWorkerTimeForm = (propValue, formType) => {

From 2cb9899de14a5a9d1a3520c993dffc428b1cc0e6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 23 Sep 2024 15:38:54 +0200
Subject: [PATCH 018/131] feat: refs #7207 show queue

---
 src/pages/Worker/Card/WorkerSummary.vue | 1 +
 src/pages/Worker/locale/en.yml          | 1 +
 src/pages/Worker/locale/es.yml          | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 8fee52dd3..ed34e771d 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -139,6 +139,7 @@ onBeforeMount(async () => {
                         <VnLinkPhone :phone-number="worker?.sip?.extension" />
                     </template>
                 </VnLv>
+                <VnLv :label="t('queue')" :value="worker.sip?.queueMember?.queue" />
             </QCard>
         </template>
     </CardSummary>
diff --git a/src/pages/Worker/locale/en.yml b/src/pages/Worker/locale/en.yml
index 96df37919..96764ffd1 100644
--- a/src/pages/Worker/locale/en.yml
+++ b/src/pages/Worker/locale/en.yml
@@ -4,3 +4,4 @@ tableColumns:
     name: Name
     department: Department
     email: Email
+queue: Queue
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
index 41812345f..cf6bc3afe 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -9,3 +9,4 @@ tableColumns:
     name: Nombre
     department: Departamento
     email: Email
+queue: Cola

From b54d358617b3cfcd1f2e6c47c05696820af6ade4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 25 Sep 2024 09:14:35 +0200
Subject: [PATCH 019/131] fix: refs #7207 use right locale

---
 src/pages/InvoiceIn/InvoiceInFilter.vue | 2 +-
 src/pages/InvoiceIn/locale/es.yml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index bf4e023a9..b19e047fa 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -170,7 +170,7 @@ es:
         awb: AWB
         amount: Importe
         issued: Emitida
-        isBooked: Conciliada
+        isBooked: Contabilizada
         account: Cuenta contable
         created: Creada
         dued: Vencida
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index 944708364..2d3b137f4 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -7,7 +7,7 @@ invoiceIn:
         shortIssued: F. emisión
         file: Fichero
         issued: Fecha emisión
-        isBooked: Conciliada
+        isBooked: Contabilizada
         awb: AWB
         amount: Importe
     card:

From 45b3ed6e17ce1c3d6b70fea9a62d29cbd516776e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 25 Sep 2024 09:53:06 +0200
Subject: [PATCH 020/131] fix: refs #7207 te2e

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

diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index 8192b7c7c..cc3a1d65a 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -1,7 +1,7 @@
 /// <reference types="cypress" />
 describe('Ticket descriptor', () => {
-    const toCloneOpt = '[role="menu"] .q-list > :nth-child(5)';
-    const setWeightOpt = '[role="menu"] .q-list > :nth-child(6)';
+    const toCloneOpt = '[role="menu"] .q-list > :nth-child(8)';
+    const setWeightOpt = '[role="menu"] .q-list > :nth-child(13)';
     const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
     const summaryHeader = '.summaryHeader > div';
     const weight = 25;

From 77ad96a58b3f29e47b23caebf1ff05cf075f4dac Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 25 Sep 2024 11:30:18 +0200
Subject: [PATCH 021/131] fix: itemfixedPrice inputs

---
 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 fb180f0198e8b1753d11bd2494591c661173b260 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 25 Sep 2024 11:31:05 +0200
Subject: [PATCH 022/131] fix: apply order

---
 src/pages/Item/ItemFixedPrice.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index bd8c4b78c..fddf154a2 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -36,23 +36,23 @@ const user = state.getUser();
 const fixedPrices = ref([]);
 const warehousesOptions = ref([]);
 const rowsSelected = ref([]);
-
 const itemFixedPriceFilterRef = ref();
-
 const params = reactive({});
-const defaultColumnAttrs = {
-    align: 'left',
-    sortable: true,
-};
+
 onMounted(async () => {
     stateStore.rightDrawer = true;
     params.warehouseFk = user.value.warehouseFk;
 });
 onUnmounted(() => (stateStore.rightDrawer = false));
+
+const defaultColumnAttrs = {
+    align: 'left',
+    sortable: true,
+};
 const columns = computed(() => [
     {
-        label: t('item.fixedPrice.itemId'),
-        name: 'itemId',
+        label: t('item.fixedPrice.itemFk'),
+        name: 'itemFk',
         ...defaultColumnAttrs,
         isId: true,
         cardVisible: true,
@@ -426,7 +426,7 @@ function handleOnDataSave({ CrudModelRef }) {
             :default-save="false"
             data-key="ItemFixedPrices"
             url="FixedPrices/filter"
-            :order="['itemFk ASC']"
+            :order="['description DESC']"
             save-url="FixedPrices/crud"
             :user-params="{ warehouseFk: user.warehouseFk }"
             ref="tableRef"
@@ -460,7 +460,7 @@ function handleOnDataSave({ CrudModelRef }) {
                 <QCheckbox flat v-model="scope.selected" />
             </template>
 
-            <template #column-itemId="props">
+            <template #column-itemFk="props">
                 <VnSelect
                     style="max-width: 100px"
                     url="Items/withName"

From 53d5d123c2ce7c6604eb8eba629c259600bc6887 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 25 Sep 2024 11:36:44 +0200
Subject: [PATCH 023/131] feat: i18n

---
 src/i18n/locale/en.yml | 2 +-
 src/i18n/locale/es.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 1d1a287c2..f2ef57f05 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1184,7 +1184,7 @@ item:
         producer: Producer
         landed: Landed
     fixedPrice:
-        itemId: Item ID
+        itemFk: Item ID
         groupingPrice: Grouping price
         packingPrice: Packing price
         hasMinPrice: Has min price
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index db717824a..924a50bfd 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1168,7 +1168,7 @@ item:
         producer: Productor
         landed: F. entrega
     fixedPrice:
-        itemId: ID Artículo
+        itemFk: ID Artículo
         groupingPrice: Precio grouping
         packingPrice: Precio packing
         hasMinPrice: Tiene precio mínimo

From 68ebda625b9594229837e2bbb331d0f2787b53ec Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 25 Sep 2024 14:02:11 +0200
Subject: [PATCH 024/131] fix: refs #7874 refs #6943 ui

---
 .../components/CustomerAddressEdit.vue        | 58 +++++++++----------
 1 file changed, 26 insertions(+), 32 deletions(-)

diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 606867388..1e5387815 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -240,39 +240,33 @@ function handleLocation(data, location) {
                 class="row q-gutter-md q-mb-md"
                 v-for="(note, index) in notes"
             >
-                <div class="col">
-                    <VnSelect
-                        :label="t('Observation type')"
-                        :options="observationTypes"
-                        hide-selected
-                        option-label="description"
-                        option-value="id"
-                        v-model="note.observationTypeFk"
-                    />
-                </div>
-                <div class="col">
-                    <VnInput
-                        :label="t('Description')"
-                        :rules="validate('route.description')"
-                        clearable
-                        v-model="note.description"
-                    />
-                </div>
-                <div class="flex items-center">
-                    <QIcon
-                        @click.stop="deleteNote(note.id, index)"
-                        class="cursor-pointer"
-                        color="primary"
-                        name="delete"
-                        size="sm"
-                    >
-                        <QTooltip>
-                            {{ t('Remove note') }}
-                        </QTooltip>
-                    </QIcon>
-                </div>
+                <VnSelect
+                    :label="t('Observation type')"
+                    :options="observationTypes"
+                    hide-selected
+                    option-label="description"
+                    option-value="id"
+                    v-model="note.observationTypeFk"
+                />
+                <VnInput
+                    :label="t('Description')"
+                    :rules="validate('route.description')"
+                    clearable
+                    v-model="note.description"
+                />
+                <QIcon
+                    :style="{ flex: 0, 'align-self': $q.screen.gt.xs ? 'end' : 'center' }"
+                    @click.stop="deleteNote(note.id, index)"
+                    class="cursor-pointer"
+                    color="primary"
+                    name="delete"
+                    size="sm"
+                >
+                    <QTooltip>
+                        {{ t('Remove note') }}
+                    </QTooltip>
+                </QIcon>
             </VnRow>
-
             <QBtn
                 @click.stop="addNote()"
                 class="cursor-pointer add-icon q-mt-md"

From 709a662ceb2e3d600a37676a02049ebf089611c7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 09:08:12 +0200
Subject: [PATCH 025/131] feat: refs #7874  select observation type

---
 src/components/ui/VnNotes.vue             | 117 +++++++++++++++-------
 src/pages/Customer/Card/CustomerNotes.vue |   1 +
 2 files changed, 81 insertions(+), 37 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index bf5e86a16..143cd2bf9 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { ref } from 'vue';
+import { ref, reactive } from 'vue';
 import { onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -12,36 +12,39 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnUserLink from 'components/ui/VnUserLink.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnAvatar from 'components/ui/VnAvatar.vue';
+import VnRow from './VnRow.vue';
+import VnSelect from '../common/VnSelect.vue';
+import FetchData from '../FetchData.vue';
+import VnInput from '../common/VnInput.vue';
 
 const $props = defineProps({
     url: { type: String, default: null },
     filter: { type: Object, default: () => {} },
     body: { type: Object, default: () => {} },
     addNote: { type: Boolean, default: false },
+    selectType: { type: Boolean, default: false },
 });
 
 const { t } = useI18n();
 const state = useState();
 const quasar = useQuasar();
 const currentUser = ref(state.getUser());
-const newNote = ref('');
+const newNote = reactive({ text: '', observationTypeFk: null });
+const observationTypes = ref([]);
 const vnPaginateRef = ref();
-function handleKeyUp(event) {
-    if (event.key === 'Enter') {
-        event.preventDefault();
-        if (!event.shiftKey) insert();
-    }
-}
+
 async function insert() {
     const body = $props.body;
-    const newBody = { ...body, ...{ text: newNote.value } };
+    const newBody = {
+        ...body,
+        ...{ text: newNote.text, observationTypeFk: newNote.observationTypeFk },
+    };
     await axios.post($props.url, newBody);
     await vnPaginateRef.value.fetch();
-    newNote.value = '';
 }
 
 onBeforeRouteLeave((to, from, next) => {
-    if (newNote.value)
+    if (newNote.text)
         quasar.dialog({
             component: VnConfirm,
             componentProps: {
@@ -54,6 +57,12 @@ onBeforeRouteLeave((to, from, next) => {
 });
 </script>
 <template>
+    <FetchData
+        url="ObservationTypes"
+        :filter="{ fields: ['id', 'description'] }"
+        :auto-load="selectType"
+        @on-fetch="(data) => observationTypes.push(...data)"
+    />
     <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
         <QCardSection horizontal>
             <VnAvatar :worker-id="currentUser.id" size="md" />
@@ -62,29 +71,38 @@ onBeforeRouteLeave((to, from, next) => {
                 {{ t('globals.now') }}
             </div>
         </QCardSection>
-        <QCardSection class="q-pa-xs q-my-none q-py-none" horizontal>
-            <QInput
-                v-model="newNote"
-                class="full-width"
-                type="textarea"
-                :label="t('Add note here...')"
-                filled
-                size="lg"
-                autogrow
-                autofocus
-                @keyup="handleKeyUp"
-                clearable
-            >
-                <template #append>
-                    <QBtn
-                        :title="t('Save (Enter)')"
-                        icon="save"
-                        color="primary"
-                        flat
-                        @click="insert"
-                    />
-                </template>
-            </QInput>
+        <QCardSection class="q-px-xs q-my-none q-py-none">
+            <VnRow class="full-width">
+                <VnSelect
+                    :label="t('Observation type')"
+                    v-if="selectType"
+                    url="ObservationTypes"
+                    v-model="newNote.observationTypeFk"
+                    option-label="description"
+                    style="flex: 0.15; margin-left: 0"
+                />
+                <VnInput
+                    v-model.trim="newNote.text"
+                    type="textarea"
+                    :label="t('Add note here...')"
+                    filled
+                    size="lg"
+                    autogrow
+                    autofocus
+                    @keyup.enter="insert"
+                    clearable
+                >
+                    <template #append>
+                        <QBtn
+                            :title="t('Save (Enter)')"
+                            icon="save"
+                            color="primary"
+                            flat
+                            @click="insert"
+                        />
+                    </template>
+                </VnInput>
+            </VnRow>
         </QCardSection>
     </QCard>
     <VnPaginate
@@ -98,6 +116,10 @@ onBeforeRouteLeave((to, from, next) => {
         class="show"
         v-bind="$attrs"
         search-url="notes"
+        @on-fetch="
+            newNote.text = '';
+            newNote.observationTypeFk = null;
+        "
     >
         <template #body="{ rows }">
             <TransitionGroup name="list" tag="div" class="column items-center full-width">
@@ -111,17 +133,38 @@ onBeforeRouteLeave((to, from, next) => {
                             :descriptor="false"
                             :worker-id="note.workerFk"
                             size="md"
+                            :title="note.worker?.user.nickname"
                         />
                         <div class="full-width row justify-between q-pa-xs">
                             <VnUserLink
                                 :name="`${note.worker.user.nickname}`"
                                 :worker-id="note.worker.id"
                             />
-                            {{ toDateHourMin(note.created) }}
+                            <span v-text="toDateHourMin(note.created)" />
                         </div>
                     </QCardSection>
                     <QCardSection class="q-pa-xs q-my-none q-py-none">
-                        {{ note.text }}
+                        <VnRow>
+                            <VnSelect
+                                :label="t('Observation type')"
+                                v-if="selectType && note.observationTypeFk"
+                                url="ObservationTypes"
+                                v-model="note.observationTypeFk"
+                                option-label="description"
+                                style="flex: 0.15"
+                                dense
+                                readonly
+                                :is-clearable="false"
+                            />
+                            <span
+                                :style="{
+                                    flex: 0.85,
+                                    'align-self':
+                                        selectType & $q.screen.gt.xs ? 'end' : 'baseline',
+                                }"
+                                v-text="note.text"
+                            />
+                        </VnRow>
                     </QCardSection>
                 </QCard>
             </TransitionGroup>
@@ -156,5 +199,5 @@ onBeforeRouteLeave((to, from, next) => {
         Add note here...: Añadir nota aquí...
         New note: Nueva nota
         Save (Enter): Guardar (Intro)
-
+        Observation type: Tipo de observación
 </i18n>
diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue
index a9121f7f5..b85174696 100644
--- a/src/pages/Customer/Card/CustomerNotes.vue
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@@ -22,5 +22,6 @@ const noteFilter = computed(() => {
         :filter="noteFilter"
         :body="{ clientFk: route.params.id }"
         style="overflow-y: auto"
+        :select-type="true"
     />
 </template>

From e827d3aabfb3b03b39e01593bb2af12b4f443016 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 09:47:54 +0200
Subject: [PATCH 026/131] fix: refs #7323 rollback

---
 src/pages/Worker/WorkerFilter.vue |  5 -----
 src/pages/Worker/WorkerList.vue   | 20 +-------------------
 src/pages/Worker/locale/en.yml    |  2 +-
 src/pages/Worker/locale/es.yml    |  2 +-
 4 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue
index 61120f448..dfb5659fe 100644
--- a/src/pages/Worker/WorkerFilter.vue
+++ b/src/pages/Worker/WorkerFilter.vue
@@ -84,11 +84,6 @@ const getLocale = (label) => {
                     />
                 </QItemSection>
             </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput :label="t('SSN')" v-model="params.SSN" is-outlined />
-                </QItemSection>
-            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput :label="t('Email')" v-model="params.email" is-outlined />
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index a5281b651..3ca0d0c24 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -40,7 +40,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'firstName',
-        label: t('tableColumns.name'),
+        label: t('tableColumns.firstName'),
         isTitle: true,
         columnFilter: {
             name: 'firstName',
@@ -78,24 +78,6 @@ const columns = computed(() => [
         },
         format: (row, dashIfEmpty) => dashIfEmpty(row.department),
     },
-    {
-        align: 'left',
-        name: 'fi',
-        label: t('tableColumns.fi'),
-        isTitle: true,
-        columnFilter: {
-            name: 'fi',
-        },
-    },
-    {
-        align: 'left',
-        name: 'SSN',
-        label: t('tableColumns.SSN'),
-        isTitle: true,
-        columnFilter: {
-            name: 'SSN',
-        },
-    },
     {
         align: 'left',
         name: 'email',
diff --git a/src/pages/Worker/locale/en.yml b/src/pages/Worker/locale/en.yml
index 7081e8fd0..865e86e7e 100644
--- a/src/pages/Worker/locale/en.yml
+++ b/src/pages/Worker/locale/en.yml
@@ -1,7 +1,7 @@
 passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
 tableColumns:
     id: ID
-    name: Name
+    firstName: First name
     lastName: Last Name
     userName: User Name
     department: Department
diff --git a/src/pages/Worker/locale/es.yml b/src/pages/Worker/locale/es.yml
index 61694dc83..b3c093ec5 100644
--- a/src/pages/Worker/locale/es.yml
+++ b/src/pages/Worker/locale/es.yml
@@ -6,7 +6,7 @@ External: Externo
 passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
 tableColumns:
     id: ID
-    name: Nombre
+    firstName: Nombre
     lastName: Apellidos
     userName: Nombre de usuario
     department: Departamento

From c2b52473a12da9e856a3baa1889ba6702286c8fe Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 10:04:16 +0200
Subject: [PATCH 027/131] fix: refs #7323 align tables

---
 src/pages/Monitor/MonitorOrders.vue | 56 +++++++++++++++--------------
 1 file changed, 29 insertions(+), 27 deletions(-)

diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue
index 52d442d0a..853a6edc9 100644
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@@ -139,33 +139,35 @@ const openTab = (id) =>
         :disable-option="{ card: true }"
     >
         <template #top-left>
-            <QBtn
-                icon="refresh"
-                size="md"
-                color="primary"
-                dense
-                flat
-                @click="$refs.table.reload()"
-            >
-                <QTooltip>{{ $t('globals.refresh') }}</QTooltip>
-            </QBtn>
-            <QBtn
-                v-if="selectedRows.length"
-                icon="delete"
-                size="md"
-                dense
-                flat
-                color="primary"
-                @click="
-                    openConfirmationModal(
-                        $t('salesOrdersTable.deleteConfirmTitle'),
-                        $t('salesOrdersTable.deleteConfirmMessage'),
-                        removeOrders
-                    )
-                "
-            >
-                <QTooltip>{{ t('salesOrdersTable.delete') }}</QTooltip>
-            </QBtn>
+            <div class="q-mt-sm">
+                <QBtn
+                    icon="refresh"
+                    size="md"
+                    color="primary"
+                    dense
+                    flat
+                    @click="$refs.table.reload()"
+                >
+                    <QTooltip>{{ $t('globals.refresh') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    v-if="selectedRows.length"
+                    icon="delete"
+                    size="md"
+                    dense
+                    flat
+                    color="primary"
+                    @click="
+                        openConfirmationModal(
+                            $t('salesOrdersTable.deleteConfirmTitle'),
+                            $t('salesOrdersTable.deleteConfirmMessage'),
+                            removeOrders
+                        )
+                    "
+                >
+                    <QTooltip>{{ t('salesOrdersTable.delete') }}</QTooltip>
+                </QBtn>
+            </div>
         </template>
         <template #column-dateSend="{ row }">
             <QTd>

From c5766aa1b346f8a4011b5b84b93136137a1a9751 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 12:38:03 +0200
Subject: [PATCH 028/131] chore: refs #7524 remove old filter

---
 src/pages/Customer/Defaulter/CustomerDefaulter.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 11f6362f8..7b9cb67f7 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -3,7 +3,6 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { toCurrency, toDate, dateRange } from 'filters/index';
-import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
 import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
@@ -11,7 +10,6 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
@@ -192,11 +190,6 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <RightMenu>
-        <template #right-panel>
-            <CustomerNotificationsFilter data-key="CustomerDefaulter" />
-        </template>
-    </RightMenu>
     <VnSubToolbar>
         <template #st-data>
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />

From f00db79d476a366253731ca0817318328994d215 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 26 Sep 2024 14:14:27 +0200
Subject: [PATCH 029/131] fix(VnTable): header background-color

---
 src/components/VnTable/VnTable.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 10b55f9f5..9dcbc5542 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -749,6 +749,10 @@ es:
     border-color: var(--vn-section-color);
 }
 
+.q-table__container > div:first-child {
+    background-color: var(--vn-page-color);
+}
+
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));

From bbf3b6d4b799c256c68608d6015f3f906a9b5851 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 26 Sep 2024 12:29:03 +0000
Subject: [PATCH 030/131] fix: #6943 show nickname salesPerson

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

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 79ae79ad9..d31669b43 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -18,6 +18,7 @@ const contactChannels = ref([]);
 const title = ref();
 const handleSalesModelValue = (val) => ({
     or: [
+        { id: val },
         { name: val },
         { nickname: { like: '%' + val + '%' } },
         { code: { like: `${val}%` } },

From 01b62adba95bb60a55a826126e173ccd2f1c7949 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 14:30:19 +0200
Subject: [PATCH 031/131] fix: refs #7524 dynamic fetch

---
 .../Travel/Card/TravelThermographsForm.vue    | 23 +++++--------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 1d3410903..3c7c98d4d 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -30,18 +30,9 @@ const router = useRouter();
 const state = useState();
 const { notify } = useNotify();
 
-const thermographFilter = {
-    fields: ['id', 'thermographFk'],
-    where: {
-        or: [{ travelFk: null }, { travelFk: route.params.id }],
-    },
-    order: 'thermographFk ASC',
-};
-
 const fetchTravelThermographsRef = ref(null);
 const allowedContentTypes = ref('');
 const user = state.getUser();
-const thermographsOptions = ref([]);
 const dmsTypesOptions = ref([]);
 const companiesOptions = ref([]);
 const warehousesOptions = ref([]);
@@ -172,13 +163,6 @@ const onThermographCreated = async (data) => {
         auto-load
         url="Temperatures"
     />
-    <FetchData
-        ref="fetchTravelThermographsRef"
-        url="TravelThermographs"
-        @on-fetch="(data) => (thermographsOptions = data)"
-        :filter="thermographFilter"
-        auto-load
-    />
     <QPage class="column items-center full-width">
         <QForm
             model="travel"
@@ -214,7 +198,12 @@ const onThermographCreated = async (data) => {
                     <VnSelectDialog
                         :label="t('travel.thermographs.thermograph')"
                         v-model="thermographForm.travelThermographFk"
-                        :options="thermographsOptions"
+                        url="TravelThermographs"
+                        :fields="['id', 'thermographFk']"
+                        :where="{
+                            or: [{ travelFk: null }, { travelFk: $route.params.id }],
+                        }"
+                        sort-by="thermographFk ASC"
                         option-label="thermographFk"
                         :disable="viewAction === 'edit'"
                         :tooltip="t('New thermograph')"

From 18ea23adf16afa52668a4d0750a0024bbe6f0b42 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 15:03:22 +0200
Subject: [PATCH 032/131] refactor: refs #7323 pr request

---
 src/i18n/locale/en.yml                      | 1 +
 src/i18n/locale/es.yml                      | 2 ++
 src/pages/Monitor/MonitorOrders.vue         | 2 +-
 src/pages/Monitor/locale/en.yml             | 1 -
 src/pages/Monitor/locale/es.yml             | 1 -
 src/pages/Worker/Card/WorkerBalance.vue     | 2 +-
 src/pages/Worker/Card/WorkerTimeControl.vue | 7 +++----
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 05ce8dcdf..6134f8c9e 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -303,6 +303,7 @@ globals:
         email: Email
         SSN: SSN
         fi: FI
+    deleteConfirmTitle: Delete selected elements
 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 7e299f70a..db9e3b578 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -307,6 +307,8 @@ globals:
         email: Correo
         SSN: NSS
         fi: NIF
+    deleteConfirmTitle: Eliminar los elementos seleccionados
+
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue
index 853a6edc9..fac601735 100644
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@@ -159,7 +159,7 @@ const openTab = (id) =>
                     color="primary"
                     @click="
                         openConfirmationModal(
-                            $t('salesOrdersTable.deleteConfirmTitle'),
+                            $t('globals.deleteConfirmTitle'),
                             $t('salesOrdersTable.deleteConfirmMessage'),
                             removeOrders
                         )
diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml
index 4cdd245aa..b8082f02a 100644
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@@ -15,7 +15,6 @@ salesOrdersTable:
     dateMake: Make date
     client: Client
     salesPerson: Salesperson
-    deleteConfirmTitle: Delete selected elements
     deleteConfirmMessage: All the selected elements will be deleted. Are you sure you want to continue?
     agency: Agency
     import: Import
diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml
index 8087bb444..4ee5b90a9 100644
--- a/src/pages/Monitor/locale/es.yml
+++ b/src/pages/Monitor/locale/es.yml
@@ -15,7 +15,6 @@ salesOrdersTable:
     dateMake: Fecha de realización
     client: Cliente
     salesPerson: Comercial
-    deleteConfirmTitle: Eliminar los elementos seleccionados
     deleteConfirmMessage: Todos los elementos seleccionados serán eliminados. ¿Seguro que quieres continuar?
     agency: Agencia
     import: Importe
diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue
index 88fc7c1df..c5367a281 100644
--- a/src/pages/Worker/Card/WorkerBalance.vue
+++ b/src/pages/Worker/Card/WorkerBalance.vue
@@ -82,7 +82,7 @@ const columns = computed(() => [
         :create="{
             urlCreate: 'workerIncomes',
             title: t('Create balance'),
-            onDataSaved: () => $refs.tableRef.reload(),
+            onDataSaved: () => tableRef.reload(),
             formInitialData: {
                 workerFk: entityId,
             },
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index c6ca9d74a..39fb536b6 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -329,16 +329,15 @@ const getMailStates = async (date) => {
     const url = `WorkerTimeControls/${route.params.id}/getMailStates`;
     const month = date.getMonth() + 1;
     const prevMonth = month == 1 ? 12 : month - 1;
-    let prevMonthStates = [];
-
     const params = {
         month,
         year: date.getFullYear(),
     };
 
     const curMonthStates = (await axios.get(url, { params })).data;
-    prevMonthStates = (await axios.get(url, { params: { ...params, month: prevMonth } }))
-        .data;
+    const prevMonthStates = (
+        await axios.get(url, { params: { ...params, month: prevMonth } })
+    ).data;
 
     workerTimeControlMails.value = curMonthStates.concat(prevMonthStates);
 };

From 7eb951ef13b1547f8f373c54868b2b407580c33c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 15:28:00 +0200
Subject: [PATCH 033/131] fix: refs #7323 use right locale

---
 src/i18n/locale/en.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 7127ab20c..62023886d 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -810,14 +810,14 @@ worker:
         bankEntity: Swift / BIC
     formation:
         tableVisibleColumns:
-            course: Curso
-            startDate: Fecha Inicio
-            endDate: Fecha Fin
-            center: Centro Formación
-            invoice: Factura
-            amount: Importe
-            remark: Bonficado
-            hasDiploma: Diploma
+            course: Course
+            startDate: Start date
+            endDate: End date
+            center: Training center
+            invoice: Invoice
+            amount: Amount
+            remark: Remark
+            hasDiploma: Has diploma
     medical:
         tableVisibleColumns:
             date: Date

From 353116a7a0a93e5c612344731c527f401a974aa8 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 15:49:12 +0200
Subject: [PATCH 034/131] fix: split params

---
 src/components/common/VnLog.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index ab522cfde..8c71c0997 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -406,6 +406,7 @@ watch(
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
+        search-url="logs"
     >
         <template #body>
             <div

From 71201f1007560845041f5010ba6aa7c04f3ecff2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 17:19:05 +0200
Subject: [PATCH 035/131] feat: refs #7874 required fields banner

---
 src/components/ui/VnNotes.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 143cd2bf9..6ae8538e2 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -42,7 +42,6 @@ async function insert() {
     await axios.post($props.url, newBody);
     await vnPaginateRef.value.fetch();
 }
-
 onBeforeRouteLeave((to, from, next) => {
     if (newNote.text)
         quasar.dialog({
@@ -80,6 +79,8 @@ onBeforeRouteLeave((to, from, next) => {
                     v-model="newNote.observationTypeFk"
                     option-label="description"
                     style="flex: 0.15; margin-left: 0"
+                    :required="true"
+                    @keyup.enter.stop="insert"
                 />
                 <VnInput
                     v-model.trim="newNote.text"
@@ -88,9 +89,9 @@ onBeforeRouteLeave((to, from, next) => {
                     filled
                     size="lg"
                     autogrow
-                    autofocus
-                    @keyup.enter="insert"
+                    @keyup.enter.stop="insert"
                     clearable
+                    :required="true"
                 >
                     <template #append>
                         <QBtn

From 6b0a0f71ce65368ee9784ae770e9c6fcdc4ca55d Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 27 Sep 2024 08:24:58 +0200
Subject: [PATCH 036/131] fix: fixed change state function

---
 src/pages/Ticket/Card/TicketSummary.vue | 64 ++++++++++++-------------
 1 file changed, 30 insertions(+), 34 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 3851bf5d6..143ab9ad7 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { onMounted, ref, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { dashIfEmpty, toDate, toCurrency } from 'src/filters';
@@ -11,13 +11,15 @@ import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescripto
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { getUrl } from 'src/composables/getUrl';
+import useNotify from 'src/composables/useNotify.js';
+import { useArrayData } from 'composables/useArrayData';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
-const router = useRouter();
-
+const { notify } = useNotify();
 const { t } = useI18n();
 
 const $props = defineProps({
@@ -36,6 +38,8 @@ const salesLines = ref(null);
 const editableStates = ref([]);
 const ticketUrl = ref();
 const grafanaUrl = 'https://grafana.verdnatura.es';
+const stateBtnDropdownRef = ref();
+const descriptorData = useArrayData('ticketData');
 
 onMounted(async () => {
     ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
@@ -68,15 +72,19 @@ function isEditable() {
 }
 
 async function changeState(value) {
-    if (!ticket.value.id) return;
-
-    const formData = {
-        ticketFk: ticket.value.id,
-        code: value,
-    };
-
-    await axios.post(`Tickets/state`, formData);
-    router.go(route.fullPath);
+    try {
+        stateBtnDropdownRef.value.hide();
+        const formData = {
+            ticketFk: entityId.value,
+            code: value,
+        };
+        await axios.post(`Tickets/state`, formData);
+        notify('globals.dataSaved', 'positive');
+        summaryRef.value?.fetch();
+        descriptorData.fetch({});
+    } catch (err) {
+        console.error('Error changing ticket state', err);
+    }
 }
 </script>
 
@@ -102,33 +110,21 @@ async function changeState(value) {
         </template>
         <template #header-right>
             <QBtnDropdown
-                side
-                top
+                ref="stateBtnDropdownRef"
                 color="black"
                 text-color="white"
                 :label="t('ticket.summary.changeState')"
                 :disable="!isEditable()"
             >
-                <QList>
-                    <QVirtualScroll
-                        style="max-height: 300px"
-                        :items="editableStates"
-                        separator
-                        v-slot="{ item, index }"
-                    >
-                        <QItem
-                            :key="index"
-                            dense
-                            clickable
-                            v-close-popup
-                            @click="changeState(item.code)"
-                        >
-                            <QItemSection>
-                                <QItemLabel>{{ item.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QVirtualScroll>
-                </QList>
+                <VnSelect
+                    :options="editableStates"
+                    hide-selected
+                    option-label="name"
+                    option-value="code"
+                    hide-dropdown-icon
+                    focus-on-mount
+                    @update:model-value="changeState"
+                />
             </QBtnDropdown>
         </template>
         <template #body>

From 2990d32705557eb71b515042f22ba1efc932c4e6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 27 Sep 2024 07:56:50 +0000
Subject: [PATCH 037/131] fix: grafana url

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

diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index da50ba239..87a7f2c75 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -12,6 +12,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 const route = useRoute();
 const { t } = useI18n();
+const grafanaUrl = 'https://grafana.verdnatura.es';
 
 const $props = defineProps({
     id: {

From b541ce4e5608adf3b08f0fa8f15aaa7e77f43074 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 26 Sep 2024 15:49:12 +0200
Subject: [PATCH 038/131] fix: split params

---
 src/components/common/VnLog.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index ab522cfde..8c71c0997 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -406,6 +406,7 @@ watch(
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
+        search-url="logs"
     >
         <template #body>
             <div

From 193670fdcf829cc9589261b426e5ebeea7dcd111 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 27 Sep 2024 12:39:30 +0200
Subject: [PATCH 039/131] fix: refs #7404 revert commit prevent production
 access

---
 src/router/modules/entry.js | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 4750a4301..d66ea0e0c 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -58,15 +58,6 @@ export default {
                     },
                     component: () => import('src/pages/Entry/EntryLatestBuys.vue'),
                 },
-                {
-                    path: 'stock-Bought',
-                    name: 'EntryStockBought',
-                    meta: {
-                        title: 'reserves',
-                        icon: 'deployed_code_history',
-                    },
-                    component: () => import('src/pages/Entry/EntryStockBought.vue'),
-                },
             ],
         },
         {

From 336f2ba89e793a01765db588ae7bb5e55a82b604 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 27 Sep 2024 12:41:00 +0200
Subject: [PATCH 040/131] fix: refs #7404 remove from test

---
 src/pages/Entry/EntryStockBought.vue          | 293 ------------------
 src/pages/Entry/EntryStockBoughtDetail.vue    | 129 --------
 src/pages/Entry/EntryStockBoughtFilter.vue    |  63 ----
 .../integration/entry/stockBought.spec.js     |  39 ---
 4 files changed, 524 deletions(-)
 delete mode 100644 src/pages/Entry/EntryStockBought.vue
 delete mode 100644 src/pages/Entry/EntryStockBoughtDetail.vue
 delete mode 100644 src/pages/Entry/EntryStockBoughtFilter.vue
 delete mode 100644 test/cypress/integration/entry/stockBought.spec.js

diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
deleted file mode 100644
index 4750a8417..000000000
--- a/src/pages/Entry/EntryStockBought.vue
+++ /dev/null
@@ -1,293 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useState } from 'src/composables/useState';
-import { useQuasar } from 'quasar';
-
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import FetchData from 'components/FetchData.vue';
-import FormModelPopup from 'components/FormModelPopup.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
-import EntryStockBoughtFilter from './EntryStockBoughtFilter.vue';
-import VnTable from 'components/VnTable/VnTable.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import EntryStockBoughtDetail from 'src/pages/Entry/EntryStockBoughtDetail.vue';
-
-const { t } = useI18n();
-const quasar = useQuasar();
-const state = useState();
-const user = state.getUser();
-const columns = [
-    {
-        align: 'left',
-        label: 'Id',
-        name: 'id',
-        isId: true,
-        columnFilter: false,
-        visible: false,
-    },
-    {
-        align: 'left',
-        name: 'workerFk',
-        label: t('Buyer'),
-        isTitle: true,
-        component: 'select',
-        cardVisible: true,
-        create: true,
-        attrs: {
-            url: 'Workers/activeWithInheritedRole',
-            fields: ['id', 'name'],
-            where: { role: 'buyer' },
-            optionFilter: 'firstName',
-            optionLabel: 'name',
-            optionValue: 'id',
-            useLike: false,
-        },
-    },
-    {
-        align: 'left',
-        label: t('Reserve'),
-        name: 'reserve',
-        columnFilter: false,
-        create: true,
-        component: 'number',
-        summation: true,
-    },
-    {
-        align: 'center',
-        label: t('Bought'),
-        name: 'bought',
-        summation: true,
-        cardVisible: true,
-        columnFilter: false,
-    },
-    {
-        align: 'left',
-        label: t('Date'),
-        name: 'dated',
-        component: 'date',
-        visible: false,
-        create: true,
-    },
-    {
-        align: 'left',
-        name: 'tableActions',
-        actions: [
-            {
-                title: t('More'),
-                icon: 'search',
-                isPrimary: true,
-                action: (row) => {
-                    quasar.dialog({
-                        component: EntryStockBoughtDetail,
-                        componentProps: {
-                            workerFk: row.workerFk,
-                            dated: userParams.value.dated,
-                        },
-                    });
-                },
-            },
-        ],
-    },
-];
-
-const fetchDataRef = ref();
-const travelDialogRef = ref(false);
-const tableRef = ref();
-const travel = ref(null);
-const userParams = ref({
-    dated: Date.vnNew(),
-});
-
-const filter = ref({
-    fields: ['id', 'm3', 'warehouseInFk'],
-    include: [
-        {
-            relation: 'warehouseIn',
-            scope: {
-                fields: ['code'],
-            },
-        },
-    ],
-    where: {
-        shipped: (userParams.value.dated
-            ? new Date(userParams.value.dated)
-            : Date.vnNew()
-        ).setHours(0, 0, 0, 0),
-        m3: { neq: null },
-    },
-});
-
-const setUserParams = async ({ dated }) => {
-    const shipped = (dated ? new Date(dated) : Date.vnNew()).setHours(0, 0, 0, 0);
-    filter.value.where.shipped = shipped;
-    fetchDataRef.value?.fetch();
-};
-
-function openDialog() {
-    travelDialogRef.value = true;
-}
-
-function setFooter(data) {
-    const footer = {
-        bought: 0,
-        reserve: 0,
-    };
-    data.forEach((row) => {
-        footer.bought += row?.bought;
-        footer.reserve += row?.reserve;
-    });
-    tableRef.value.footer = footer;
-}
-</script>
-<template>
-    <VnSubToolbar>
-        <template #st-data>
-            <FetchData
-                ref="fetchDataRef"
-                url="Travels"
-                auto-load
-                :filter="filter"
-                @on-fetch="
-                    (data) => {
-                        travel = data.find((data) => data.warehouseIn.code === 'VNH');
-                    }
-                "
-            />
-            <VnRow class="travel">
-                <div v-if="travel">
-                    <span style="color: var(--vn-label-color)">
-                        {{ t('Booked trucks') }}:
-                    </span>
-                    <span>
-                        {{ travel?.m3 }}
-                    </span>
-                    <QBtn
-                        v-if="travel?.m3"
-                        style="max-width: 20%"
-                        flat
-                        icon="edit"
-                        @click="openDialog()"
-                        :title="t('Edit travel')"
-                        color="primary"
-                    />
-                </div>
-            </VnRow>
-        </template>
-    </VnSubToolbar>
-    <QDialog v-model="travelDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
-        <FormModelPopup
-            :url-update="`Travels/${travel?.id}`"
-            model="travel"
-            :title="t('Travel m3')"
-            :form-initial-data="{ id: travel?.id, m3: travel?.m3 }"
-            @on-data-saved="fetchDataRef.fetch()"
-        >
-            <template #form-inputs="{ data }">
-                <VnInput
-                    v-model="data.id"
-                    :label="t('id')"
-                    type="number"
-                    disable
-                    readonly
-                />
-                <VnInput v-model="data.m3" :label="t('m3')" type="number" />
-            </template>
-        </FormModelPopup>
-    </QDialog>
-    <RightMenu>
-        <template #right-panel>
-            <EntryStockBoughtFilter
-                data-key="StockBoughts"
-                @set-user-params="setUserParams"
-            />
-        </template>
-    </RightMenu>
-    <div class="table-container">
-        <QPage class="column items-center q-pa-md">
-            <VnTable
-                ref="tableRef"
-                data-key="StockBoughts"
-                url="StockBoughts/getStockBought"
-                save-url="StockBoughts/crud"
-                order="reserve DESC"
-                :right-search="false"
-                :is-editable="true"
-                @on-fetch="(data) => setFooter(data)"
-                :create="{
-                    urlCreate: 'StockBoughts',
-                    title: t('Reserve some space'),
-                    onDataSaved: () => tableRef.reload(),
-                    formInitialData: {
-                        workerFk: user.id,
-                        dated: Date.vnNow(),
-                    },
-                }"
-                :columns="columns"
-                :user-params="userParams"
-                :footer="true"
-                auto-load
-            >
-                <template #column-workerFk="{ row }">
-                    <span class="link" @click.stop>
-                        {{ row?.worker?.user?.name }}
-                        <WorkerDescriptorProxy :id="row?.workerFk" />
-                    </span>
-                </template>
-                <template #column-bought="{ row }">
-                    <span :class="{ 'text-negative': row.reserve < row.bought }">
-                        {{ row?.bought }}
-                    </span>
-                </template>
-                <template #column-footer-reserve>
-                    <span>
-                        {{ tableRef.footer.reserve }}
-                    </span>
-                </template>
-                <template #column-footer-bought>
-                    <span
-                        :class="{
-                            'text-negative':
-                                tableRef.footer.reserve < tableRef.footer.bought,
-                        }"
-                    >
-                        {{ tableRef.footer.bought }}
-                    </span>
-                </template>
-            </VnTable>
-        </QPage>
-    </div>
-</template>
-<style lang="scss" scoped>
-.travel {
-    margin-bottom: 0px;
-}
-.table-container {
-    display: flex;
-    justify-content: center;
-}
-.column {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    width: 40%;
-}
-.text-negative {
-    color: $negative !important;
-}
-</style>
-<i18n>
-    es:
-        Edit travel: Editar envío
-        Travel: Envíos
-        Booked trucks: Camiones reservados
-        Buyer: Comprador
-        Reserve: Reservado
-        Bought: Comprado
-        More: Más
-        Date: Fecha
-        Reserve some space: Reservar espacio
-        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha
-</i18n>
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
deleted file mode 100644
index 2c1a5a47e..000000000
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ /dev/null
@@ -1,129 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnTable from 'components/VnTable/VnTable.vue';
-import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
-import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-
-const { t } = useI18n();
-const tableRef = ref();
-const $props = defineProps({
-    workerFk: {
-        type: Number,
-        required: true,
-    },
-    dated: {
-        type: Date,
-        required: true,
-    },
-});
-const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&date=${$props.dated}`;
-const columns = [
-    {
-        align: 'left',
-        label: t('Entry'),
-        name: 'entryFk',
-        isTitle: true,
-        isId: true,
-        columnFilter: false,
-    },
-    {
-        align: 'left',
-        name: 'itemFk',
-        label: t('Item'),
-        columnFilter: false,
-    },
-    {
-        align: 'left',
-        label: t('Name'),
-        name: 'itemName',
-        create: true,
-        columnClass: 'expand',
-        columnFilter: false,
-        cardVisible: true,
-    },
-    {
-        align: 'left',
-        name: 'volume',
-        label: t('Volume'),
-        columnFilter: false,
-        cardVisible: true,
-    },
-    {
-        align: 'left',
-        label: t('Packaging'),
-        name: 'packagingFk',
-        columnFilter: false,
-        cardVisible: true,
-    },
-    {
-        align: 'left',
-        label: 'Packing',
-        name: 'packing',
-        columnFilter: false,
-        cardVisible: true,
-    },
-];
-</script>
-<template>
-    <QDialog>
-        <div class="container">
-            <VnTable
-                ref="tableRef"
-                data-key="StockBoughtsDetail"
-                :url="customUrl"
-                order="itemName DESC"
-                :columns="columns"
-                :right-search="false"
-                :disable-infinite-scroll="true"
-                :limit="0"
-                auto-load
-            >
-                <template #top-left>
-                    <QBtn
-                        flat
-                        icon="Close"
-                        color="primary"
-                        class="bg-vn-section-color q-pa-xs"
-                        v-close-popup
-                    />
-                </template>
-                <template #column-entryFk="{ row }">
-                    <span class="link">
-                        {{ row?.entryFk }}
-                        <EntryDescriptorProxy :id="row.entryFk" />
-                    </span>
-                </template>
-                <template #column-itemName="{ row }">
-                    <span class="link">
-                        {{ row?.itemName }}
-                        <ItemDescriptorProxy :id="row.itemFk" />
-                    </span>
-                </template>
-            </VnTable>
-        </div>
-    </QDialog>
-</template>
-<style lang="css" scoped>
-.container {
-    max-width: 50vw;
-    overflow: auto;
-    justify-content: center;
-    align-items: center;
-    margin: auto;
-}
-</style>
-<i18n>
-    es:
-        Buyer: Comprador
-        Reserve: Reservado
-        Bought: Comprado
-        More: Más
-        Date: Fecha
-        Entry: Entrada
-        Item: Artículo
-        Name: Nombre
-        Volume: Volumen
-        Packaging: Embalage 
-</i18n>
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
deleted file mode 100644
index 7694cfe6c..000000000
--- a/src/pages/Entry/EntryStockBoughtFilter.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { onMounted } from 'vue';
-import { useStateStore } from 'stores/useStateStore';
-
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-
-const { t } = useI18n();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
-const stateStore = useStateStore();
-const emit = defineEmits(['set-user-params']);
-const setUserParams = (params) => {
-    emit('set-user-params', params);
-};
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-});
-</script>
-
-<template>
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :search-button="true"
-        search-url="table"
-        @set-user-params="setUserParams"
-    >
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params }">
-            <QItem class="q-my-sm">
-                <QItemSection>
-                    <VnInputDate
-                        id="date"
-                        v-model="params.dated"
-                        :label="t('Date')"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-<i18n>
-    en:
-        params:
-            dated: Date
-            workerFk: Worker
-    es:
-        Date: Fecha
-        params:
-            dated: Date
-            workerFk: Trabajador
-</i18n>
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
deleted file mode 100644
index 66e06b79e..000000000
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-describe('EntryStockBought', () => {
-    beforeEach(() => {
-        cy.viewport(1920, 1080);
-        cy.login('buyer');
-        cy.visit(`/#/entry/stock-Bought`);
-    });
-    it('Should edit the reserved space', () => {
-        cy.get('.q-field__native.q-placeholder').should('have.value', '01/01/2001');
-        cy.get('input[name="reserve"]').type('10{enter}');
-        cy.get('button[title="Save"]').click();
-        cy.get('.q-notification__message').should('have.text', 'Data saved');
-    });
-    it('Should add a new reserved space for buyerBoss', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('input[aria-label="Reserve"]').type('1');
-        cy.get('input[aria-label="Date"]').eq(1).clear();
-        cy.get('input[aria-label="Date"]').eq(1).type('01-01');
-        cy.get('input[aria-label="Buyer"]').type('buyerboss{downarrow}{enter}');
-        cy.get('.q-notification__message').should('have.text', 'Data created');
-    });
-    it('Should check detail for the buyer', () => {
-        cy.get(':nth-child(1) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('tBody > tr').eq(1).its('length').should('eq', 1);
-    });
-    it('Should check detail for the buyerBoss and had no content', () => {
-        cy.get(':nth-child(2) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('.q-table__bottom.row.items-center.q-table__bottom--nodata').should(
-            'have.text',
-            'warningNo data available'
-        );
-    });
-    it('Should edit travel m3 and refresh', () => {
-        cy.get('.vn-row > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('input[aria-label="m3"]').clear();
-        cy.get('input[aria-label="m3"]').type('60');
-        cy.get('.q-mt-lg > .q-btn--standard > .q-btn__content > .block').click();
-        cy.get('.vn-row > div > :nth-child(2)').should('have.text', '60');
-    });
-});

From 8356be1ec0567a8ef37121987ee503d1b8cdbfd0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 27 Sep 2024 18:10:43 +0000
Subject: [PATCH 041/131] fix: onDataSaved VnTable

Habia un problema al usar this en entorno no local
---
 src/components/VnTable/VnTable.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 2c9526ec0..693bb785b 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -300,7 +300,7 @@ defineExpose({
 });
 
 function handleOnDataSaved(_, res) {
-    if (_.onDataSaved) _.onDataSaved(this);
+    if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
 </script>

From 76a77dcee9264bb4d9254fa4fdfaa46bac750f24 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 30 Sep 2024 14:35:10 +0200
Subject: [PATCH 042/131] fix: duplicate call

---
 src/pages/Ticket/Card/TicketSale.vue | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index d87f6c402..d5de60f16 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -53,7 +53,7 @@ const tableRef = ref([]);
 
 watch(
     () => route.params.id,
-    async () => await getSales()
+    () => tableRef.value.reload()
 );
 
 const columns = computed(() => [
@@ -161,15 +161,6 @@ const onSalesFetched = (salesData) => {
     for (let sale of salesData) sale.amount = getSaleTotal(sale);
 };
 
-const getSales = async () => {
-    try {
-        const { data } = await axios.get(`Tickets/${route.params.id}/getSales`);
-        onSalesFetched(data);
-    } catch (err) {
-        console.error('Error fetching sales', err);
-    }
-};
-
 const getSaleTotal = (sale) => {
     if (sale.quantity == null || sale.price == null) return null;
 
@@ -181,7 +172,7 @@ const getSaleTotal = (sale) => {
 
 const resetChanges = async () => {
     arrayData.fetch({ append: false });
-    getSales();
+    tableRef.value.reload();
 };
 
 const updateQuantity = async (sale) => {
@@ -434,7 +425,6 @@ const setTransferParams = async () => {
 onMounted(async () => {
     stateStore.rightDrawer = true;
     getConfig();
-    getSales();
     getItems();
 });
 
@@ -623,6 +613,7 @@ watch(
         :column-search="false"
         :disable-option="{ card: true }"
         auto-load
+        @on-fetch="onSalesFetched"
         :create="{
             onDataSaved: handleOnDataSave,
         }"

From 2302e22f1115a9b5d057e2a7e47b44d6b630968c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 30 Sep 2024 15:00:05 +0200
Subject: [PATCH 043/131] fix: solve conflicts from master to test

---
 src/components/VnTable/VnTable.vue            |  4 +-
 src/components/common/VnLocation.vue          | 43 +++++++++++--
 src/i18n/locale/en.yml                        |  2 +-
 src/i18n/locale/es.yml                        |  2 +-
 .../Customer/Card/CustomerFiscalData.vue      |  1 +
 src/pages/Customer/Card/CustomerSummary.vue   |  1 +
 src/pages/Customer/CustomerList.vue           |  3 +-
 .../Customer/Defaulter/CustomerDefaulter.vue  |  7 --
 src/pages/Item/ItemFixedPrice.vue             | 20 +++---
 .../Supplier/Card/SupplierAddressesCreate.vue |  1 +
 src/pages/Ticket/Card/TicketSummary.vue       | 64 +++++++++----------
 src/pages/Worker/WorkerList.vue               |  1 +
 12 files changed, 86 insertions(+), 63 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 9dcbc5542..3ed741ac4 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -310,8 +310,8 @@ defineExpose({
     params,
 });
 
-function handleOnDataSaved(_) {
-    if (_.onDataSaved) _.onDataSaved(this);
+function handleOnDataSaved(_, res) {
+    if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
 </script>
diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index e5ed14a40..c1b921915 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -12,17 +12,48 @@ const props = defineProps({
         default: null,
     },
 });
+const formatLocation = (obj, properties) => {
+    const parts = properties.map((prop) => {
+        if (typeof prop === 'string') {
+            return obj[prop];
+        } else if (typeof prop === 'function') {
+            return prop(obj);
+        }
+        return null;
+    });
+
+    const filteredParts = parts.filter(
+        (part) => part !== null && part !== undefined && part !== ''
+    );
+
+    return filteredParts.join(', ');
+};
+
+const locationProperties = [
+    'postcode',
+    (obj) =>
+        obj.city
+            ? `${obj.city}${obj.province?.name ? `(${obj.province.name})` : ''}`
+            : null,
+    (obj) => obj.country?.name,
+];
+
 const modelValue = ref(
-    props.location
-        ? `${props.location?.postcode}, ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
-        : null
+    props.location ? formatLocation(props.location, locationProperties) : null
 );
-function showLabel(data) {
-    return `${data.code}, ${data.town}(${data.province}), ${data.country}`;
-}
+
 const handleModelValue = (data) => {
     emit('update:model-value', data);
 };
+
+function showLabel(data) {
+    const dataProperties = [
+        'code',
+        (obj) => (obj.town ? `${obj.town}(${obj.province})` : null),
+        'country',
+    ];
+    return formatLocation(data, dataProperties);
+}
 </script>
 <template>
     <VnSelectDialog
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 43fb69e6a..7eb3829fe 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1076,7 +1076,7 @@ item:
         producer: Producer
         landed: Landed
     fixedPrice:
-        itemId: Item ID
+        itemFk: Item ID
         groupingPrice: Grouping price
         packingPrice: Packing price
         hasMinPrice: Has min price
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index b4e4ce86f..9d5cd53f3 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1061,7 +1061,7 @@ item:
         producer: Productor
         landed: F. entrega
     fixedPrice:
-        itemId: ID Artículo
+        itemFk: ID Artículo
         groupingPrice: Precio grouping
         packingPrice: Precio packing
         hasMinPrice: Tiene precio mínimo
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 300d275c0..1f5775715 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -93,6 +93,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :location="data"
                     @update:model-value="(location) => handleLocation(data, location)"
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index f049426e2..8b5f0f2c2 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -13,6 +13,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 const route = useRoute();
 const { t } = useI18n();
+const grafanaUrl = 'https://grafana.verdnatura.es';
 
 const $props = defineProps({
     id: {
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 5e24a1c2d..63f5149e8 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -429,10 +429,9 @@ function handleLocation(data, location) {
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
                 }"
-                option-label="nickname"
-                option-value="id"
                 :fields="['id', 'nickname']"
                 sort-by="nickname ASC"
+                :use-like="false"
                 emit-value
                 auto-load
             >
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 11f6362f8..7b9cb67f7 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -3,7 +3,6 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { toCurrency, toDate, dateRange } from 'filters/index';
-import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
 import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
@@ -11,7 +10,6 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
@@ -192,11 +190,6 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <RightMenu>
-        <template #right-panel>
-            <CustomerNotificationsFilter data-key="CustomerDefaulter" />
-        </template>
-    </RightMenu>
     <VnSubToolbar>
         <template #st-data>
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index bd8c4b78c..fddf154a2 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -36,23 +36,23 @@ const user = state.getUser();
 const fixedPrices = ref([]);
 const warehousesOptions = ref([]);
 const rowsSelected = ref([]);
-
 const itemFixedPriceFilterRef = ref();
-
 const params = reactive({});
-const defaultColumnAttrs = {
-    align: 'left',
-    sortable: true,
-};
+
 onMounted(async () => {
     stateStore.rightDrawer = true;
     params.warehouseFk = user.value.warehouseFk;
 });
 onUnmounted(() => (stateStore.rightDrawer = false));
+
+const defaultColumnAttrs = {
+    align: 'left',
+    sortable: true,
+};
 const columns = computed(() => [
     {
-        label: t('item.fixedPrice.itemId'),
-        name: 'itemId',
+        label: t('item.fixedPrice.itemFk'),
+        name: 'itemFk',
         ...defaultColumnAttrs,
         isId: true,
         cardVisible: true,
@@ -426,7 +426,7 @@ function handleOnDataSave({ CrudModelRef }) {
             :default-save="false"
             data-key="ItemFixedPrices"
             url="FixedPrices/filter"
-            :order="['itemFk ASC']"
+            :order="['description DESC']"
             save-url="FixedPrices/crud"
             :user-params="{ warehouseFk: user.warehouseFk }"
             ref="tableRef"
@@ -460,7 +460,7 @@ function handleOnDataSave({ CrudModelRef }) {
                 <QCheckbox flat v-model="scope.selected" />
             </template>
 
-            <template #column-itemId="props">
+            <template #column-itemFk="props">
                 <VnSelect
                     style="max-width: 100px"
                     url="Items/withName"
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index 290373039..0feceb74a 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -84,6 +84,7 @@ function handleLocation(data, location) {
                 <VnRow>
                     <VnLocation
                         :rules="validate('Worker.postcode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
                         :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :location="
                             data.postalCode
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 6af782173..2e85be000 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { onMounted, ref, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { dashIfEmpty, toDate, toCurrency } from 'src/filters';
@@ -11,13 +11,15 @@ import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescripto
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { getUrl } from 'src/composables/getUrl';
+import useNotify from 'src/composables/useNotify.js';
+import { useArrayData } from 'composables/useArrayData';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
-const router = useRouter();
-
+const { notify } = useNotify();
 const { t } = useI18n();
 
 const $props = defineProps({
@@ -35,6 +37,8 @@ const ticket = computed(() => summaryRef.value?.entity);
 const editableStates = ref([]);
 const ticketUrl = ref();
 const grafanaUrl = 'https://grafana.verdnatura.es';
+const stateBtnDropdownRef = ref();
+const descriptorData = useArrayData('ticketData');
 
 onMounted(async () => {
     ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
@@ -61,15 +65,19 @@ function isEditable() {
 }
 
 async function changeState(value) {
-    if (!ticket.value.id) return;
-
-    const formData = {
-        ticketFk: ticket.value.id,
-        code: value,
-    };
-
-    await axios.post(`Tickets/state`, formData);
-    router.go(route.fullPath);
+    try {
+        stateBtnDropdownRef.value.hide();
+        const formData = {
+            ticketFk: entityId.value,
+            code: value,
+        };
+        await axios.post(`Tickets/state`, formData);
+        notify('globals.dataSaved', 'positive');
+        summaryRef.value?.fetch();
+        descriptorData.fetch({});
+    } catch (err) {
+        console.error('Error changing ticket state', err);
+    }
 }
 </script>
 
@@ -94,33 +102,21 @@ async function changeState(value) {
         </template>
         <template #header-right>
             <QBtnDropdown
-                side
-                top
+                ref="stateBtnDropdownRef"
                 color="black"
                 text-color="white"
                 :label="t('ticket.summary.changeState')"
                 :disable="!isEditable()"
             >
-                <QList>
-                    <QVirtualScroll
-                        style="max-height: 300px"
-                        :items="editableStates"
-                        separator
-                        v-slot="{ item, index }"
-                    >
-                        <QItem
-                            :key="index"
-                            dense
-                            clickable
-                            v-close-popup
-                            @click="changeState(item.code)"
-                        >
-                            <QItemSection>
-                                <QItemLabel>{{ item.name }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QVirtualScroll>
-                </QList>
+                <VnSelect
+                    :options="editableStates"
+                    hide-selected
+                    option-label="name"
+                    option-value="code"
+                    hide-dropdown-icon
+                    focus-on-mount
+                    @update:model-value="changeState"
+                />
             </QBtnDropdown>
         </template>
         <template #body="{ entity }">
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 4c9964c0b..6b3b117b6 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -262,6 +262,7 @@ async function autofillBic(worker) {
                 </VnRow>
                 <VnRow>
                     <VnLocation
+                        :roles-allowed-to-create="['deliveryAssistant']"
                         :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :options="postcodesOptions"
                         @update:model-value="(location) => handleLocation(data, location)"

From 4d4554a6ca8dcca2eb4d3ba17754a3484081f843 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 30 Sep 2024 15:11:22 +0200
Subject: [PATCH 044/131] fix(lilium): #6898 SupplierFiscalData show fields

---
 src/pages/Supplier/Card/SupplierFiscalData.vue | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 396cf15a2..96c0b344e 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -52,7 +52,22 @@ function handleLocation(data, location) {
         :url-update="`Suppliers/${route.params.id}/updateFiscalData`"
         model="supplier"
         :filter="{
-            fields: ['id', 'name', 'city', 'postCode', 'countryFk', 'provinceFk'],
+            fields: [
+                'id',
+                'nif',
+                'city',
+                'name',
+                'account',
+                'postCode',
+                'countryFk',
+                'provinceFk',
+                'sageTaxTypeFk',
+                'sageWithholdingFk',
+                'sageTransactionTypeFk',
+                'supplierActivityFk',
+                'healthRegister',
+                'street',
+            ],
             include: [
                 {
                     relation: 'province',
@@ -72,6 +87,7 @@ function handleLocation(data, location) {
         :clear-store-on-unmount="false"
     >
         <template #form="{ data, validate }">
+            {{ data }}
             <VnRow>
                 <VnInput
                     v-model="data.name"

From 03450a86fbb679f4f6007684e001eab618520d67 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 30 Sep 2024 13:13:35 +0000
Subject: [PATCH 045/131] fix: SupplierFiscalData show data printing

---
 src/pages/Supplier/Card/SupplierFiscalData.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 96c0b344e..169c4d796 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -87,7 +87,6 @@ function handleLocation(data, location) {
         :clear-store-on-unmount="false"
     >
         <template #form="{ data, validate }">
-            {{ data }}
             <VnRow>
                 <VnInput
                     v-model="data.name"

From e7a2d3aa85fb98a4abde729b70fd83a315151d94 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 30 Sep 2024 20:20:51 +0200
Subject: [PATCH 046/131] fix: refs #7354 ZonLocation filter

---
 src/pages/Zone/Card/ZoneLocationsTree.vue | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index cb1508ed6..6b3934df7 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { onMounted, ref, computed, watch, onUnmounted } from 'vue';
 import { useRoute } from 'vue-router';
-
+import VnInput from 'src/components/common/VnInput.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import { useArrayData } from 'composables/useArrayData';
@@ -144,7 +144,8 @@ watch(storeData, async (val) => {
 });
 
 const reFetch = async () => {
-    await arrayData.fetch({ append: false });
+    const { data } = await arrayData.fetch({ append: false });
+    nodes.value = data;
 };
 
 onMounted(async () => {
@@ -182,6 +183,16 @@ onUnmounted(() => {
 </script>
 
 <template>
+    <VnInput
+        v-if="showSearchBar"
+        v-model="store.userParams.search"
+        :placeholder="$t('globals.search')"
+        @update:model-value="reFetch()"
+    >
+        <template #prepend>
+            <QBtn color="primary" icon="search" dense flat @click="reFetch()" />
+        </template>
+    </VnInput>
     <QTree
         ref="treeRef"
         :nodes="nodes"

From 41acf0e1e2e025e80a086018b04e4a5012fb4b69 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 00:24:34 +0200
Subject: [PATCH 047/131] feat: #7679 show country provinces

---
 src/components/CreateNewCityForm.vue          | 40 ++++++++++++-------
 src/components/CreateNewPostcodeForm.vue      | 31 +++++++++++---
 src/components/CreateNewProvinceForm.vue      | 16 +++++++-
 src/components/VnSelectProvince.vue           | 40 +++++++++++--------
 .../vnComponent/vnLocation.spec.js            | 19 +++++++++
 5 files changed, 108 insertions(+), 38 deletions(-)

diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index 9a7d8666c..85d13beb1 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -1,35 +1,42 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelectProvince from 'components/VnSelectProvince.vue';
 import VnInput from 'components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
 const emit = defineEmits(['onDataSaved']);
-
+const $props = defineProps({
+    countryFk: {
+        type: Number,
+        default: null,
+    },
+    provinceSelected: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
+});
 const { t } = useI18n();
 
-const cityFormData = reactive({
+const cityFormData = ref({
     name: null,
     provinceFk: null,
 });
-
-const provincesOptions = ref([]);
-
+onMounted(() => {
+    cityFormData.value.provinceFk = $props.provinceSelected;
+});
 const onDataSaved = (...args) => {
     emit('onDataSaved', ...args);
 };
 </script>
 
 <template>
-    <FetchData
-        @on-fetch="(data) => (provincesOptions = data)"
-        auto-load
-        url="Provinces"
-    />
     <FormModelPopup
         :title="t('New city')"
         :subtitle="t('Please, ensure you put the correct data!')"
@@ -41,11 +48,16 @@ const onDataSaved = (...args) => {
         <template #form-inputs="{ data, validate }">
             <VnRow>
                 <VnInput
-                    :label="t('Name')"
+                    :label="t('Names')"
                     v-model="data.name"
                     :rules="validate('city.name')"
                 />
-                <VnSelectProvince v-model="data.provinceFk" />
+                <VnSelectProvince
+                    :province-selected="$props.provinceSelected"
+                    :country-fk="$props.countryFk"
+                    v-model="data.provinceFk"
+                    :provinces="$props.provinces"
+                />
             </VnRow>
         </template>
     </FormModelPopup>
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index dc8027989..396a7ebc8 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -63,17 +63,27 @@ function setTown(newTown, data) {
 }
 
 async function setProvince(id, data) {
-    await provincesFetchDataRef.value.fetch();
     const newProvince = provincesOptions.value.find((province) => province.id == id);
     if (!newProvince) return;
 
     data.countryFk = newProvince.countryFk;
 }
 
+async function onProvinceCreated(data) {
+    await provincesFetchDataRef.value.fetch({
+        where: { countryFk: postcodeFormData.countryFk },
+    });
+    postcodeFormData.provinceFk.value = data.id;
+}
+
 watch(
     () => [postcodeFormData.countryFk],
-    async (newCountryFk) => {
-        if (newCountryFk) {
+    async (newCountryFk, oldValueFk) => {
+        if (!!oldValueFk[0] && newCountryFk[0] !== oldValueFk[0]) {
+            postcodeFormData.provinceFk = null;
+            postcodeFormData.townFk = null;
+        }
+        if ((newCountryFk, newCountryFk !== postcodeFormData.countryFk)) {
             await provincesFetchDataRef.value.fetch({
                 where: {
                     countryFk: newCountryFk[0],
@@ -93,7 +103,7 @@ watch(
 watch(
     () => postcodeFormData.provinceFk,
     async (newProvinceFk) => {
-        if (newProvinceFk) {
+        if (newProvinceFk[0] && newProvinceFk[0] !== postcodeFormData.provinceFk) {
             await townsFetchDataRef.value.fetch({
                 where: { provinceFk: newProvinceFk[0] },
             });
@@ -121,6 +131,7 @@ async function handleCountries(data) {
     <FetchData
         ref="townsFetchDataRef"
         @on-fetch="handleTowns"
+        :limit="30"
         auto-load
         url="Towns/location"
     />
@@ -140,6 +151,7 @@ async function handleCountries(data) {
                     :label="t('Postcode')"
                     v-model="data.code"
                     :rules="validate('postcode.code')"
+                    clearable
                 />
                 <VnSelectDialog
                     :label="t('City')"
@@ -151,7 +163,7 @@ async function handleCountries(data) {
                     :rules="validate('postcode.city')"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :emit-value="false"
-                    clearable
+                    :clearable="true"
                 >
                     <template #option="{ itemProps, opt }">
                         <QItem v-bind="itemProps">
@@ -166,6 +178,9 @@ async function handleCountries(data) {
                     </template>
                     <template #form>
                         <CreateNewCityForm
+                            :country-fk="data.countryFk"
+                            :province-selected="data.provinceFk"
+                            :provinces="provincesOptions"
                             @on-data-saved="
                                 (_, requestResponse) =>
                                     onCityCreated(requestResponse, data)
@@ -176,9 +191,13 @@ async function handleCountries(data) {
             </VnRow>
             <VnRow>
                 <VnSelectProvince
-                    :country-fk="postcodeFormData.countryFk"
+                    :country-fk="data.countryFk"
+                    :province-selected="data.provinceFk"
                     @update:model-value="(value) => setProvince(value, data)"
                     v-model="data.provinceFk"
+                    :clearable="true"
+                    :provinces="provincesOptions"
+                    @on-province-created="onProvinceCreated"
                 />
                 <VnSelect
                     :label="t('Country')"
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index e32684a98..4c1d96930 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -16,7 +16,16 @@ const provinceFormData = reactive({
     name: null,
     autonomyFk: null,
 });
-
+const $props = defineProps({
+    countryFk: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
+});
 const autonomiesOptions = ref([]);
 
 const onDataSaved = (dataSaved, requestResponse) => {
@@ -31,6 +40,11 @@ const onDataSaved = (dataSaved, requestResponse) => {
     <FetchData
         @on-fetch="(data) => (autonomiesOptions = data)"
         auto-load
+        :filter="{
+            where: {
+                countryFk: $props.countryFk,
+            },
+        }"
         url="Autonomies/location"
     />
     <FormModelPopup
diff --git a/src/components/VnSelectProvince.vue b/src/components/VnSelectProvince.vue
index d89827821..9eef125cc 100644
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@@ -8,18 +8,27 @@ import FetchData from 'components/FetchData.vue';
 import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
 
 const emit = defineEmits(['onProvinceCreated']);
-const provinceFk = defineModel({ type: Number });
-watch(provinceFk, async () => await provincesFetchDataRef.value.fetch());
 const $props = defineProps({
     countryFk: {
         type: Number,
         default: null,
     },
+    provinceSelected: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
 });
+const provinceFk = defineModel({ type: Number, default: null });
+
 const { validate } = useValidator();
 const { t } = useI18n();
 
-const provincesOptions = ref();
+const provincesOptions = ref($props.provinces);
+provinceFk.value = $props.provinceSelected;
 const provincesFetchDataRef = ref();
 
 async function onProvinceCreated(_, data) {
@@ -27,16 +36,6 @@ async function onProvinceCreated(_, data) {
     provinceFk.value = data.id;
     emit('onProvinceCreated', data);
 }
-watch(
-    () => $props.countryFk,
-    async (newProvinceFk) => {
-        if (newProvinceFk) {
-            await provincesFetchDataRef.value.fetch({
-                where: { countryFk: newProvinceFk },
-            });
-        }
-    }
-);
 async function handleProvinces(data) {
     provincesOptions.value = data;
 }
@@ -45,14 +44,18 @@ async function handleProvinces(data) {
 <template>
     <FetchData
         ref="provincesFetchDataRef"
-        :filter="{ include: { relation: 'country' } }"
+        :filter="{
+            include: { relation: 'country' },
+            where: {
+                countryFk: $props.countryFk,
+            },
+        }"
         @on-fetch="handleProvinces"
-        auto-load
         url="Provinces"
     />
     <VnSelectDialog
         :label="t('Province')"
-        :options="provincesOptions"
+        :options="$props.provinces"
         hide-selected
         v-model="provinceFk"
         :rules="validate && validate('postcode.provinceFk')"
@@ -67,7 +70,10 @@ async function handleProvinces(data) {
             </QItem>
         </template>
         <template #form>
-            <CreateNewProvinceForm @on-data-saved="onProvinceCreated" />
+            <CreateNewProvinceForm
+                :country-fk="$props.countryFk"
+                @on-data-saved="onProvinceCreated"
+            />
         </template>
     </VnSelectDialog>
 </template>
diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 88919e41c..78dc38899 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -48,6 +48,25 @@ describe('VnLocation', () => {
                 `${createForm.prefix} > :nth-child(4) > .q-field:nth-child(3)> ${createForm.sufix}`
             ).should('have.length', 1);
         });
+        it('should pass selected country', () => {
+            // Select a country
+            const country = 'Ecuador';
+            const province = 'Province five';
+            cy.selectOption(
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(5)> ${createForm.sufix}`,
+                country
+            );
+            cy.selectOption(
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix}`,
+                province
+            );
+            cy.get(
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(3) > .q-icon`
+            ).click();
+            cy.get(
+                `#q-portal--dialog--4 > .q-dialog > ${createForm.prefix} > .vn-row > .q-select > ${createForm.sufix} > :nth-child(1) input`
+            ).should('have.value', province);
+        });
     });
     describe('Worker Create', () => {
         beforeEach(() => {

From 10bada746348c41c252db683a5f03c7cfb491ac0 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 1 Oct 2024 06:52:19 +0200
Subject: [PATCH 048/131] fix: deleted useless button

---
 src/pages/Zone/Card/ZoneEvents.vue | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneEvents.vue b/src/pages/Zone/Card/ZoneEvents.vue
index 32a7db4c4..3452849bc 100644
--- a/src/pages/Zone/Card/ZoneEvents.vue
+++ b/src/pages/Zone/Card/ZoneEvents.vue
@@ -44,23 +44,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="dock_to_left"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <ZoneEventsPanel

From 778e6299cea5f2c1bdb32749fd39068ce8e07bd4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 08:57:04 +0200
Subject: [PATCH 049/131] fix: solve conflicts from test to dev

---
 src/components/VnTable/VnTable.vue            | 14 ++++-
 src/components/common/VnLocation.vue          |  2 +
 src/components/common/VnLog.vue               |  1 +
 src/pages/Customer/Card/CustomerBasicData.vue |  1 +
 .../Customer/Card/CustomerFiscalData.vue      |  1 +
 src/pages/Customer/Card/CustomerSummary.vue   |  1 +
 src/pages/Customer/CustomerList.vue           |  3 +-
 .../Customer/Defaulter/CustomerDefaulter.vue  |  7 ---
 src/pages/Entry/EntryStockBoughtFilter.vue    | 63 -------------------
 .../Supplier/Card/SupplierAddressesCreate.vue |  1 +
 .../Supplier/Card/SupplierFiscalData.vue      |  1 +
 src/pages/Ticket/Card/TicketSummary.vue       | 34 ++++++----
 src/pages/Worker/WorkerList.vue               |  1 +
 src/router/modules/entry.js                   |  9 ---
 .../integration/entry/stockBought.spec.js     | 39 ------------
 15 files changed, 43 insertions(+), 135 deletions(-)
 delete mode 100644 src/pages/Entry/EntryStockBoughtFilter.vue
 delete mode 100644 test/cypress/integration/entry/stockBought.spec.js

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 861a79432..3bcd91b1f 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -317,8 +317,8 @@ defineExpose({
     params,
 });
 
-function handleOnDataSaved(_) {
-    if (_.onDataSaved) _.onDataSaved(this);
+function handleOnDataSaved(_, res) {
+    if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
 </script>
@@ -771,6 +771,16 @@ es:
     color: var(--vn-text-color);
 }
 
+.q-table--dark .q-table__bottom,
+.q-table--dark thead,
+.q-table--dark tr {
+    border-color: var(--vn-section-color);
+}
+
+.q-table__container > div:first-child {
+    background-color: var(--vn-page-color);
+}
+
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));
diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 633d32b85..ffbc7a656 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -37,9 +37,11 @@ const locationProperties = [
             : null,
     (obj) => obj.country?.name,
 ];
+
 const modelValue = ref(
     props.location ? formatLocation(props.location, locationProperties) : null
 );
+
 function showLabel(data) {
     const dataProperties = [
         'code',
diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index ab522cfde..8c71c0997 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -406,6 +406,7 @@ watch(
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
+        search-url="logs"
     >
         <template #body>
             <div
diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index 79ae79ad9..d31669b43 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -18,6 +18,7 @@ const contactChannels = ref([]);
 const title = ref();
 const handleSalesModelValue = (val) => ({
     or: [
+        { id: val },
         { name: val },
         { nickname: { like: '%' + val + '%' } },
         { code: { like: `${val}%` } },
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index 300d275c0..1f5775715 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -93,6 +93,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :location="data"
                     @update:model-value="(location) => handleLocation(data, location)"
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index f049426e2..8b5f0f2c2 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -13,6 +13,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 const route = useRoute();
 const { t } = useI18n();
+const grafanaUrl = 'https://grafana.verdnatura.es';
 
 const $props = defineProps({
     id: {
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 5e24a1c2d..63f5149e8 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -429,10 +429,9 @@ function handleLocation(data, location) {
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
                 }"
-                option-label="nickname"
-                option-value="id"
                 :fields="['id', 'nickname']"
                 sort-by="nickname ASC"
+                :use-like="false"
                 emit-value
                 auto-load
             >
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 11f6362f8..7b9cb67f7 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -3,7 +3,6 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { toCurrency, toDate, dateRange } from 'filters/index';
-import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
 import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
@@ -11,7 +10,6 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 import DepartmentDescriptorProxy from 'src/pages/Department/Card/DepartmentDescriptorProxy.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
@@ -192,11 +190,6 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <RightMenu>
-        <template #right-panel>
-            <CustomerNotificationsFilter data-key="CustomerDefaulter" />
-        </template>
-    </RightMenu>
     <VnSubToolbar>
         <template #st-data>
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
deleted file mode 100644
index 7694cfe6c..000000000
--- a/src/pages/Entry/EntryStockBoughtFilter.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { onMounted } from 'vue';
-import { useStateStore } from 'stores/useStateStore';
-
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInputDate from 'src/components/common/VnInputDate.vue';
-
-const { t } = useI18n();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
-const stateStore = useStateStore();
-const emit = defineEmits(['set-user-params']);
-const setUserParams = (params) => {
-    emit('set-user-params', params);
-};
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-});
-</script>
-
-<template>
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :search-button="true"
-        search-url="table"
-        @set-user-params="setUserParams"
-    >
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params }">
-            <QItem class="q-my-sm">
-                <QItemSection>
-                    <VnInputDate
-                        id="date"
-                        v-model="params.dated"
-                        :label="t('Date')"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-<i18n>
-    en:
-        params:
-            dated: Date
-            workerFk: Worker
-    es:
-        Date: Fecha
-        params:
-            dated: Date
-            workerFk: Trabajador
-</i18n>
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index 290373039..0feceb74a 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -84,6 +84,7 @@ function handleLocation(data, location) {
                 <VnRow>
                     <VnLocation
                         :rules="validate('Worker.postcode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
                         :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :location="
                             data.postalCode
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 553fc0f94..396cf15a2 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -146,6 +146,7 @@ function handleLocation(data, location) {
             <VnRow>
                 <VnLocation
                     :rules="validate('Worker.postcode')"
+                    :roles-allowed-to-create="['deliveryAssistant', 'administrative']"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :location="{
                         postcode: data.postCode,
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index b6a60122c..2ca0b5727 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -1,7 +1,7 @@
 <script setup>
 import RouteDescriptorProxy from 'pages/Route/Card/RouteDescriptorProxy.vue';
 import { onMounted, ref, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { dashIfEmpty, toDate, toCurrency } from 'src/filters';
@@ -12,6 +12,8 @@ import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescripto
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { getUrl } from 'src/composables/getUrl';
+import useNotify from 'src/composables/useNotify.js';
+import { useArrayData } from 'composables/useArrayData';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
@@ -19,8 +21,7 @@ import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
-const router = useRouter();
-
+const { notify } = useNotify();
 const { t } = useI18n();
 
 const $props = defineProps({
@@ -38,6 +39,8 @@ const ticket = computed(() => summaryRef.value?.entity);
 const editableStates = ref([]);
 const ticketUrl = ref();
 const grafanaUrl = 'https://grafana.verdnatura.es';
+const stateBtnDropdownRef = ref();
+const descriptorData = useArrayData('ticketData');
 
 onMounted(async () => {
     ticketUrl.value = (await getUrl('ticket/')) + entityId.value + '/';
@@ -64,15 +67,19 @@ function isEditable() {
 }
 
 async function changeState(value) {
-    if (!ticket.value.id) return;
-
-    const formData = {
-        ticketFk: ticket.value.id,
-        code: value,
-    };
-
-    await axios.post(`Tickets/state`, formData);
-    router.go(route.fullPath);
+    try {
+        stateBtnDropdownRef.value.hide();
+        const formData = {
+            ticketFk: entityId.value,
+            code: value,
+        };
+        await axios.post(`Tickets/state`, formData);
+        notify('globals.dataSaved', 'positive');
+        summaryRef.value?.fetch();
+        descriptorData.fetch({});
+    } catch (err) {
+        console.error('Error changing ticket state', err);
+    }
 }
 
 function getNoteValue(description) {
@@ -125,6 +132,7 @@ function toTicketUrl(section) {
         </template>
         <template #header-right>
             <QBtnDropdown
+                ref="stateBtnDropdownRef"
                 color="black"
                 text-color="white"
                 :label="t('ticket.summary.changeState')"
@@ -137,7 +145,7 @@ function toTicketUrl(section) {
                     option-value="code"
                     hide-dropdown-icon
                     focus-on-mount
-                    @update:model-value="changeState(item.code)"
+                    @update:model-value="changeState"
                 />
             </QBtnDropdown>
         </template>
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 4c9964c0b..6b3b117b6 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -262,6 +262,7 @@ async function autofillBic(worker) {
                 </VnRow>
                 <VnRow>
                     <VnLocation
+                        :roles-allowed-to-create="['deliveryAssistant']"
                         :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                         :options="postcodesOptions"
                         @update:model-value="(location) => handleLocation(data, location)"
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 76b4a6e23..d66ea0e0c 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -58,15 +58,6 @@ export default {
                     },
                     component: () => import('src/pages/Entry/EntryLatestBuys.vue'),
                 },
-                {
-                    path: 'stock-bought',
-                    name: 'EntryStockBought',
-                    meta: {
-                        title: 'reserves',
-                        icon: 'deployed_code_history',
-                    },
-                    component: () => import('src/pages/Entry/EntryStockBought.vue'),
-                },
             ],
         },
         {
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
deleted file mode 100644
index 66e06b79e..000000000
--- a/test/cypress/integration/entry/stockBought.spec.js
+++ /dev/null
@@ -1,39 +0,0 @@
-describe('EntryStockBought', () => {
-    beforeEach(() => {
-        cy.viewport(1920, 1080);
-        cy.login('buyer');
-        cy.visit(`/#/entry/stock-Bought`);
-    });
-    it('Should edit the reserved space', () => {
-        cy.get('.q-field__native.q-placeholder').should('have.value', '01/01/2001');
-        cy.get('input[name="reserve"]').type('10{enter}');
-        cy.get('button[title="Save"]').click();
-        cy.get('.q-notification__message').should('have.text', 'Data saved');
-    });
-    it('Should add a new reserved space for buyerBoss', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('input[aria-label="Reserve"]').type('1');
-        cy.get('input[aria-label="Date"]').eq(1).clear();
-        cy.get('input[aria-label="Date"]').eq(1).type('01-01');
-        cy.get('input[aria-label="Buyer"]').type('buyerboss{downarrow}{enter}');
-        cy.get('.q-notification__message').should('have.text', 'Data created');
-    });
-    it('Should check detail for the buyer', () => {
-        cy.get(':nth-child(1) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('tBody > tr').eq(1).its('length').should('eq', 1);
-    });
-    it('Should check detail for the buyerBoss and had no content', () => {
-        cy.get(':nth-child(2) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('.q-table__bottom.row.items-center.q-table__bottom--nodata').should(
-            'have.text',
-            'warningNo data available'
-        );
-    });
-    it('Should edit travel m3 and refresh', () => {
-        cy.get('.vn-row > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('input[aria-label="m3"]').clear();
-        cy.get('input[aria-label="m3"]').type('60');
-        cy.get('.q-mt-lg > .q-btn--standard > .q-btn__content > .block').click();
-        cy.get('.vn-row > div > :nth-child(2)').should('have.text', '60');
-    });
-});

From e9364f69d416edb211d23a613a4289e603887b31 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 10:03:14 +0200
Subject: [PATCH 050/131] feat: #7679 show tooltips

---
 src/components/CreateNewPostcodeForm.vue | 2 ++
 src/components/VnSelectProvince.vue      | 2 ++
 src/components/common/VnLocation.vue     | 3 +++
 3 files changed, 7 insertions(+)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 396a7ebc8..2f0534b1e 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -156,6 +156,7 @@ async function handleCountries(data) {
                 <VnSelectDialog
                     :label="t('City')"
                     @update:model-value="(value) => setTown(value, data)"
+                    :tooltip="t('Create city')"
                     v-model="data.townFk"
                     :options="townsOptions"
                     option-label="name"
@@ -216,6 +217,7 @@ async function handleCountries(data) {
 <i18n>
 es:
     New postcode: Nuevo código postal
+    Create city: Crear población
     Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos!
     City: Población
     Province: Provincia
diff --git a/src/components/VnSelectProvince.vue b/src/components/VnSelectProvince.vue
index 9eef125cc..606799e50 100644
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@@ -56,6 +56,7 @@ async function handleProvinces(data) {
     <VnSelectDialog
         :label="t('Province')"
         :options="$props.provinces"
+        :tooltip="t('Create province')"
         hide-selected
         v-model="provinceFk"
         :rules="validate && validate('postcode.provinceFk')"
@@ -80,4 +81,5 @@ async function handleProvinces(data) {
 <i18n>
     es:
         Province: Provincia
+        Create province: Crear provincia
 </i18n>
diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 633d32b85..31c4f2cd5 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -70,6 +70,7 @@ const handleModelValue = (data) => {
         v-bind="$attrs"
         clearable
         :emit-value="false"
+        :tooltip="t('Create new location')"
     >
         <template #form>
             <CreateNewPostcode
@@ -102,7 +103,9 @@ const handleModelValue = (data) => {
 <i18n>
 en:
     search_by_postalcode: Search by postalcode, town, province or country
+    Create new location: Create new location
 es:
     Location: Ubicación
+    Create new location: Crear nueva ubicación
     search_by_postalcode: Buscar por código postal, ciudad o país
 </i18n>

From d6efd21db63df0deb84c3d66b6da5177a40b6f71 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 10:03:39 +0200
Subject: [PATCH 051/131] style: remove space between value and label

---
 src/components/common/VnInput.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index f389ca842..d93ad7465 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -140,12 +140,6 @@ const mixinRules = [
 .q-field__control {
     height: unset;
 }
-.q-field__control.relative-position.row.no-wrap
-    > .q-field__control-container
-    > input.q-field__native
-    ~ div.q-field__label {
-    height: 41px;
-}
 
 .q-field--labeled {
     .q-field__native,

From 8fa82c818d9fa31492e59f5682295df4f7b2efe3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 10:04:56 +0200
Subject: [PATCH 052/131] fix: remove limit

---
 src/components/CreateNewPostcodeForm.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 2f0534b1e..99cba5360 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -131,7 +131,6 @@ async function handleCountries(data) {
     <FetchData
         ref="townsFetchDataRef"
         @on-fetch="handleTowns"
-        :limit="30"
         auto-load
         url="Towns/location"
     />

From e64e6eefe3a17bf1e3d393140b401708dbeda69d Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 1 Oct 2024 10:35:31 +0200
Subject: [PATCH 053/131] refs #7355 add role

---
 src/components/ui/VnSearchbar.vue      |  1 +
 src/pages/Account/AccountList.vue      | 24 +++++++++++++++++++++---
 src/pages/Account/Card/AccountCard.vue |  3 +++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index a78403b5c..dc6d4751c 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -108,6 +108,7 @@ async function search() {
             ...Object.fromEntries(staticParams),
             search: searchText.value,
         },
+        ...{ filter: props.filter },
     };
 
     if (props.whereFilter) {
diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index d698596b9..1beac0d0b 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -9,7 +9,9 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
-
+const filter = {
+    include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+};
 const columns = computed(() => [
     {
         align: 'left',
@@ -29,7 +31,22 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'username',
+        name: 'roleFk',
+        label: t('role'),
+        columnFilter: {
+            component: 'select',
+            name: 'roleFk',
+            attrs: {
+                url: 'VnRoles',
+                optionValue: 'id',
+                optionLabel: 'name',
+            },
+        },
+        format: ({ role }, dashIfEmpty) => dashIfEmpty(role?.name),
+    },
+    {
+        align: 'left',
+        name: 'nickname',
         label: t('Nickname'),
         isTitle: true,
         component: 'input',
@@ -104,12 +121,13 @@ const exprBuilder = (param, value) => {
         :expr-builder="exprBuilder"
         :label="t('account.search')"
         :info="t('account.searchInfo')"
+        :filter="filter"
     />
-
     <VnTable
         ref="tableRef"
         data-key="AccountUsers"
         url="VnUsers/preview"
+        :filter="filter"
         order="id DESC"
         :columns="columns"
         default-mode="table"
diff --git a/src/pages/Account/Card/AccountCard.vue b/src/pages/Account/Card/AccountCard.vue
index 67fa15898..5ba2415c4 100644
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@@ -11,6 +11,9 @@ const { t } = useI18n();
         data-key="Account"
         :descriptor="AccountDescriptor"
         search-data-key="AccountUsers"
+        :filter="{
+            include: { relation: 'role', scope: { fields: ['id', 'name'] } },
+        }"
         :searchbar-props="{
             url: 'VnUsers/preview',
             label: t('account.search'),

From de01dda2ed5b61ad30fcbf7ce972dfdee22a3007 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 1 Oct 2024 11:32:15 +0200
Subject: [PATCH 054/131] refactor: refs #7884 modified icon color

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

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index b95c73847..07cedd69b 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -99,6 +99,7 @@ const columns = computed(() => [
             {
                 title: t('printLabels'),
                 icon: 'print',
+                isPrimary: true,
                 action: (row) => printBuys(row.id),
             },
         ],

From 696c9ca9b35ed4e9ea0311a8d8f60909161661e3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 11:40:29 +0200
Subject: [PATCH 055/131] fix: solve conflicts with stockBought

---
 src/pages/Entry/EntryStockBought.vue          | 300 ++++++++++++++++++
 src/pages/Entry/EntryStockBoughtDetail.vue    | 126 ++++++++
 src/pages/Entry/EntryStockBoughtFilter.vue    |  63 ++++
 src/router/modules/entry.js                   |   9 +
 .../integration/entry/stockBought.spec.js     |  39 +++
 5 files changed, 537 insertions(+)
 create mode 100644 src/pages/Entry/EntryStockBought.vue
 create mode 100644 src/pages/Entry/EntryStockBoughtDetail.vue
 create mode 100644 src/pages/Entry/EntryStockBoughtFilter.vue
 create mode 100644 test/cypress/integration/entry/stockBought.spec.js

diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
new file mode 100644
index 000000000..0e8013586
--- /dev/null
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -0,0 +1,300 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useState } from 'src/composables/useState';
+import { useQuasar } from 'quasar';
+
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import FetchData from 'components/FetchData.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import EntryStockBoughtFilter from './EntryStockBoughtFilter.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import EntryStockBoughtDetail from 'src/pages/Entry/EntryStockBoughtDetail.vue';
+
+const { t } = useI18n();
+const quasar = useQuasar();
+const state = useState();
+const user = state.getUser();
+const columns = [
+    {
+        align: 'left',
+        label: 'Id',
+        name: 'id',
+        isId: true,
+        columnFilter: false,
+        visible: false,
+    },
+    {
+        align: 'left',
+        name: 'workerFk',
+        label: t('Buyer'),
+        isTitle: true,
+        component: 'select',
+        cardVisible: true,
+        create: true,
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            where: { role: 'buyer' },
+            optionFilter: 'firstName',
+            optionLabel: 'name',
+            optionValue: 'id',
+            useLike: false,
+        },
+    },
+    {
+        align: 'center',
+        label: t('Reserve'),
+        name: 'reserve',
+        columnFilter: false,
+        create: true,
+        component: 'number',
+        summation: true,
+    },
+    {
+        align: 'center',
+        label: t('Bought'),
+        name: 'bought',
+        summation: true,
+        cardVisible: true,
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: t('Date'),
+        name: 'dated',
+        component: 'date',
+        visible: false,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('View more details'),
+                icon: 'search',
+                isPrimary: true,
+                action: (row) => {
+                    quasar.dialog({
+                        component: EntryStockBoughtDetail,
+                        componentProps: {
+                            workerFk: row.workerFk,
+                            dated: userParams.value.dated,
+                        },
+                    });
+                },
+            },
+        ],
+    },
+];
+
+const fetchDataRef = ref();
+const travelDialogRef = ref(false);
+const tableRef = ref();
+const travel = ref(null);
+const userParams = ref({
+    dated: Date.vnNew(),
+});
+
+const filter = ref({
+    fields: ['id', 'm3', 'warehouseInFk'],
+    include: [
+        {
+            relation: 'warehouseIn',
+            scope: {
+                fields: ['code'],
+            },
+        },
+    ],
+    where: {
+        shipped: (userParams.value.dated
+            ? new Date(userParams.value.dated)
+            : Date.vnNew()
+        ).setHours(0, 0, 0, 0),
+        m3: { neq: null },
+    },
+});
+
+const setUserParams = async ({ dated }) => {
+    const shipped = (dated ? new Date(dated) : Date.vnNew()).setHours(0, 0, 0, 0);
+    filter.value.where.shipped = shipped;
+    fetchDataRef.value?.fetch();
+};
+
+function openDialog() {
+    travelDialogRef.value = true;
+}
+
+function setFooter(data) {
+    const footer = {
+        bought: 0,
+        reserve: 0,
+    };
+    data.forEach((row) => {
+        footer.bought += row?.bought;
+        footer.reserve += row?.reserve;
+    });
+    tableRef.value.footer = footer;
+}
+
+function round(value) {
+    return Math.round(value * 100) / 100;
+}
+</script>
+<template>
+    <VnSubToolbar>
+        <template #st-data>
+            <FetchData
+                ref="fetchDataRef"
+                url="Travels"
+                auto-load
+                :filter="filter"
+                @on-fetch="
+                    (data) => {
+                        travel = data.find(
+                            (data) => data.warehouseIn.code.toLowerCase() === 'vnh'
+                        );
+                    }
+                "
+            />
+            <VnRow class="travel">
+                <div v-if="travel">
+                    <span style="color: var(--vn-label-color)">
+                        {{ t('Booked trucks') }}:
+                    </span>
+                    <span>
+                        {{ travel?.m3 }}
+                    </span>
+                    <QBtn
+                        v-if="travel?.m3"
+                        style="max-width: 20%"
+                        flat
+                        icon="edit"
+                        @click="openDialog()"
+                        :title="t('Edit travel')"
+                        color="primary"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </VnSubToolbar>
+    <QDialog v-model="travelDialogRef" :maximized="true" :class="['vn-row', 'wrap']">
+        <FormModelPopup
+            :url-update="`Travels/${travel?.id}`"
+            model="travel"
+            :title="t('Travel m3')"
+            :form-initial-data="{ id: travel?.id, m3: travel?.m3 }"
+            @on-data-saved="fetchDataRef.fetch()"
+        >
+            <template #form-inputs="{ data }">
+                <VnInput
+                    v-model="data.id"
+                    :label="t('id')"
+                    type="number"
+                    disable
+                    readonly
+                />
+                <VnInput v-model="data.m3" :label="t('m3')" type="number" />
+            </template>
+        </FormModelPopup>
+    </QDialog>
+    <RightMenu>
+        <template #right-panel>
+            <EntryStockBoughtFilter
+                data-key="StockBoughts"
+                @set-user-params="setUserParams"
+            />
+        </template>
+    </RightMenu>
+    <div class="table-container">
+        <div class="column items-center">
+            <VnTable
+                ref="tableRef"
+                data-key="StockBoughts"
+                url="StockBoughts/getStockBought"
+                save-url="StockBoughts/crud"
+                order="reserve DESC"
+                :right-search="false"
+                :is-editable="true"
+                @on-fetch="(data) => setFooter(data)"
+                :create="{
+                    urlCreate: 'StockBoughts',
+                    title: t('Reserve some space'),
+                    onDataSaved: () => tableRef.reload(),
+                    formInitialData: {
+                        workerFk: user.id,
+                        dated: Date.vnNow(),
+                    },
+                }"
+                :columns="columns"
+                :user-params="userParams"
+                :footer="true"
+                table-height="80vh"
+                auto-load
+            >
+                <template #column-workerFk="{ row }">
+                    <span class="link" @click.stop>
+                        {{ row?.worker?.user?.name }}
+                        <WorkerDescriptorProxy :id="row?.workerFk" />
+                    </span>
+                </template>
+                <template #column-bought="{ row }">
+                    <span :class="{ 'text-negative': row.reserve < row.bought }">
+                        {{ row?.bought }}
+                    </span>
+                </template>
+                <template #column-footer-reserve>
+                    <span>
+                        {{ round(tableRef.footer.reserve) }}
+                    </span>
+                </template>
+                <template #column-footer-bought>
+                    <span
+                        :class="{
+                            'text-negative':
+                                tableRef.footer.reserve < tableRef.footer.bought,
+                        }"
+                    >
+                        {{ round(tableRef.footer.bought) }}
+                    </span>
+                </template>
+            </VnTable>
+        </div>
+    </div>
+</template>
+<style lang="scss" scoped>
+.travel {
+    margin-bottom: 0px;
+}
+.table-container {
+    display: flex;
+    justify-content: center;
+}
+.column {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    width: 35%;
+}
+.text-negative {
+    color: $negative !important;
+}
+</style>
+<i18n>
+    es:
+        Edit travel: Editar envío
+        Travel: Envíos
+        Booked trucks: Camiones reservados
+        Buyer: Comprador
+        Reserve: Reservado
+        Bought: Comprado
+        Date: Fecha
+        View more details: Ver más detalles
+        Reserve some space: Reservar espacio
+        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha 
+</i18n>
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
new file mode 100644
index 000000000..0fd775ee6
--- /dev/null
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -0,0 +1,126 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnTable from 'components/VnTable/VnTable.vue';
+import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+
+const { t } = useI18n();
+const tableRef = ref();
+const $props = defineProps({
+    workerFk: {
+        type: Number,
+        required: true,
+    },
+    dated: {
+        type: Date,
+        required: true,
+    },
+});
+const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&date=${$props.dated}`;
+const columns = [
+    {
+        align: 'left',
+        label: t('Entry'),
+        name: 'entryFk',
+        isTitle: true,
+        isId: true,
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        name: 'itemFk',
+        label: t('Item'),
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        label: t('Name'),
+        name: 'itemName',
+        create: true,
+        columnClass: 'expand',
+        columnFilter: false,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'volume',
+        label: t('Volume'),
+        columnFilter: false,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('Packaging'),
+        name: 'packagingFk',
+        columnFilter: false,
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: 'Packing',
+        name: 'packing',
+        columnFilter: false,
+        cardVisible: true,
+    },
+];
+</script>
+<template>
+    <QDialog>
+        <div class="container">
+            <VnTable
+                ref="tableRef"
+                data-key="StockBoughtsDetail"
+                :url="customUrl"
+                order="itemName DESC"
+                :columns="columns"
+                :right-search="false"
+                :disable-infinite-scroll="true"
+                :disable-option="{ card: true }"
+                :limit="0"
+                auto-load
+            >
+                <template #column-entryFk="{ row }">
+                    <span class="link">
+                        {{ row?.entryFk }}
+                        <EntryDescriptorProxy :id="row.entryFk" />
+                    </span>
+                </template>
+                <template #column-itemName="{ row }">
+                    <span class="link">
+                        {{ row?.itemName }}
+                        <ItemDescriptorProxy :id="row.itemFk" />
+                    </span>
+                </template>
+            </VnTable>
+        </div>
+    </QDialog>
+</template>
+<style lang="css" scoped>
+.container {
+    max-width: 50vw;
+    overflow: auto;
+    justify-content: center;
+    align-items: center;
+    margin: auto;
+    background-color: var(--vn-section-color);
+    padding: 4px;
+}
+.container > div > div > .q-table__top.relative-position.row.items-center {
+    background-color: red !important;
+}
+</style>
+<i18n>
+    es:
+        Buyer: Comprador
+        Reserve: Reservado
+        Bought: Comprado
+        More: Más
+        Date: Fecha
+        Entry: Entrada
+        Item: Artículo
+        Name: Nombre
+        Volume: Volumen
+        Packaging: Embalage 
+</i18n>
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
new file mode 100644
index 000000000..7694cfe6c
--- /dev/null
+++ b/src/pages/Entry/EntryStockBoughtFilter.vue
@@ -0,0 +1,63 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { onMounted } from 'vue';
+import { useStateStore } from 'stores/useStateStore';
+
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+const stateStore = useStateStore();
+const emit = defineEmits(['set-user-params']);
+const setUserParams = (params) => {
+    emit('set-user-params', params);
+};
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+});
+</script>
+
+<template>
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        search-url="table"
+        @set-user-params="setUserParams"
+    >
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInputDate
+                        id="date"
+                        v-model="params.dated"
+                        :label="t('Date')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+<i18n>
+    en:
+        params:
+            dated: Date
+            workerFk: Worker
+    es:
+        Date: Fecha
+        params:
+            dated: Date
+            workerFk: Trabajador
+</i18n>
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index d66ea0e0c..4750a4301 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -58,6 +58,15 @@ export default {
                     },
                     component: () => import('src/pages/Entry/EntryLatestBuys.vue'),
                 },
+                {
+                    path: 'stock-Bought',
+                    name: 'EntryStockBought',
+                    meta: {
+                        title: 'reserves',
+                        icon: 'deployed_code_history',
+                    },
+                    component: () => import('src/pages/Entry/EntryStockBought.vue'),
+                },
             ],
         },
         {
diff --git a/test/cypress/integration/entry/stockBought.spec.js b/test/cypress/integration/entry/stockBought.spec.js
new file mode 100644
index 000000000..66e06b79e
--- /dev/null
+++ b/test/cypress/integration/entry/stockBought.spec.js
@@ -0,0 +1,39 @@
+describe('EntryStockBought', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('buyer');
+        cy.visit(`/#/entry/stock-Bought`);
+    });
+    it('Should edit the reserved space', () => {
+        cy.get('.q-field__native.q-placeholder').should('have.value', '01/01/2001');
+        cy.get('input[name="reserve"]').type('10{enter}');
+        cy.get('button[title="Save"]').click();
+        cy.get('.q-notification__message').should('have.text', 'Data saved');
+    });
+    it('Should add a new reserved space for buyerBoss', () => {
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('input[aria-label="Reserve"]').type('1');
+        cy.get('input[aria-label="Date"]').eq(1).clear();
+        cy.get('input[aria-label="Date"]').eq(1).type('01-01');
+        cy.get('input[aria-label="Buyer"]').type('buyerboss{downarrow}{enter}');
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+    });
+    it('Should check detail for the buyer', () => {
+        cy.get(':nth-child(1) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('tBody > tr').eq(1).its('length').should('eq', 1);
+    });
+    it('Should check detail for the buyerBoss and had no content', () => {
+        cy.get(':nth-child(2) > .sticky > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('.q-table__bottom.row.items-center.q-table__bottom--nodata').should(
+            'have.text',
+            'warningNo data available'
+        );
+    });
+    it('Should edit travel m3 and refresh', () => {
+        cy.get('.vn-row > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('input[aria-label="m3"]').clear();
+        cy.get('input[aria-label="m3"]').type('60');
+        cy.get('.q-mt-lg > .q-btn--standard > .q-btn__content > .block').click();
+        cy.get('.vn-row > div > :nth-child(2)').should('have.text', '60');
+    });
+});

From 2e9a8d920551f645fb7644fa6910cec67666d8f3 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 1 Oct 2024 11:47:31 +0200
Subject: [PATCH 056/131] fix(WorkerList): add type email

---
 src/pages/Worker/WorkerList.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 6b3b117b6..f4ae20591 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -214,6 +214,7 @@ async function autofillBic(worker) {
                     <VnInput v-model="data.name" :label="t('worker.create.webUser')" />
                     <VnInput
                         v-model="data.email"
+                        type="email"
                         :label="t('worker.create.personalEmail')"
                     />
                 </VnRow>

From 7b63bb38f22e98f056cdef7cb8ccc1efbcb0099c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 1 Oct 2024 12:34:39 +0200
Subject: [PATCH 057/131] fix: deleted code

---
 src/pages/Ticket/Card/TicketSale.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index d5de60f16..6d3e6269d 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -425,7 +425,6 @@ const setTransferParams = async () => {
 onMounted(async () => {
     stateStore.rightDrawer = true;
     getConfig();
-    getItems();
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -433,11 +432,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
 const items = ref([]);
 const newRow = ref({});
 
-async function getItems() {
-    const { data } = await axios.get(`Items/withName`);
-    items.value = data;
-}
-
 const updateItem = (row) => {
     const selectedItem = items.value.find((item) => item.id === row.itemFk);
     if (selectedItem) {

From 589c672ab20c9b4118e6924c3218d7b2cc16d445 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 1 Oct 2024 13:28:49 +0200
Subject: [PATCH 058/131] fix: show degrees

---
 src/i18n/locale/en.yml                       |  4 ++--
 src/i18n/locale/es.yml                       |  4 ++--
 src/pages/Travel/Card/TravelSummary.vue      | 16 +++++++++++++++-
 src/pages/Travel/Card/TravelThermographs.vue |  4 ++--
 src/pages/Zone/locale/es.yml                 |  2 +-
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index af0ba0996..d018dc207 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -289,8 +289,8 @@ globals:
     createInvoiceIn: Create invoice in
     myAccount: My account
     noOne: No one
-    maxTemperature: Maximum Temperature
-    minTemperature: Minimum Temperatura
+    maxTemperature: Máx
+    minTemperature: Mín
     params:
         clientFk: Client id
         salesPersonFk: Sales person
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f56cd6761..7eece7d78 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -293,8 +293,8 @@ globals:
     createInvoiceIn: Crear factura recibida
     myAccount: Mi cuenta
     noOne: Nadie
-    maxTemperature: Temperatura máxima
-    minTemperature: Temperatura mínima
+    maxTemperature: Máx
+    minTemperature: Mín
     params:
         clientFk: Id cliente
         salesPersonFk: Comercial
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 829eb3a17..4be198493 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -121,6 +121,20 @@ const thermographsTableColumns = computed(() => {
             name: 'temperatureFk',
             align: 'left',
         },
+        {
+            label: t('globals.maxTemperature'),
+            field: 'maxTemperature',
+            name: 'maxTemperature',
+            align: 'left',
+            format: (val) => (val ? `${val}°` : ''),
+        },
+        {
+            label: t('globals.minTemperature'),
+            field: 'minTemperature',
+            name: 'minTemperature',
+            align: 'left',
+            format: (val) => (val ? `${val}°` : ''),
+        },
         {
             label: t('travel.thermographs.state'),
             field: 'result',
@@ -133,7 +147,7 @@ const thermographsTableColumns = computed(() => {
             name: 'destination',
             align: 'left',
             format: (val) =>
-                warehouses.value.find((warehouse) => warehouse.id === val).name,
+                warehouses.value.find((warehouse) => warehouse.id === val)?.name,
         },
         {
             label: t('travel.thermographs.created'),
diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index 38b9125b1..e308243e3 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -52,12 +52,14 @@ const TableColumns = computed(() => {
             field: 'maxTemperature',
             name: 'maxTemperature',
             align: 'left',
+            format: (val) => (val ? `${val}°` : ''),
         },
         {
             label: t('globals.minTemperature'),
             field: 'minTemperature',
             name: 'minTemperature',
             align: 'left',
+            format: (val) => (val ? `${val}°` : ''),
         },
         {
             label: t('travel.thermographs.state'),
@@ -219,6 +221,4 @@ es:
     Thermograph removed: Termógrafo eliminado
     Are you sure you want to remove the thermograph?: ¿Seguro que quieres quitar el termógrafo?
     No results: Sin resultados
-    Max Temperature: Temperatura máxima
-    Min Temperature: Temperatura mínima
 </i18n>
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index dd919a0c5..7ecfb580d 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -87,7 +87,7 @@ eventsPanel:
     travelingDays: Días de viaje
     price: Precio
     bonus: Bonificación
-    m3Max: Meidida máxima
+    m3Max: Medida máxima
     everyday: Todos los días
     delete: Eliminar
     deleteTitle: Este elemento será eliminado

From 4399a91e9934ab27bf28f5dd5dce28f9a865e1d5 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 1 Oct 2024 13:29:45 +0200
Subject: [PATCH 059/131] fix: misSpelling

---
 src/i18n/locale/en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index d018dc207..3df52f4a7 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -289,8 +289,8 @@ globals:
     createInvoiceIn: Create invoice in
     myAccount: My account
     noOne: No one
-    maxTemperature: Máx
-    minTemperature: Mín
+    maxTemperature: Max
+    minTemperature: Min
     params:
         clientFk: Client id
         salesPersonFk: Sales person

From d69336c82ac2f131568077b27a349a4c58e6ba8e Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 1 Oct 2024 14:15:18 +0200
Subject: [PATCH 060/131] refs #7366 make travelFilter, travelList

---
 src/pages/Travel/TravelFilter.vue | 157 ++++++++++++++++++++++++++++++
 src/pages/Travel/TravelList.vue   |  10 +-
 2 files changed, 166 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Travel/TravelFilter.vue

diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
new file mode 100644
index 000000000..96298853f
--- /dev/null
+++ b/src/pages/Travel/TravelFilter.vue
@@ -0,0 +1,157 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInputTime from 'src/components/common/VnInputTime.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const states = ref([]);
+
+defineExpose({ states });
+</script>
+
+<template>
+    <FetchData url="warehouses" @on-fetch="(data) => (states = data)" auto-load />
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params, searchFn }">
+            <div class="q-pa-sm q-gutter-y-sm">
+                <VnInput
+                    :label="t('travel.Id')"
+                    v-model="params.id"
+                    lazy-rules
+                    is-outlined
+                >
+                    <template #prepend> <QIcon name="badge" size="xs" /></template>
+                </VnInput>
+                <VnInput
+                    :label="t('travel.ref')"
+                    v-model="params.ref"
+                    lazy-rules
+                    is-outlined
+                />
+                <VnSelect
+                    :label="t('travel.agency')"
+                    v-model="params.agencyModeFk"
+                    @update:model-value="searchFn()"
+                    url="agencyModes"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="name"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnSelect
+                    :label="t('travel.warehouseInFk')"
+                    v-model="params.warehouseInFk"
+                    @update:model-value="searchFn()"
+                    url="warehouses"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="name"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnInputDate
+                    :label="t('travel.shipped')"
+                    v-model="params.shipped"
+                    @update:model-value="searchFn()"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnInputTime
+                    v-model="params.shipmentHour"
+                    @update:model-value="searchFn()"
+                    :label="t('travel.shipmentHour')"
+                    outlined
+                    rounded
+                    dense
+                />
+                <VnSelect
+                    :label="t('travel.warehouseOut')"
+                    v-model="params.warehouseOut"
+                    @update:model-value="searchFn()"
+                    url="warehouses"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="name"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnInputDate
+                    :label="t('travel.landed')"
+                    v-model="params.landed"
+                    @update:model-value="searchFn()"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnInputTime
+                    v-model="params.landingHour"
+                    @update:model-value="searchFn()"
+                    :label="t('travel.landingHour')"
+                    outlined
+                    rounded
+                    dense
+                />
+                <VnInput
+                    :label="t('travel.totalEntries')"
+                    v-model="params.totalEntries"
+                    lazy-rules
+                    is-outlined
+                />
+            </div>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    travel:
+        Id: Contains
+        ref: Reference
+        agency: Agency
+        warehouseInFk: W. In
+        shipped: Shipped
+        shipmentHour: Shipment Hour
+        warehouseOut: W. Out
+        landed: Landed
+        landingHour: Landing Hour
+        totalEntries: Σ
+es:
+    travel:
+        Id: Id
+        ref: Referencia
+        agency: Agencia
+        warehouseInFk: Alm.Salida
+        shipped: F.Envío
+        shipmentHour: Hora de envío
+        warehouseOut: Alm.Entrada
+        landed: F.Entrega
+        landingHour: Hora de entrega
+        totalEntries: Σ
+</i18n>
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index e56f5d2ff..05d2e5eda 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -9,6 +9,8 @@ import TravelSummary from './Card/TravelSummary.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { toDate } from 'src/filters';
 import { getDateQBadgeColor } from 'src/composables/getDateQBadgeColor.js';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import TravelFilter from './TravelFilter.vue';
 
 const { viewSummary } = useSummaryDialog();
 const router = useRouter();
@@ -24,6 +26,7 @@ const $props = defineProps({
 });
 const entityId = computed(() => $props.id || route.params.id);
 
+const travelFilterRef = ref();
 onMounted(async () => {
     stateStore.rightDrawer = true;
 });
@@ -201,6 +204,11 @@ const columns = computed(() => [
         :label="t('Search travel')"
         data-key="TravelList"
     />
+    <RightMenu>
+        <template #right-panel>
+            <TravelFilter data-key="TravelList" ref="travelFilterRef" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="TravelList"
@@ -213,6 +221,7 @@ const columns = computed(() => [
                 editorFk: entityId,
             },
         }"
+        :right-search="false"
         :user-params="{ daysOnward: 7 }"
         order="landed DESC"
         :columns="columns"
@@ -220,7 +229,6 @@ const columns = computed(() => [
         redirect="travel"
         :is-editable="false"
         :use-model="true"
-        chip-locale="travel.travelList.tableVisibleColumns"
     >
         <template #column-shipped="{ row }">
             <QBadge

From 2ca99a51ae7f6e2b2c8c898a53174af12bda3968 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 15:12:22 +0200
Subject: [PATCH 061/131] fix: refs #7356 transfer ticket method

---
 src/pages/Ticket/Card/TicketDescriptorMenu.vue  | 9 +++++----
 src/pages/Ticket/Card/TicketSaleMoreActions.vue | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 12e03551b..73104fe27 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -277,13 +277,14 @@ async function createRefund(withWarehouse) {
     const params = {
         ticketsIds: [parseInt(ticketId)],
         withWarehouse: withWarehouse,
+        negative: true,
     };
-    const { data } = await axios.post(`Tickets/refund`, params);
+    const { data } = await axios.post(`Tickets/cloneAll`, params);
 
     if (data) {
-        const refundTicket = data;
-
-        push({ name: 'TicketSale', params: { id: refundTicket[0].id } });
+        const [refundTicket] = data;
+        notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
+        push({ name: 'TicketSale', params: { id: refundTicket.id } });
     }
 }
 
diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
index 94db67be2..2ec519d2d 100644
--- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@@ -44,7 +44,7 @@ const props = defineProps({
     },
 });
 
-const router = useRouter();
+const { push } = useRouter();
 const { t } = useI18n();
 const { dialog } = useQuasar();
 const { notify } = useNotify();
@@ -142,7 +142,7 @@ const onCreateClaimAccepted = async () => {
     try {
         const params = { ticketId: ticket.value.id, sales: props.sales };
         const { data } = await axios.post(`Claims/createFromSales`, params);
-        router.push({ name: 'ClaimBasicData', params: { id: data.id } });
+        push({ name: 'ClaimBasicData', params: { id: data.id } });
     } catch (error) {
         console.error('Error creating claim: ', error);
     }
@@ -169,7 +169,7 @@ const createRefund = async (withWarehouse) => {
         const { data } = await axios.post('Tickets/cloneAll', params);
         const [refundTicket] = data;
         notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
-        router.push({ name: 'TicketSale', params: { id: refundTicket.id } });
+        push({ name: 'TicketSale', params: { id: refundTicket.id } });
     } catch (error) {
         console.error(error);
     }

From c0fd5a1c218c61f4c4b10cadc42fc5192fdc5316 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 1 Oct 2024 16:12:18 +0200
Subject: [PATCH 062/131] fix: refs #7404 fix style

---
 src/components/VnTable/VnTable.vue | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 3bcd91b1f..53db777df 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -771,16 +771,6 @@ es:
     color: var(--vn-text-color);
 }
 
-.q-table--dark .q-table__bottom,
-.q-table--dark thead,
-.q-table--dark tr {
-    border-color: var(--vn-section-color);
-}
-
-.q-table__container > div:first-child {
-    background-color: var(--vn-page-color);
-}
-
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));

From 6b38bdf868d857a97677381c62216c1b88ccd872 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 19:26:03 +0000
Subject: [PATCH 063/131] style: improve ZoneLocationTree height

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

diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index 0ba2e640a..215c12f46 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -154,7 +154,7 @@ onMounted(() => {
             </div>
             <div
                 v-if="excludeType === 'specificLocations'"
-                style="min-height: 60vh; overflow-y: scroll"
+                style="max-height: 60vh; overflow-y: scroll"
             >
                 <ZoneLocationsTree
                     :root-label="t('eventsExclusionForm.rootTreeLabel')"

From c2c4acfc30646a9ea4a6485ce1eb4c3b4a319104 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 2 Oct 2024 09:42:38 +0200
Subject: [PATCH 064/131] refs #6899 fix filters, date from to socialName

---
 .../InvoiceOut/InvoiceOutNegativeBases.vue    | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 774b42478..1ea19033c 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -9,6 +9,7 @@ import { useArrayData } from 'src/composables/useArrayData';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import TicketDescriptorProxy from '../Ticket/Card/TicketDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -64,7 +65,8 @@ const columns = computed(() => [
         cardVisible: true,
         attrs: {
             url: 'Clients',
-            fields: ['id', 'name'],
+            optionLabel: 'socialName',
+            optionValue: 'socialName',
         },
         columnField: {
             component: null,
@@ -192,10 +194,33 @@ const downloadCSV = async () => {
                 <WorkerDescriptorProxy :id="row.comercialId" />
             </span>
         </template>
+        <template #moreFilterPanel="{ params }">
+            <VnInputDate
+                :label="t('params.from')"
+                v-model="params.from"
+                class="q-px-xs q-pr-lg"
+                filled
+                dense
+            />
+            <VnInputDate
+                :label="t('params.to')"
+                v-model="params.to"
+                class="q-px-xs q-pr-lg"
+                filled
+                dense
+            />
+        </template>
     </VnTable>
 </template>
 
 <i18n>
 es:
     Download as CSV: Descargar como CSV
+    params:
+        from: Desde
+        to: Hasta
+en:
+    params:
+        from: From
+        to: To
 </i18n>

From 7db166974f675a46f0bedf7dd6589e1a7e73c20c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 2 Oct 2024 10:34:50 +0200
Subject: [PATCH 065/131] feat: refs #7884 use VnTable prop for chip label
 filters and modified translations

---
 src/components/ui/VnFilterPanel.vue |  4 +---
 src/pages/Entry/MyEntries.vue       | 29 +++++++++++++++++------------
 src/pages/Entry/locale/en.yml       | 18 ++++++++++++------
 src/pages/Entry/locale/es.yml       | 19 ++++++++++++-------
 4 files changed, 42 insertions(+), 28 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 7e4785441..e39a841c3 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -250,7 +250,7 @@ function sanitizer(params) {
                     >
                         <slot name="tags" :tag="chip" :format-fn="formatValue">
                             <div class="q-gutter-x-xs">
-                                <strong>{{ t(`${chip.label}`) }}:</strong>
+                                <strong>{{ chip.label }}:</strong>
                                 <span>"{{ formatValue(chip.value) }}"</span>
                             </div>
                         </slot>
@@ -295,6 +295,4 @@ es:
     Search: Buscar
     Yes: Si
     No: No
-    daysOnward: Días Adelante
-    daysAgo: Días Atrás
 </i18n>
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 07cedd69b..2c37c2c42 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -18,18 +18,18 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'id',
-        label: t('customer.extendedList.tableVisibleColumns.id'),
+        label: t('myEntries.id'),
         columnFilter: false,
         isTitle: true,
     },
     {
         visible: false,
         align: 'right',
-        label: t('shipped'),
+        label: t('myEntries.shipped'),
         name: 'shipped',
         columnFilter: {
             name: 'fromShipped',
-            label: t('fromShipped'),
+            label: t('myEntries.fromShipped'),
             component: 'date',
         },
         format: ({ shipped }) => toDate(shipped),
@@ -37,11 +37,11 @@ const columns = computed(() => [
     {
         visible: false,
         align: 'left',
-        label: t('shipped'),
+        label: t('myEntries.shipped'),
         name: 'shipped',
         columnFilter: {
             name: 'toShipped',
-            label: t('toShipped'),
+            label: t('myEntries.toShipped'),
             component: 'date',
         },
         format: ({ shipped }) => toDate(shipped),
@@ -49,14 +49,14 @@ const columns = computed(() => [
     },
     {
         align: 'right',
-        label: t('shipped'),
+        label: t('myEntries.shipped'),
         name: 'shipped',
         columnFilter: false,
         format: ({ shipped }) => toDate(shipped),
     },
     {
         align: 'right',
-        label: t('landed'),
+        label: t('myEntries.landed'),
         name: 'landed',
         columnFilter: false,
         format: ({ landed }) => toDate(landed),
@@ -64,31 +64,35 @@ const columns = computed(() => [
 
     {
         align: 'right',
-        label: t('globals.wareHouseIn'),
+        label: t('myEntries.wareHouseIn'),
         name: 'warehouseInFk',
-        format: (row) => row.warehouseInName,
+        format: (row) => {
+            row.warehouseInName;
+        },
         cardVisible: true,
         columnFilter: {
+            name: 'warehouseInFk',
+            label: t('myEntries.warehouseInFk'),
             component: 'select',
             attrs: {
                 url: 'warehouses',
                 fields: ['id', 'name'],
                 optionLabel: 'name',
                 optionValue: 'id',
+                alias: 't',
             },
-            alias: 't',
             inWhere: true,
         },
     },
     {
         align: 'left',
-        label: t('globals.daysOnward'),
+        label: t('myEntries.daysOnward'),
         name: 'daysOnward',
         visible: false,
     },
     {
         align: 'left',
-        label: t('globals.daysAgo'),
+        label: t('myEntries.daysAgo'),
         name: 'daysAgo',
         visible: false,
     },
@@ -130,6 +134,7 @@ const printBuys = (rowId) => {
         default-mode="card"
         order="shipped DESC"
         auto-load
+        chip-locale="myEntries"
     />
 </template>
 
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index a9faa814b..b4d7c33bc 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -6,9 +6,15 @@ entryFilter:
     filter:
         search: General search
         reference: Reference
-landed: Landed
-shipped: Shipped
-fromShipped: Shipped(from)
-toShipped: Shipped(to)
-printLabels: Print stickers
-viewLabel: View sticker
+myEntries:
+    id: ID
+    landed: Landed
+    shipped: Shipped
+    fromShipped: Shipped(from)
+    toShipped: Shipped(to)
+    printLabels: Print stickers
+    viewLabel: View sticker
+    wareHouseIn: Warehouse in
+    warehouseInFk: Warehouse in
+    daysOnward: Days onward
+    daysAgo: Days ago
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index eb1e3f88a..2dfd601b1 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -9,10 +9,15 @@ entryFilter:
     filter:
         search: Búsqueda general
         reference: Referencia
-
-landed: F. llegada
-shipped: F. salida
-fromShipped: F. salida(desde)
-toShipped: F. salida(hasta)
-printLabels: Imprimir etiquetas
-viewLabel: Ver etiqueta
+myEntries:
+    id: ID
+    landed: F. llegada
+    shipped: F. salida
+    fromShipped: F. salida(desde)
+    toShipped: F. salida(hasta)
+    printLabels: Imprimir etiquetas
+    viewLabel: Ver etiqueta
+    wareHouseIn: Alm. entrada
+    warehouseInFk: Alm. entrada
+    daysOnward: Días adelante
+    daysAgo: Días atras

From 98df741f1b1bd2761960e0ce60c1578b8a714d67 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 2 Oct 2024 10:43:54 +0200
Subject: [PATCH 066/131] fix: refs #7884 deleted useless translations

---
 src/components/ui/VnFilterPanel.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index e39a841c3..43d634ad9 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -284,9 +284,6 @@ function sanitizer(params) {
 </style>
 
 <i18n>
-en:
-    daysOnward: Days onward
-    daysAgo: Days ago
 es:
     No filters applied: No se han aplicado filtros
     Applied filters: Filtros aplicados

From 8de5602564d6c46a85e9c10bd2bc6c627d7cb461 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 2 Oct 2024 15:31:09 +0200
Subject: [PATCH 067/131] chore: refs #8062 add changelog

---
 CHANGELOG.md | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 180 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f1d10b26e..88abb9ae0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,183 @@
+# Version 24.40 - 2024-10-02
+
+### Added 🆕
+
+-   chore: refs #4074 admit several acls by:jorgep
+-   chore: refs #4074 drop workerCreate by:jorgep
+-   chore: refs #4074 fix tests by:jorgep
+-   chore: refs #4074 wip replace useRole for useAcl by:jorgep
+-   chore: refs #7155 remove console.log by:alexm
+-   chore: refs #7155 typo by:alexm
+-   chore: refs #7663 add test by:jorgep
+-   chore: refs #7663 create test wip by:jorgep
+-   chore: refs #7663 drop useless code (origin/7663-setWeight) by:jorgep
+-   chore: refs #7828 fix e2e by:jorgep
+-   feat(AccountBasicData): add twoFactorFk by:alexm
+-   feat: add max rule by:Javier Segarra
+-   feat: add shortcut add event in some subSections by:Javier Segarra
+-   feat: add shortcut more buttons (origin/add_shortcut_add_subSections) by:Javier Segarra
+-   feat: add tooltip CustomerNewCustomAgent by:Javier Segarra
+-   feat: apply color when today by:Javier Segarra
+-   feat: change label because its more natural by:Javier Segarra
+-   feat: change order by:Javier Segarra
+-   feat: change QBadge color by:Javier Segarra
+-   feat: change url CustomerList by:Javier Segarra
+-   feat: copy customer countryFk by:Javier Segarra
+-   feat: create VnSelectEnum and add in AccountBasicData and ClaimBasicData by:alexm
+-   feat: CustomerBalance by:Javier Segarra
+-   feat: CustomerConsumptionFilter by:Javier Segarra
+-   feat: customer consumption (origin/7830-customerDesplegables, 7830-customerDesplegables) by:alexm
+-   feat: CustomerCreateTicket by:Javier Segarra
+-   feat: CustomerCredit section by:Javier Segarra
+-   feat: CustomerGreuges by:Javier Segarra
+-   feat: CustomerSample to VnTable by:Javier Segarra
+-   feat: global handler (origin/fix_global_handler, fix_global_handler) by:alexm
+-   feat: goToSupplier by:Javier Segarra
+-   feat: handle newValue by:Javier Segarra
+-   feat: handle same multiple CP by:Javier Segarra
+-   feat: hide menus on small view (origin/hideMenu) by:jorgep
+-   feat: minor changes by:Javier Segarra
+-   feat: orderCreateDialog by:Javier Segarra
+-   feat: refs #4074 drop useless code by:jorgep
+-   feat: refs #4074 useAcl in vnSelectDialog by:jorgep
+-   feat: refs #6346 new wagon type section by:Jon
+-   feat: refs #7404 add m3 and fix detail by:pablone
+-   feat: refs #7404 add some style to the form and reorganize fields by:pablone
+-   feat: refs #7404 add travel m3 to reserves form by:pablone
+-   feat: refs #7404 style dynamic text color by:pablone
+-   feat: refs #7404 travel m3 form by:pablone
+-   feat: refs #7500 added VnImg to show files by:Jon
+-   feat: refs #7663 add setWeight menu opt (wip) by:jorgep
+-   feat: refs #7663 fine tunning by:jorgep
+-   feat: refs #7828 create axios instance which no manage errors (origin/7828-makeCorrectCalls) by:jorgep
+-   feat: refs #7828 useAcl & cherry pick mail data worker by:jorgep
+-   feat: remove cli warnings by:Javier Segarra
+-   feat: show preparation field by:Javier Segarra
+-   feat: stateGroupedFilter by:Javier Segarra
+-   feat: translations fixed by:jgallego
+-   feat(TravelList): add daysOnward by:alexm
+-   feat: travel m3 by:pablone
+-   feat: use disableInifiniteScroll property by:Javier Segarra
+-   feat: VnImg draggable by:Javier Segarra
+-   feat: vnLocation changes by:Javier Segarra
+-   feat: vnSelect exprBuilder by:Javier Segarra
+-   fix: refs #7404 remove some style by:pablone
+-   fix: refs #7404 style non center pop up (origin/7404-fixFront) by:pablone
+-   fix: refs #7404 translates and some minor style fixes by:pablone
+-   fix: styles by:Javier Segarra
+-   perf: improve style by:Javier Segarra
+
+### Changed 📦
+
+-   perf: CustomerBalance by:Javier Segarra
+-   perf: CustomerBasicData by:Javier Segarra
+-   perf: CustomerBasicData.salesPersonFk by:Javier Segarra
+-   perf: CustomerSummary by:Javier Segarra
+-   perf: customerSummaryTable by:Javier Segarra
+-   perf: disable card option by:Javier Segarra
+-   perf: i18n by:Javier Segarra
+-   perf: improve by:Javier Segarra
+-   perf: improve style by:Javier Segarra
+-   perf: imrpove exprBuilder by:Javier Segarra
+-   perf: minor comments by:Javier Segarra
+-   perf: refs #6346 previous changes by:Jon
+-   perf: sendEmail customerConsumption by:Javier Segarra
+-   perf: solve reload CardSummary component by:Javier Segarra
+-   perf: update CustommerDescriptor by:Javier Segarra
+-   refactor: refs #4074 accept array by:jorgep
+-   refactor: refs #4074 rollback by:jorgep
+-   refactor: refs #4074 use acl & drop useless roles by:jorgep
+-   refactor: refs #4074 useAcl in navigationStore & router by:jorgep
+-   refactor: refs #4074 use fn (origin/4074-useAcls) by:jorgep
+-   refactor: refs #4074 use VnTitle by:jorgep
+-   refactor: refs #6346 deleted front error checking by:Jon
+-   refactor: refs #6346 requested changes by:Jon
+-   refactor: refs #6346 wagons to VnTable by:Jon
+-   refactor: refs #7500 deleted useless code by:Jon
+-   refactor: refs #7500 refactor vnimg when storage is dms by:Jon
+-   refactor: refs #7828 wip by:jorgep
+
+### Fixed 🛠️
+
+-   chore: refs #4074 fix tests by:jorgep
+-   chore: refs #7828 fix e2e by:jorgep
+-   feat: refs #7404 add m3 and fix detail by:pablone
+-   feat: translations fixed by:jgallego
+-   fix: #5938 grouped filter by:Javier Segarra
+-   fix: #6943 fix customerSummaryTable by:Javier Segarra
+-   fix: #6943 show nickname salesPerson by:Javier Segarra
+-   fix: address-create i18n by:Javier Segarra
+-   fix: comments (origin/6943_fix_customer_module, 6943_fix_customer_module) by:Javier Segarra
+-   fix: CusomerSummary to Address by:Javier Segarra
+-   fix: CustomerAddress mobile by:Javier Segarra
+-   fix: CustomerBillingData by:Javier Segarra
+-   fix: Customerconsumption by:Javier Segarra
+-   fix: customer credit opinion by:alexm
+-   fix: CustomerCreditOpinion workerDescriptor by:Javier Segarra
+-   fix: CustomerDescriptorAccount by:Javier Segarra
+-   fix: CustomerDescriptor.bussinessTypeFk by:Javier Segarra
+-   fix: CustomerFilter by:Javier Segarra
+-   fix: CustomerGreuges by:Javier Segarra
+-   fix: CustomerMandates by:Javier Segarra
+-   fix: Customer module find salesPersons out of first get by:Javier Segarra
+-   fix: CustomerRecovery transalate label by:Javier Segarra
+-   fix: CustomerSamples by:Javier Segarra
+-   fix: customerSummaryToTicketList button by:Javier Segarra
+-   fix: CustomerWebPayment by:Javier Segarra
+-   fix: CustommerSummaryTable Proxy by:Javier Segarra
+-   fix: deleted code by:Jon
+-   fix: duplicate code by:alexm
+-   fix: emit:updateModelValue by:Javier Segarra
+-   fix: fixed wagon tests by:Jon
+-   fix: fix wagon list reload by:Jon
+-   fix: i18n en preparation label by:Javier Segarra
+-   fix: infiniteScroll by:Javier Segarra
+-   fix: isFullMovable checkbox by:Javier Segarra
+-   fix: merge conflicts by:Javier Segarra
+-   fix: merge in dev by:alexm
+-   fix: missing code by:Jon
+-   fix: Options VnSelect properties by:Javier Segarra
+-   fix: refs #4074 await to watch by:jorgep
+-   fix: refs #4074 drop wrong acl by:jorgep
+-   fix: refs #4074 workerCard data-key by:jorgep
+-   fix: refs #6346 fix list and create by:pablone
+-   fix: refs #6943 prevent null (origin/6943-warmfix-preventNull) by:jorgep
+-   fix: refs #7155 remove userParams in watcher (7155-travel_daysOnward) by:alexm
+-   fix: refs #7155 use chip-locale (origin/7155-travel_daysOnward_2, 7155-travel_daysOnward_2) by:alexm
+-   fix: refs #7404 remove console.log by:pablone
+-   fix: refs #7404 remove from test by:pablone
+-   fix: refs #7404 remove some style by:pablone
+-   fix: refs #7404 revert commit prevent production access by:pablone
+-   fix: refs #7404 style non center pop up (origin/7404-fixFront) by:pablone
+-   fix: refs #7404 translates and some minor style fixes by:pablone
+-   fix: refs #7500 fixed e2e test by:Jon
+-   fix: refs #7500 fixed showing images wrongly by:Jon
+-   fix: refs #7830 customer credit by:pablone
+-   fix: refs #7830 remove console.log by:pablone
+-   fix: remove console.log by:pablone
+-   fix: remove FetchData by:Javier Segarra
+-   fix: remove FIXME (origin/6943_fix_customerSummaryTable) by:Javier Segarra
+-   fix: remove print variable by:Javier Segarra
+-   fix: remove promise execution by:Javier Segarra
+-   fix: reset VnTable scroll properties by:Javier Segarra
+-   fix: rule by:Javier Segarra
+-   fix: solve conflicts from master to test by:Javier Segarra
+-   fix: split params (origin/warmfix-addSearchUrl) by:jorgep
+-   fix: state cell by:Javier Segarra
+-   fix: stop call back event hasMoreData by:Javier Segarra
+-   fix: styles by:Javier Segarra
+-   fix: SupplierFiscalData VnLocation (origin/fix_supplierFD_location) by:Javier Segarra
+-   fix: VnLocation test by:Javier Segarra
+-   fix(VnTable): header background-color by:alexm
+-   fix(VnTable): sanitizer value is defined by:carlossa
+-   fix: wagon reload (origin/FixWagonRedirect) by:Jon
+-   fix: workerDms filter workerFk by:alexm
+-   fix(WorkerList): add type email by:alexm
+-   Merge remote-tracking branch 'origin/7830-customerDesplegables' into 6943_fix_customerSummaryTable by:Javier Segarra
+-   refs #7155 scopeDays fix (origin/7155-scopeDays) by:carlossa
+-   revert: vnUSerLink change by:Javier Segarra
+-   test: fix test (7677_vnLocation_perf) by:Javier Segarra
+
 # Version 24.38 - 2024-09-17
 
 ### Added 🆕

From 5e59ecdb43952893a4b98e473e80095df305b733 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 2 Oct 2024 17:14:51 +0200
Subject: [PATCH 068/131] fix: refs #7404 with on stockBought mobile version

---
 src/pages/Entry/EntryStockBought.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 0e8013586..0b31dde17 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -279,7 +279,6 @@ function round(value) {
     display: flex;
     flex-direction: column;
     align-items: center;
-    width: 35%;
 }
 .text-negative {
     color: $negative !important;

From b08a5e63e982f3150664a4a257783219de52f7d0 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Thu, 3 Oct 2024 08:29:26 +0200
Subject: [PATCH 069/131] fix: inheritWarehouse

---
 src/components/RefundInvoiceForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/RefundInvoiceForm.vue b/src/components/RefundInvoiceForm.vue
index c21c892dd..9d9f0cff1 100644
--- a/src/components/RefundInvoiceForm.vue
+++ b/src/components/RefundInvoiceForm.vue
@@ -24,9 +24,9 @@ const { notify } = useNotify();
 
 const rectificativeTypeOptions = ref([]);
 const siiTypeInvoiceOutsOptions = ref([]);
-const inheritWarehouse = ref(true);
 const invoiceParams = reactive({
     id: $props.invoiceOutData?.id,
+    inheritWarehouse: true,
 });
 const invoiceCorrectionTypesOptions = ref([]);
 
@@ -138,7 +138,7 @@ const refund = async () => {
                     <div>
                         <QCheckbox
                             :label="t('Inherit warehouse')"
-                            v-model="inheritWarehouse"
+                            v-model="invoiceParams.inheritWarehouse"
                         />
                         <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
                             <QTooltip>{{ t('Inherit warehouse tooltip') }}</QTooltip>

From 641a25097d874069ece59949e24e32ede213b0fb Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Thu, 3 Oct 2024 08:30:19 +0200
Subject: [PATCH 070/131] fix: refundInvoice

---
 src/components/RefundInvoiceForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/RefundInvoiceForm.vue b/src/components/RefundInvoiceForm.vue
index c21c892dd..9d9f0cff1 100644
--- a/src/components/RefundInvoiceForm.vue
+++ b/src/components/RefundInvoiceForm.vue
@@ -24,9 +24,9 @@ const { notify } = useNotify();
 
 const rectificativeTypeOptions = ref([]);
 const siiTypeInvoiceOutsOptions = ref([]);
-const inheritWarehouse = ref(true);
 const invoiceParams = reactive({
     id: $props.invoiceOutData?.id,
+    inheritWarehouse: true,
 });
 const invoiceCorrectionTypesOptions = ref([]);
 
@@ -138,7 +138,7 @@ const refund = async () => {
                     <div>
                         <QCheckbox
                             :label="t('Inherit warehouse')"
-                            v-model="inheritWarehouse"
+                            v-model="invoiceParams.inheritWarehouse"
                         />
                         <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
                             <QTooltip>{{ t('Inherit warehouse tooltip') }}</QTooltip>

From df64814c57da5fdc7331df94cec28be2004bf83e Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Thu, 3 Oct 2024 08:31:13 +0200
Subject: [PATCH 071/131] fix: hotfix refund invoice

---
 src/components/RefundInvoiceForm.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/RefundInvoiceForm.vue b/src/components/RefundInvoiceForm.vue
index c21c892dd..9d9f0cff1 100644
--- a/src/components/RefundInvoiceForm.vue
+++ b/src/components/RefundInvoiceForm.vue
@@ -24,9 +24,9 @@ const { notify } = useNotify();
 
 const rectificativeTypeOptions = ref([]);
 const siiTypeInvoiceOutsOptions = ref([]);
-const inheritWarehouse = ref(true);
 const invoiceParams = reactive({
     id: $props.invoiceOutData?.id,
+    inheritWarehouse: true,
 });
 const invoiceCorrectionTypesOptions = ref([]);
 
@@ -138,7 +138,7 @@ const refund = async () => {
                     <div>
                         <QCheckbox
                             :label="t('Inherit warehouse')"
-                            v-model="inheritWarehouse"
+                            v-model="invoiceParams.inheritWarehouse"
                         />
                         <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
                             <QTooltip>{{ t('Inherit warehouse tooltip') }}</QTooltip>

From 01dc25da8ccc320dd336a36297d41c426b599339 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 3 Oct 2024 10:23:27 +0200
Subject: [PATCH 072/131] refactor: refs #7874 create element if condition

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

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 6ae8538e2..340f46775 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -57,10 +57,11 @@ onBeforeRouteLeave((to, from, next) => {
 </script>
 <template>
     <FetchData
+        v-if="selectType"
         url="ObservationTypes"
         :filter="{ fields: ['id', 'description'] }"
-        :auto-load="selectType"
-        @on-fetch="(data) => observationTypes.push(...data)"
+        auto-load
+        @on-fetch="(data) => (observationTypes = data)"
     />
     <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
         <QCardSection horizontal>

From 05a1d0e8fbb0a70d8630e72cf6c5952c3ecd3327 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 3 Oct 2024 10:52:16 +0200
Subject: [PATCH 073/131] fix: refs #7129 translates from globals to module
 locals

---
 src/i18n/locale/en.yml        | 30 +-----------------------------
 src/i18n/locale/es.yml        | 15 ---------------
 src/pages/Route/locale/en.yml | 14 ++++++++++++++
 src/pages/Route/locale/es.yml | 14 ++++++++++++++
 4 files changed, 29 insertions(+), 44 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 20a612a82..4c559dfdf 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -870,35 +870,7 @@ wagon:
         minHeightBetweenTrays: 'The minimum height between trays is '
         maxWagonHeight: 'The maximum height of the wagon is '
         uncompleteTrays: There are incomplete trays
-route:
-    pageTitles:
-        agency: Agency List
-        routes: Routes
-        cmrsList: CMRs list
-        RouteList: List
-        routeCreate: New route
-        basicData: Basic Data
-        summary: Summary
-        RouteRoadmap: Roadmaps
-        RouteRoadmapCreate: Create roadmap
-        tickets: Tickets
-        log: Log
-        autonomous: Autonomous
-        RouteExtendedList: Router
-    cmr:
-        list:
-            results: results
-            cmrFk: CMR id
-            hasCmrDms: Attached in gestdoc
-            'true': 'Yes'
-            'false': 'No'
-            ticketFk: Ticketd id
-            routeFk: Route id
-            country: Country
-            clientFk: Client id
-            shipped: Preparation date
-            viewCmr: View CMR
-            downloadCmrs: Download CMRs
+
 supplier:
     list:
         payMethod: Pay method
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index ae0274415..7cb17aad3 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -868,21 +868,6 @@ wagon:
         minHeightBetweenTrays: 'La distancia mínima entre bandejas es '
         maxWagonHeight: 'La altura máxima del vagón es '
         uncompleteTrays: Hay bandejas sin completar
-route:
-    cmr:
-        list:
-            results: resultados
-            cmrFk: Id CMR
-            hasCmrDms: Gestdoc
-            'true': Sí
-            'false': 'No'
-            ticketFk: Id ticket
-            routeFk: Id ruta
-            country: País
-            clientFk: Id cliente
-            shipped: Fecha preparación
-            viewCmr: Ver CMR
-            downloadCmrs: Descargar CMRs
 supplier:
     list:
         payMethod: Método de pago
diff --git a/src/pages/Route/locale/en.yml b/src/pages/Route/locale/en.yml
index 617d704d2..d113fda67 100644
--- a/src/pages/Route/locale/en.yml
+++ b/src/pages/Route/locale/en.yml
@@ -23,3 +23,17 @@ route:
     Summary: Summary
     Route is closed: Route is closed
     Route is not served: Route is not served
+    cmr:
+        list:
+            results: results
+            cmrFk: CMR id
+            hasCmrDms: Attached in gestdoc
+            'true': 'Yes'
+            'false': 'No'
+            ticketFk: Ticketd id
+            routeFk: Route id
+            country: Country
+            clientFk: Client id
+            shipped: Preparation date
+            viewCmr: View CMR
+            downloadCmrs: Download CMRs
diff --git a/src/pages/Route/locale/es.yml b/src/pages/Route/locale/es.yml
index ed96ad915..a6ba4f370 100644
--- a/src/pages/Route/locale/es.yml
+++ b/src/pages/Route/locale/es.yml
@@ -23,3 +23,17 @@ route:
     Summary: Resumen
     Route is closed: La ruta está cerrada
     Route is not served: La ruta no está servida
+    cmr:
+        list:
+            results: resultados
+            cmrFk: Id CMR
+            hasCmrDms: Gestdoc
+            'true': Sí
+            'false': 'No'
+            ticketFk: Id ticket
+            routeFk: Id ruta
+            country: País
+            clientFk: Id cliente
+            shipped: Fecha preparación
+            viewCmr: Ver CMR
+            downloadCmrs: Descargar CMRs

From ad8b72660fa80917f02598ad823ad0fe15fea3dd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 3 Oct 2024 13:37:21 +0200
Subject: [PATCH 074/131] fix: refs #7353 scopeDays

---
 src/pages/Monitor/Ticket/MonitorTickets.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 16d5abffb..d24230c64 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -25,7 +25,11 @@ const stateOpts = ref([]);
 const zoneOpts = ref([]);
 const visibleColumns = ref([]);
 const { viewSummary } = useSummaryDialog();
-const [from, to] = dateRange(Date.vnNew());
+const from = Date.vnNew();
+from.setHours(0, 0, 0, 0);
+const to = new Date(from.getTime());
+to.setDate(to.getDate() + 1);
+to.setHours(23, 59, 59, 999);
 
 function exprBuilder(param, value) {
     switch (param) {

From c04dad38f12a36aa22d85a7c8e459cbbf01bf495 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 3 Oct 2024 15:02:14 +0200
Subject: [PATCH 075/131] feat: refs #7404 change travel name and remove buyer
 filter

---
 src/pages/Entry/EntryStockBought.vue | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 0b31dde17..2b5ec53f5 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -45,6 +45,7 @@ const columns = [
             optionValue: 'id',
             useLike: false,
         },
+        columnFilter: false,
     },
     {
         align: 'center',
@@ -157,7 +158,7 @@ function round(value) {
                 @on-fetch="
                     (data) => {
                         travel = data.find(
-                            (data) => data.warehouseIn.code.toLowerCase() === 'vnh'
+                            (data) => data.warehouseIn?.code.toLowerCase() === 'vnh'
                         );
                     }
                 "
@@ -165,7 +166,7 @@ function round(value) {
             <VnRow class="travel">
                 <div v-if="travel">
                     <span style="color: var(--vn-label-color)">
-                        {{ t('Booked trucks') }}:
+                        {{ t('Purchase Spaces') }}:
                     </span>
                     <span>
                         {{ travel?.m3 }}
@@ -236,6 +237,7 @@ function round(value) {
                 :footer="true"
                 table-height="80vh"
                 auto-load
+                :column-search="false"
             >
                 <template #column-workerFk="{ row }">
                     <span class="link" @click.stop>
@@ -288,7 +290,7 @@ function round(value) {
     es:
         Edit travel: Editar envío
         Travel: Envíos
-        Booked trucks: Camiones reservados
+        Purchase Spaces: Espacios de compra
         Buyer: Comprador
         Reserve: Reservado
         Bought: Comprado

From cd20db637c6cdf4763274b29618f01f51f53c953 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 3 Oct 2024 15:30:26 +0200
Subject: [PATCH 076/131] fix: refs #7874 btn ui

---
 src/components/ui/VnNotes.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 340f46775..92dd32691 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -101,6 +101,8 @@ onBeforeRouteLeave((to, from, next) => {
                             color="primary"
                             flat
                             @click="insert"
+                            class="q-mb-xs"
+                            dense
                         />
                     </template>
                 </VnInput>

From c64fe8c044cbb0b01a41792da03f0d5d9829eb4b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 3 Oct 2024 17:04:56 +0200
Subject: [PATCH 077/131] chore: refs #7207 refactor locale

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

diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index bf2e7db48..801a04342 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -274,10 +274,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     :label="t('invoiceIn.summary.company')"
                     :value="entity.company?.code"
                 />
-                <VnLv
-                    :label="t('invoiceIn.summary.booked')"
-                    :value="invoiceIn?.isBooked"
-                />
+                <VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
             </QCard>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index b19e047fa..d1c0856b5 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -116,7 +116,7 @@ const activities = ref([]);
             <QItem>
                 <QItemSection>
                     <QCheckbox
-                        :label="t('params.isBooked')"
+                        :label="t('invoiceIn.isBooked')"
                         v-model="params.isBooked"
                         @update:model-value="searchFn()"
                         toggle-indeterminate
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 0cad09378..265f95b0e 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -65,7 +65,7 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'isBooked',
-        label: t('invoiceIn.list.isBooked'),
+        label: t('invoiceIn.isBooked'),
         columnFilter: false,
     },
     {
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index 824fd6e12..b09340c81 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -1,5 +1,6 @@
 invoiceIn:
     serial: Serial
+    isBooked: Is booked
     list:
         ref: Reference
         supplier: Supplier
@@ -7,7 +8,6 @@ invoiceIn:
         serial: Serial
         file: File
         issued: Issued
-        isBooked: Is booked
         awb: AWB
         amount: Amount
     card:
@@ -31,7 +31,6 @@ invoiceIn:
         sage: Sage withholding
         vat: Undeductible VAT
         company: Company
-        booked: Booked
         expense: Expense
         taxableBase: Taxable base
         rate: Rate
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index 2d3b137f4..31d41fc97 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -1,5 +1,6 @@
 invoiceIn:
     serial: Serie
+    isBooked: Contabilizada
     list:
         ref: Referencia
         supplier: Proveedor
@@ -7,7 +8,6 @@ invoiceIn:
         shortIssued: F. emisión
         file: Fichero
         issued: Fecha emisión
-        isBooked: Contabilizada
         awb: AWB
         amount: Importe
     card:
@@ -31,7 +31,6 @@ invoiceIn:
         sage: Retención sage
         vat: Iva no deducible
         company: Empresa
-        booked: Contabilizada
         expense: Gasto
         taxableBase: Base imp.
         rate: Tasa

From 530ed4b716b55aa2ddb5365baddadc5694f2281f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 4 Oct 2024 08:48:36 +0200
Subject: [PATCH 078/131] refs #7355 fix searchbar

---
 src/pages/Account/AccountList.vue      | 25 +++++++++----------------
 src/pages/Account/Card/AccountCard.vue |  2 +-
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index d698596b9..d1240f7a6 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -5,7 +5,8 @@ import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import AccountSummary from './Card/AccountSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-
+import AccountFilter from './AccountFilter.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
@@ -18,14 +19,6 @@ const columns = computed(() => [
         isId: true,
         field: 'id',
         cardVisible: true,
-        columnFilter: {
-            component: 'select',
-            name: 'search',
-            attrs: {
-                url: 'VnUsers/preview',
-                fields: ['id', 'name'],
-            },
-        },
     },
     {
         align: 'left',
@@ -36,9 +29,6 @@ const columns = computed(() => [
         columnField: {
             component: null,
         },
-        columnFilter: {
-            inWhere: true,
-        },
         cardVisible: true,
         create: true,
     },
@@ -50,9 +40,6 @@ const columns = computed(() => [
         columnField: {
             component: null,
         },
-        columnFilter: {
-            inWhere: true,
-        },
         cardVisible: true,
         create: true,
     },
@@ -105,7 +92,11 @@ const exprBuilder = (param, value) => {
         :label="t('account.search')"
         :info="t('account.searchInfo')"
     />
-
+    <RightMenu>
+        <template #right-panel>
+            <AccountFilter data-key="AccountUsers" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="AccountUsers"
@@ -115,6 +106,8 @@ const exprBuilder = (param, value) => {
         default-mode="table"
         redirect="account"
         :use-model="true"
+        :right-search="false"
+        auto-load
     />
 </template>
 
diff --git a/src/pages/Account/Card/AccountCard.vue b/src/pages/Account/Card/AccountCard.vue
index 67fa15898..119a7fd07 100644
--- a/src/pages/Account/Card/AccountCard.vue
+++ b/src/pages/Account/Card/AccountCard.vue
@@ -10,7 +10,7 @@ const { t } = useI18n();
     <VnCard
         data-key="Account"
         :descriptor="AccountDescriptor"
-        search-data-key="AccountUsers"
+        search-data-key="AccountList"
         :searchbar-props="{
             url: 'VnUsers/preview',
             label: t('account.search'),

From 4b9588c189544aee28e36f1fa66a23a7ed5ea27b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 4 Oct 2024 08:55:48 +0200
Subject: [PATCH 079/131] refactor: refs #7825 modified worker list form to
 fill the field when a bank entity is created

---
 src/pages/Worker/WorkerList.vue | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index f4ae20591..4b7d028e7 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -93,6 +93,11 @@ onBeforeMount(async () => {
     ).data?.payMethodFk;
 });
 
+const handleNewBankEntity = (response, formData) => {
+    bankEntitiesOptions.value = [...bankEntitiesOptions.value, response];
+    formData.bankEntityFk = response.id;
+};
+
 function handleLocation(data, location) {
     const { town, code, provinceFk, countryFk } = location ?? {};
     data.postcode = code;
@@ -319,7 +324,10 @@ async function autofillBic(worker) {
                     >
                         <template #form>
                             <CreateBankEntityForm
-                                @on-data-saved="(data) => bankEntitiesOptions.push(data)"
+                                @on-data-saved="
+                                    (_, requestResponse) =>
+                                        handleNewBankEntity(requestResponse, data)
+                                "
                             />
                         </template>
                         <template #option="scope">

From 7874db16475955b92f1b8bbe4efd2bf5caa684d6 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 4 Oct 2024 09:58:23 +0200
Subject: [PATCH 080/131] fix: zone delivery postcodes filter and order catalog
 type filter

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 1 +
 src/pages/Zone/ZoneDeliveryPanel.vue        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 354c44747..6de43e86a 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -247,6 +247,7 @@ function addOrder(value, field, params) {
                         rounded
                         emit-value
                         use-input
+                        sort-by="name ASC"
                         :disable="!selectedCategoryFk"
                         @update:model-value="
                             (value) => {
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index d6c96b935..088811b01 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -94,7 +94,7 @@ watch(
                 url="Postcodes/location"
                 :fields="['geoFk', 'code', 'townFk', 'countryFk']"
                 sort-by="code, townFk"
-                option-value="geoFk"
+                option-value="code"
                 option-label="code"
                 option-filter="code"
                 hide-selected

From 0d31adaa4b1cdd85ca24825969d3cc25a44884bc Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 4 Oct 2024 11:29:21 +0200
Subject: [PATCH 081/131] refs #7767 check holiday

---
 src/pages/Worker/Card/WorkerCalendarFilter.vue | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index 2b81b6eaf..95fb2d393 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -3,9 +3,11 @@ import WorkerEventLabel from 'pages/Worker/Card/WorkerEventLabel.vue';
 import FetchData from 'components/FetchData.vue';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'components/common/VnSelect.vue';
+import useNotify from 'src/composables/useNotify';
 import { useRoute } from 'vue-router';
-import { computed, ref } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 import { toDateFormat } from '../../../filters/date';
+const { notify } = useNotify();
 
 const { t } = useI18n();
 const route = useRoute();
@@ -33,6 +35,9 @@ const props = defineProps({
     },
 });
 
+onMounted(async () => {
+    await checkHolidays(props.contractHolidays);
+});
 const emit = defineEmits(['update:businessFk', 'update:year', 'update:absenceType']);
 
 const selectedBusinessFk = computed({
@@ -60,6 +65,16 @@ const generateYears = () => {
     return Array.from({ length: 5 }, (_, i) => String(maxYear - i)) || [];
 };
 
+const checkHolidays = (contractHolidays) => {
+    console.log('contractHolidays', contractHolidays);
+    if (
+        contractHolidays.holidaysEnjoyed > contractHolidays.totalHolidays ||
+        contractHolidays.hoursEnjoyed > contractHolidays.totalHours
+    ) {
+        notify(t('Vacation days have been exceeded'), 'negative');
+    }
+};
+
 const absenceTypeList = ref([]);
 const contractList = ref([]);
 const yearList = ref(generateYears());

From 67c2e284ba52d4d5df4338d50b05385bf65916c7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 4 Oct 2024 11:45:10 +0200
Subject: [PATCH 082/131] feat: refs #7702 ask old pass

---
 src/components/common/VnChangePassword.vue    | 26 ++++++++++-------
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 .../Account/Card/AccountDescriptorMenu.vue    | 28 ++++++++++++++++++-
 src/pages/Customer/Card/CustomerWebAccess.vue |  3 +-
 src/pages/Worker/Card/WorkerDescriptor.vue    |  3 +-
 6 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/src/components/common/VnChangePassword.vue b/src/components/common/VnChangePassword.vue
index 18f538fc3..79784f3c5 100644
--- a/src/components/common/VnChangePassword.vue
+++ b/src/components/common/VnChangePassword.vue
@@ -6,7 +6,10 @@ import VnInput from './VnInput.vue';
 import FetchData from '../FetchData.vue';
 import useNotify from 'src/composables/useNotify';
 
-const props = defineProps({ submitFn: { type: Function, default: () => {} } });
+const props = defineProps({
+    submitFn: { type: Function, default: () => {} },
+    askOldPass: { type: Boolean, default: false },
+});
 const emit = defineEmits(['onSubmit']);
 const { t } = useI18n();
 const { notify } = useNotify();
@@ -18,8 +21,7 @@ const requirements = ref([]);
 const isLoading = ref(false);
 
 const validate = async () => {
-    const { newPassword, repeatPassword } = passwords.value;
-    console.log('Validating passwords:', newPassword, repeatPassword);
+    const { newPassword, repeatPassword, oldPassword } = passwords.value;
 
     if (!newPassword) {
         notify(t('You must enter a new password'), 'negative');
@@ -29,17 +31,14 @@ const validate = async () => {
         notify(t("Passwords don't match"), 'negative');
         return;
     }
+
     try {
         isLoading.value = true;
-        console.log('Calling submitFn with:', newPassword);
-
-        await props.submitFn(newPassword);
+        await props.submitFn(newPassword, oldPassword);
         emit('onSubmit');
     } catch (e) {
-        console.error('submitFn failed:', e);
         notify('errors.writeRequest', 'negative');
     } finally {
-        console.log('Entering finally block');
         changePassDialog.value.hide();
         isLoading.value = false;
     }
@@ -58,7 +57,7 @@ defineExpose({ show: () => changePassDialog.value.show() });
             <QCardSection>
                 <slot name="header">
                     <VnRow class="items-center" style="flex-direction: row">
-                        <span class="text-h6" v-text="t('Change password')" />
+                        <span class="text-h6" v-text="t('globals.changePass')" />
                         <QIcon
                             class="cursor-pointer"
                             name="close"
@@ -71,6 +70,14 @@ defineExpose({ show: () => changePassDialog.value.show() });
             </QCardSection>
             <QForm ref="form">
                 <QCardSection>
+                    <VnInput
+                        v-if="props.askOldPass"
+                        :label="t('Old password')"
+                        v-model="passwords.oldPassword"
+                        type="password"
+                        :required="true"
+                        autofocus
+                    />
                     <VnInput
                         :label="t('New password')"
                         v-model="passwords.newPassword"
@@ -122,7 +129,6 @@ defineExpose({ show: () => changePassDialog.value.show() });
 
 <i18n>
 es:
-    Change password: Cambiar contraseña
     New password: Nueva contraseña
     Repeat password: Repetir contraseña
     You must enter a new password: Debes introducir la nueva contraseña
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 4c559dfdf..b76c147cd 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -300,6 +300,7 @@ globals:
         from: From
         To: To
         stateFk: State
+    changePass: Change password
 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 7cb17aad3..d0d5bdc0d 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -304,6 +304,7 @@ globals:
         from: Desde
         To: Hasta
         stateFk: Estado
+    changePass: Cambiar contraseña
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Account/Card/AccountDescriptorMenu.vue b/src/pages/Account/Card/AccountDescriptorMenu.vue
index 0e35d25f3..6f1d2ca1f 100644
--- a/src/pages/Account/Card/AccountDescriptorMenu.vue
+++ b/src/pages/Account/Card/AccountDescriptorMenu.vue
@@ -4,9 +4,12 @@ import { computed, ref, toRefs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { useRoute } from 'vue-router';
+import { useAcl } from 'src/composables/useAcl';
 import { useArrayData } from 'src/composables/useArrayData';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
+import VnChangePassword from 'src/components/common/VnChangePassword.vue';
 import useNotify from 'src/composables/useNotify.js';
+
 const $props = defineProps({
     hasAccount: {
         type: Boolean,
@@ -62,6 +65,19 @@ async function sync() {
 }
 </script>
 <template>
+    <VnChangePassword
+        ref="changePassRef"
+        :ask-old-pass="true"
+        :submit-fn="
+            async (newPassword, oldPassword) => {
+                await axios.patch(`Accounts/change-password`, {
+                    userId: entityId,
+                    newPassword,
+                    oldPassword,
+                });
+            }
+        "
+    />
     <VnConfirm
         v-model="showSyncDialog"
         :message="t('account.card.actions.sync.message')"
@@ -92,6 +108,17 @@ async function sync() {
             />
         </template>
     </VnConfirm>
+    <QItem
+        v-if="
+            entityId == account.id &&
+            useAcl().hasAny([{ model: 'Account', props: '*', accessType: 'WRITE' }])
+        "
+        v-ripple
+        clickable
+        @click="$refs.changePassRef.show()"
+    >
+        <QItemSection>{{ t('globals.changePass') }}</QItemSection>
+    </QItem>
     <QItem
         v-if="account.hasAccount"
         v-ripple
@@ -138,6 +165,5 @@ async function sync() {
     <QItem v-ripple clickable @click="showSyncDialog = true">
         <QItemSection>{{ t('account.card.actions.sync.name') }}</QItemSection>
     </QItem>
-
     <QSeparator />
 </template>
diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index ba906a144..1db32c752 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -56,7 +56,7 @@ async function hasCustomerRole() {
         </template>
         <template #moreActions>
             <QBtn
-                :label="t('Change password')"
+                :label="t('globals.changePass')"
                 color="primary"
                 icon="edit"
                 :disable="!canChangePassword"
@@ -81,5 +81,4 @@ es:
     User: Usuario
     Recovery email: Correo de recuperacion
     This email is used for user to regain access their account: Este correo electrónico se usa para que el usuario recupere el acceso a su cuenta
-    Change password: Cambiar contraseña
 </i18n>
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 6a70e46f5..1cb42bbfb 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -88,7 +88,7 @@ const handlePhotoUpdated = (evt = false) => {
                 @click="$refs.changePassRef.show"
             >
                 <QItemSection>
-                    {{ t('Change password') }}
+                    {{ t('globals.changePass') }}
                 </QItemSection>
             </QItem>
         </template>
@@ -209,5 +209,4 @@ const handlePhotoUpdated = (evt = false) => {
 es:
     Click to allow the user to be disabled: Marcar para deshabilitar
     Click to exclude the user from getting disabled: Marcar para no deshabilitar
-    Change password: Cambiar contraseña
 </i18n>

From ae8e4ba4b975b1c6381fabec08de18cbc190f978 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 4 Oct 2024 11:54:40 +0200
Subject: [PATCH 083/131] chore: refs #7702 fix tests

---
 .../common/VnChangePassword.spec.js           | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/test/vitest/__tests__/components/common/VnChangePassword.spec.js b/test/vitest/__tests__/components/common/VnChangePassword.spec.js
index e7a3bdcf7..f5a967bb5 100644
--- a/test/vitest/__tests__/components/common/VnChangePassword.spec.js
+++ b/test/vitest/__tests__/components/common/VnChangePassword.spec.js
@@ -50,10 +50,21 @@ describe('VnSmsDialog', () => {
         );
     });
 
-    it('should call submitFn and emit onSubmit when passwords match', async () => {
-        vm.passwords.newPassword = 'password';
-        vm.passwords.repeatPassword = 'password';
-        await vm.validate();
-        expect(vm.props.submitFn).toHaveBeenCalledWith('password');
+    describe('if passwords match', () => {
+        it('should call submitFn and emit password', async () => {
+            vm.passwords.newPassword = 'password';
+            vm.passwords.repeatPassword = 'password';
+            await vm.validate();
+            expect(vm.props.submitFn).toHaveBeenCalledWith('password', undefined);
+        });
+
+        it('should call submitFn and emit password and old password', async () => {
+            vm.passwords.newPassword = 'password';
+            vm.passwords.repeatPassword = 'password';
+            vm.passwords.oldPassword = 'oldPassword';
+
+            await vm.validate();
+            expect(vm.props.submitFn).toHaveBeenCalledWith('password', 'oldPassword');
+        });
     });
 });

From 195747b5a0e938f3fe89779a4775ddeb79e22f72 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 4 Oct 2024 12:34:37 +0200
Subject: [PATCH 084/131] feat: added click and transfer tickets and deleted
 useless code

---
 src/pages/Ticket/Card/TicketTransfer.vue     | 38 ++++++--------------
 src/pages/Ticket/Card/TicketTransferForm.vue |  7 ++--
 2 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index 1944b80f4..e1a011a84 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -1,13 +1,11 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
 
 import VnInput from 'src/components/common/VnInput.vue';
 import TicketTransferForm from './TicketTransferForm.vue';
 
 import { toDateFormat } from 'src/filters/date.js';
-import axios from 'axios';
 
 const $props = defineProps({
     mana: {
@@ -28,13 +26,10 @@ const $props = defineProps({
     },
 });
 
-const emit = defineEmits(['refreshData']);
-
-const router = useRouter();
 const { t } = useI18n();
 const QPopupProxyRef = ref(null);
-
-const _transfer = ref(null);
+const transferFormRef = ref(null);
+const _transfer = ref();
 
 const transferLinesColumns = computed(() => [
     {
@@ -85,19 +80,11 @@ const destinationTicketColumns = computed(() => [
     },
 ]);
 
-const transferSales = async (ticketId) => {
-    const params = {
-        ticketId: ticketId,
-        sales: $props.transfer.sales,
-    };
-
-    const { data } = await axios.post(
-        `tickets/${$props.ticket.id}/transferSales`,
-        params
-    );
-
-    if (data && data.id === $props.ticket.id) emit('refreshData');
-    else router.push({ name: 'TicketSale', params: { id: data.id } });
+const handleRowClick = (row) => {
+    const ticketId = row.id;
+    if (transferFormRef.value) {
+        transferFormRef.value.transferSales(ticketId);
+    }
 };
 
 onMounted(() => (_transfer.value = $props.transfer));
@@ -105,9 +92,8 @@ onMounted(() => (_transfer.value = $props.transfer));
 
 <template>
     <QPopupProxy ref="QPopupProxyRef">
-        <QCard class="q-px-md" style="display: flex">
+        <QCard class="q-px-md" style="display: flex; width: 80vw">
             <QTable
-                v-if="transfer.sales"
                 :rows="transfer.sales"
                 :columns="transferLinesColumns"
                 :title="t('Sales to transfer')"
@@ -121,9 +107,6 @@ onMounted(() => (_transfer.value = $props.transfer));
                         <VnInput
                             v-model.number="row.quantity"
                             :clearable="false"
-                            @keyup.enter="changeQuantity(row)"
-                            @blur="changeQuantity(row)"
-                            @focus="edit.oldQuantity = row.quantity"
                             style="max-width: 60px"
                         />
                     </QTd>
@@ -137,6 +120,7 @@ onMounted(() => (_transfer.value = $props.transfer));
                 :title="t('Destination ticket')"
                 row-key="id"
                 class="full-width q-mt-md"
+                @row-click="(_, row) => handleRowClick(row)"
             >
                 <template #body-cell-address="{ row }">
                     <QTd @click.stop>
@@ -158,10 +142,10 @@ onMounted(() => (_transfer.value = $props.transfer));
                 </template>
 
                 <template #no-data>
-                    <TicketTransferForm v-bind="$props" />
+                    <TicketTransferForm ref="transferFormRef" v-bind="$props" />
                 </template>
                 <template #bottom>
-                    <TicketTransferForm v-bind="$props" />
+                    <TicketTransferForm ref="transferFormRef" v-bind="$props" />
                 </template>
             </QTable>
         </QCard>
diff --git a/src/pages/Ticket/Card/TicketTransferForm.vue b/src/pages/Ticket/Card/TicketTransferForm.vue
index 9507429e6..d07a9d2e7 100644
--- a/src/pages/Ticket/Card/TicketTransferForm.vue
+++ b/src/pages/Ticket/Card/TicketTransferForm.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
@@ -31,7 +31,7 @@ const emit = defineEmits(['refreshData']);
 const router = useRouter();
 const { t } = useI18n();
 
-const _transfer = ref(null);
+const _transfer = ref($props.transfer);
 
 const transferSales = async (ticketId) => {
     const params = {
@@ -48,11 +48,10 @@ const transferSales = async (ticketId) => {
     else router.push({ name: 'TicketSale', params: { id: data.id } });
 };
 
-onMounted(() => (_transfer.value = $props.transfer));
+defineExpose({ transferSales });
 </script>
 
 <template>
-    {{ _transfer }}
     <QForm class="q-mt-lg full-width">
         <VnInput
             v-model.number="_transfer.ticketId"

From 7dc019cfbbc24bd51f0e426bb96867f3c35d71d2 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 4 Oct 2024 13:13:57 +0200
Subject: [PATCH 085/131] fix: refs #4988 selector on e2e

---
 src/pages/Route/Agency/Card/AgencyWorkcenter.vue | 13 +++++++------
 .../route/agency/agencyWorkCenter.spec.js        | 16 +++++++---------
 test/cypress/integration/route/routeList.spec.js |  2 +-
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
index 1f3cab5d0..86fb94e0a 100644
--- a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
@@ -46,13 +46,13 @@ async function deleteWorCenter(id) {
 }
 </script>
 <template>
+    <FetchData
+        url="workCenters"
+        sort-by="name"
+        @on-fetch="(data) => (warehouses = data)"
+        auto-load
+    />
     <div class="centerCard">
-        <FetchData
-            url="workCenters"
-            sort-by="name"
-            @on-fetch="(data) => (warehouses = data)"
-            auto-load
-        />
         <VnPaginate
             ref="paginate"
             data-key="AgencyWorkCenters"
@@ -108,6 +108,7 @@ async function deleteWorCenter(id) {
                                 use-input
                                 input-debounce="0"
                                 :is-clearable="false"
+                                id="pingadera"
                             />
                         </VnRow>
                     </template>
diff --git a/test/cypress/integration/route/agency/agencyWorkCenter.spec.js b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
index 6d33dbc39..353c5805b 100644
--- a/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
+++ b/test/cypress/integration/route/agency/agencyWorkCenter.spec.js
@@ -4,12 +4,12 @@ describe('AgencyWorkCenter', () => {
         cy.login('developer');
         cy.visit(`/#/agency/11/workCenter`);
     });
+    const createButton = '.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon';
+    const workCenterCombobox = 'input[role="combobox"]';
 
     it('assign workCenter', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get(
-            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
-        ).type('workCenterOne{enter}');
+        cy.get(createButton).click();
+        cy.get(workCenterCombobox).type('workCenterOne{enter}');
         cy.get('.q-notification__message').should('have.text', 'Data created');
     });
 
@@ -22,12 +22,10 @@ describe('AgencyWorkCenter', () => {
     });
 
     it('error on duplicate workCenter', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get(
-            '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
-        ).type('workCenterOne{enter}');
+        cy.get(createButton).click();
+        cy.get(workCenterCombobox).type('workCenterOne{enter}');
         cy.get('.q-notification__message').should('have.text', 'Data created');
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get(createButton).click();
         cy.get(
             '.vn-row > .q-field > .q-field__inner > .q-field__control > .q-field__control-container'
         ).type('workCenterOne{enter}');
diff --git a/test/cypress/integration/route/routeList.spec.js b/test/cypress/integration/route/routeList.spec.js
index c9d7147c2..8020d3ea9 100644
--- a/test/cypress/integration/route/routeList.spec.js
+++ b/test/cypress/integration/route/routeList.spec.js
@@ -2,7 +2,7 @@ describe('Route', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
         cy.login('developer');
-        cy.visit(`/#/route/list`);
+        cy.visit(`/#/route/extended-list`);
     });
     const getVnSelect =
         '> :nth-child(1) > .column > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';

From 1869e3315ae64a865d5f133ae4152fb6d9475045 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 4 Oct 2024 13:14:14 +0200
Subject: [PATCH 086/131] fix: refs #4988 remove id

---
 src/pages/Route/Agency/Card/AgencyWorkcenter.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
index 86fb94e0a..7103ea9ce 100644
--- a/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
+++ b/src/pages/Route/Agency/Card/AgencyWorkcenter.vue
@@ -108,7 +108,6 @@ async function deleteWorCenter(id) {
                                 use-input
                                 input-debounce="0"
                                 :is-clearable="false"
-                                id="pingadera"
                             />
                         </VnRow>
                     </template>

From 3a21f6aadb5d3aa50fdff0d85d1c2e81532f5f87 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 4 Oct 2024 14:22:00 +0200
Subject: [PATCH 087/131] fix: order catalog

---
 src/pages/Order/Card/OrderCatalog.vue         |  1 +
 .../Order/Card/OrderCatalogItemDialog.vue     | 21 +++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index 68bf9511f..b13e8661d 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -130,4 +130,5 @@ function extractValueTags(items) {
 <i18n>
 es:
     You can search items by name or id: Puedes buscar items por nombre o id
+    Search items: Buscar items
 </i18n>
diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index 46a50c021..09a25fcb8 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -20,8 +20,10 @@ const props = defineProps({
 
 const fields = ref((props.prices || []).map((item) => ({ ...item, quantity: 0 })));
 const descriptorData = useArrayData('orderData');
-
+const isLoading = ref(false);
 const addToOrder = async () => {
+    if (isLoading.value) return;
+    isLoading.value = true;
     const items = (fields.value || []).filter((item) => Number(item.quantity) > 0);
     await axios.post('/OrderRows/addToOrder', {
         items,
@@ -30,6 +32,10 @@ const addToOrder = async () => {
     notify(t('globals.dataSaved'), 'positive');
     emit('added');
     descriptorData.fetch({});
+    isLoading.value = false;
+};
+const canAddToOrder = () => {
+    return (fields.value || []).some((item) => Number(item.quantity) > 0);
 };
 </script>
 
@@ -68,7 +74,11 @@ const addToOrder = async () => {
                 </tbody>
             </QMarkupTable>
             <div class="flex justify-center q-mt-lg">
-                <QBtn color="primary" type="submit">
+                <QBtn
+                    color="primary"
+                    type="submit"
+                    :disable="!isLoading && !canAddToOrder()"
+                >
                     {{ t('globals.add') }}
                 </QBtn>
             </div>
@@ -81,3 +91,10 @@ const addToOrder = async () => {
     width: 200px;
 }
 </style>
+
+<i18n>
+es:
+    noAmount: La cantidad no puede ser 0
+en:
+    noAmount: Amount can not be 0
+</i18n>

From aee23c75e86dae184798c64f8642e84e59993c32 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 4 Oct 2024 14:31:39 +0200
Subject: [PATCH 088/131] fix: order module

---
 src/pages/Order/Card/OrderCatalog.vue         |  1 +
 src/pages/Order/Card/OrderCatalogFilter.vue   |  1 +
 .../Order/Card/OrderCatalogItemDialog.vue     | 21 +++++++++++++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index 68bf9511f..b13e8661d 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -130,4 +130,5 @@ function extractValueTags(items) {
 <i18n>
 es:
     You can search items by name or id: Puedes buscar items por nombre o id
+    Search items: Buscar items
 </i18n>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 354c44747..6de43e86a 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -247,6 +247,7 @@ function addOrder(value, field, params) {
                         rounded
                         emit-value
                         use-input
+                        sort-by="name ASC"
                         :disable="!selectedCategoryFk"
                         @update:model-value="
                             (value) => {
diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index 46a50c021..09a25fcb8 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -20,8 +20,10 @@ const props = defineProps({
 
 const fields = ref((props.prices || []).map((item) => ({ ...item, quantity: 0 })));
 const descriptorData = useArrayData('orderData');
-
+const isLoading = ref(false);
 const addToOrder = async () => {
+    if (isLoading.value) return;
+    isLoading.value = true;
     const items = (fields.value || []).filter((item) => Number(item.quantity) > 0);
     await axios.post('/OrderRows/addToOrder', {
         items,
@@ -30,6 +32,10 @@ const addToOrder = async () => {
     notify(t('globals.dataSaved'), 'positive');
     emit('added');
     descriptorData.fetch({});
+    isLoading.value = false;
+};
+const canAddToOrder = () => {
+    return (fields.value || []).some((item) => Number(item.quantity) > 0);
 };
 </script>
 
@@ -68,7 +74,11 @@ const addToOrder = async () => {
                 </tbody>
             </QMarkupTable>
             <div class="flex justify-center q-mt-lg">
-                <QBtn color="primary" type="submit">
+                <QBtn
+                    color="primary"
+                    type="submit"
+                    :disable="!isLoading && !canAddToOrder()"
+                >
                     {{ t('globals.add') }}
                 </QBtn>
             </div>
@@ -81,3 +91,10 @@ const addToOrder = async () => {
     width: 200px;
 }
 </style>
+
+<i18n>
+es:
+    noAmount: La cantidad no puede ser 0
+en:
+    noAmount: Amount can not be 0
+</i18n>

From c3c252834280561e6814cfb2e392516736fd95a0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 5 Oct 2024 00:31:32 +0200
Subject: [PATCH 089/131] feat: #7356 improve NotesSummary

---
 src/pages/Ticket/Card/TicketSummary.vue | 37 +++++++++++++++----------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 2e85be000..8f359f649 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -17,6 +17,7 @@ import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
+import { QVirtualScroll } from 'quasar';
 
 const route = useRoute();
 const { notify } = useNotify();
@@ -229,22 +230,28 @@ async function changeState(value) {
                     :url="ticketUrl + 'observation'"
                     :text="t('ticket.pageTitles.notes')"
                 />
-                <VnLv
-                    v-for="note in entity.notes"
-                    :key="note.id"
-                    :label="note.observationType.description"
-                    :value="note.description"
+                <QVirtualScroll
+                    :items="entity.notes"
+                    v-slot="{ item, index }"
+                    style="max-height: 300px"
+                    separator
+                >
+                    <QItem
+                        :key="index"
+                        class="vn-label-value"
+                        style="
+                            display: inline-block;
+                            padding: unset;
+                            min-height: max-content;
+                        "
+                    >
+                        <span class="label" style="margin-right: 4px">
+                            {{ item.observationType.description }}:</span
+                        >
+
+                        <span>{{ item.description }}</span>
+                    </QItem></QVirtualScroll
                 >
-                    <template #value>
-                        <QInput
-                            v-model="note.description"
-                            filled
-                            type="textarea"
-                            class="notes"
-                            readonly
-                        />
-                    </template>
-                </VnLv>
             </QCard>
             <QCard class="vn-one">
                 <VnTitle :text="t('ticket.summary.summaryAmount')" />

From 04b2a4d9cec12c2d5e7a572e01a699114501b119 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 5 Oct 2024 00:31:41 +0200
Subject: [PATCH 090/131] perf: clean warnings

---
 src/components/VnTable/VnTable.vue                     | 2 +-
 src/components/common/VnSelectDialog.vue               | 2 +-
 src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue | 3 ---
 src/pages/Order/Card/OrderCreateDialog.vue             | 4 +---
 src/pages/Ticket/Card/TicketSummary.vue                | 1 -
 5 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 3ed741ac4..f18892a31 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -310,7 +310,7 @@ defineExpose({
     params,
 });
 
-function handleOnDataSaved(_, res) {
+function handleOnDataSaved(_) {
     if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 17f893255..350aa9272 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRole } from 'src/composables/useRole';
 import { useAcl } from 'src/composables/useAcl';
 
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index 08b21fb4a..70d38cb93 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -9,7 +9,6 @@ import RefundInvoiceForm from 'src/components/RefundInvoiceForm.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 
 import useNotify from 'src/composables/useNotify';
-import { useSession } from 'src/composables/useSession';
 import { usePrintService } from 'composables/usePrintService';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { getUrl } from 'src/composables/getUrl';
@@ -30,8 +29,6 @@ const $props = defineProps({
 
 const { notify } = useNotify();
 const router = useRouter();
-const session = useSession();
-const token = session.getToken();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const { openConfirmationModal } = useVnConfirm();
diff --git a/src/pages/Order/Card/OrderCreateDialog.vue b/src/pages/Order/Card/OrderCreateDialog.vue
index 9d5c9281e..27b0171f2 100644
--- a/src/pages/Order/Card/OrderCreateDialog.vue
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
@@ -13,12 +13,10 @@ import { reactive } from 'vue';
 import FetchData from 'components/FetchData.vue';
 
 const { t } = useI18n();
-const route = useRoute();
 const state = useState();
 const ORDER_MODEL = 'order';
 
 const router = useRouter();
-const clientList = ref([]);
 const agencyList = ref([]);
 const addressList = ref([]);
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 8f359f649..1f2a7ca79 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -17,7 +17,6 @@ import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import { QVirtualScroll } from 'quasar';
 
 const route = useRoute();
 const { notify } = useNotify();

From 34a40dd87c9c24d71f90e94d892678fca5fe4259 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 7 Oct 2024 08:24:53 +0200
Subject: [PATCH 091/131] fix(VnPaginate): use default value

---
 src/components/ui/VnPaginate.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index c6f57b479..80c607214 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -56,7 +56,7 @@ const props = defineProps({
     },
     offset: {
         type: Number,
-        default: 0,
+        default: undefined,
     },
     skeleton: {
         type: Boolean,

From ef5ae0f723bad7d0037093e94232eb6032e3d244 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 7 Oct 2024 09:16:07 +0200
Subject: [PATCH 092/131] refactor(ticketNotes): translations

---
 src/pages/Ticket/Card/TicketNotes.vue   | 10 ++++++--
 src/pages/Ticket/Card/TicketSummary.vue | 31 ++++---------------------
 src/pages/Ticket/locale/en.yml          | 10 ++++++++
 src/pages/Ticket/locale/es.yml          | 14 ++++++++++-
 4 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index ea06cd9f6..b5302d15f 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -49,7 +49,13 @@ async function handleSave() {
 
 <template>
     <FetchData
-        @on-fetch="(data) => (observationTypes = data)"
+        @on-fetch="
+            (data) =>
+                (observationTypes = data.map((type) => {
+                    type.label = t(`ticketNotes.observationTypes.${type.description}`);
+                    return type;
+                }))
+        "
         auto-load
         url="ObservationTypes"
     />
@@ -76,7 +82,7 @@ async function handleSave() {
                             :label="t('ticketNotes.observationType')"
                             :options="observationTypes"
                             hide-selected
-                            option-label="description"
+                            option-label="label"
                             option-value="id"
                             v-model="row.observationTypeFk"
                             :disable="!!row.id"
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index bd3353d75..af96c2724 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -269,7 +269,11 @@ function toTicketUrl(section) {
                         "
                     >
                         <span class="label" style="margin-right: 4px">
-                            ({{ t(item.observationType.description) }}):
+                            ({{
+                                t(
+                                    `ticketNotes.observationTypes.${item.observationType.description}`
+                                )
+                            }}):
                         </span>
 
                         <span>{{ item.description }}</span>
@@ -603,28 +607,3 @@ function toTicketUrl(section) {
     color: $primary-light;
 }
 </style>
-
-<i18n>
-en:
-    ItemPicker: Item Picker
-    Packager: Packager
-    Delivery: Delivery
-    SalesPerson: Sales Person
-    Administrative: Administrative
-    Weight: Weight
-    InvoiceOut: Invoice Out
-    DropOff: Drop Off
-    Sustitución: Sustitution
-es:
-    ItemPicker: Items
-    Packager: Encajador
-    Delivery: Envío
-    SalesPerson: Comercial
-    Administrative: Administrativa
-    Weight: Peso
-    InvoiceOut: Facturas
-    DropOff: Despacho
-    Sustitución: Sustitución
-    Accepted: Aceptado
-    Denied: Denegado
-</i18n>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 58367e3a2..829ea7a91 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -14,6 +14,16 @@ ticketNotes:
     description: Description
     removeNote: Remove note
     addNote: Add note
+    observationTypes:
+        ItemPicker: Item picker
+        Packager: Packager
+        Delivery: Delivery
+        SalesPerson: Sales person
+        Administrative: Administrative
+        Weight: Weight
+        InvoiceOut: Invoice Out
+        DropOff: Drop Off
+        Sustitución: Sustitution
 ticketSale:
     id: Id
     visible: Visible
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 1acaf154b..b372e48ef 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -29,6 +29,18 @@ ticketNotes:
     description: Descripción
     removeNote: Quitar nota
     addNote: Añadir nota
+    observationTypes:
+        ItemPicker: Sacador
+        Packager: Encajador
+        Delivery: Envío
+        SalesPerson: Comercial
+        Administrative: Administrativa
+        Weight: Peso
+        InvoiceOut: Facturas
+        DropOff: Despacho
+        Sustitución: Sustitución
+        Accepted: Aceptado
+        Denied: Denegado
 purchaseRequest:
     Id: Id
     description: Descripción
@@ -86,7 +98,7 @@ weeklyTickets:
     search: Buscar por tickets programados
     searchInfo: Buscar tickets programados por el identificador o el identificador del cliente
 advanceTickets:
-    preparation: Preparación    
+    preparation: Preparación
     origin: Origen
     destination: Destinatario
     originAgency: 'Agencia origen: {agency}'

From 947f913679b79451d5b790a41d41fdf69873f581 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 7 Oct 2024 09:25:06 +0200
Subject: [PATCH 093/131] refactor: refs #8019 create VnDate

---
 src/components/common/VnDate.vue      | 11 +++++++++++
 src/components/common/VnInputDate.vue | 23 +++++++++++------------
 src/components/common/VnTime.vue      |  6 ++++++
 3 files changed, 28 insertions(+), 12 deletions(-)
 create mode 100644 src/components/common/VnDate.vue
 create mode 100644 src/components/common/VnTime.vue

diff --git a/src/components/common/VnDate.vue b/src/components/common/VnDate.vue
new file mode 100644
index 000000000..4b65ec4da
--- /dev/null
+++ b/src/components/common/VnDate.vue
@@ -0,0 +1,11 @@
+<script setup>
+const model = defineModel({ type: [String, Number], required: true });
+</script>
+<template>
+    <QDate
+        v-model="model"
+        :landscape="$q.screen.gt.xs"
+        :today-btn="true"
+        :options="$attrs.options"
+    />
+</template>
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 3d5afaf80..1aa797ab7 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -3,6 +3,7 @@ import { onMounted, watch, computed, ref } from 'vue';
 import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useAttrs } from 'vue';
+import VnDate from './VnDate.vue';
 
 const model = defineModel({ type: [String, Date] });
 const $props = defineProps({
@@ -87,6 +88,11 @@ const styleAttrs = computed(() => {
           }
         : {};
 });
+
+const manageDate = (date) => {
+    formattedDate.value = date;
+    isPopupOpen.value = false;
+};
 </script>
 
 <template>
@@ -129,6 +135,7 @@ const styleAttrs = computed(() => {
                 />
             </template>
             <QMenu
+                v-if="$q.screen.gt.xs"
                 transition-show="scale"
                 transition-hide="scale"
                 v-model="isPopupOpen"
@@ -137,19 +144,11 @@ const styleAttrs = computed(() => {
                 :no-focus="true"
                 :no-parent-event="true"
             >
-                <QDate
-                    v-model="popupDate"
-                    :landscape="true"
-                    :today-btn="true"
-                    :options="$attrs.options"
-                    @update:model-value="
-                        (date) => {
-                            formattedDate = date;
-                            isPopupOpen = false;
-                        }
-                    "
-                />
+                <VnDate v-model="popupDate" @update:model-value="manageDate" />
             </QMenu>
+            <QDialog v-else v-model="isPopupOpen">
+                <VnDate v-model="popupDate" @update:model-value="manageDate" />
+            </QDialog>
         </QInput>
     </div>
 </template>
diff --git a/src/components/common/VnTime.vue b/src/components/common/VnTime.vue
new file mode 100644
index 000000000..135709d2b
--- /dev/null
+++ b/src/components/common/VnTime.vue
@@ -0,0 +1,6 @@
+<script setup>
+const model = defineModel({ type: [String, Number], required: true });
+</script>
+<template>
+    <QTime v-model="model" :landscape="$q.screen.gt.xs" now-btn mask="HH:mm" />
+</template>

From 5c5a35998615b270d4f2423b4247f828fd9524fb Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 7 Oct 2024 09:38:39 +0200
Subject: [PATCH 094/131] refactor: refs #8019 create VnTime

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

diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index a5e7d3002..6d69bc4a5 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -3,6 +3,8 @@ import { computed, ref, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
 import { useValidator } from 'src/composables/useValidator';
+import VnTime from './VnTime.vue';
+
 const { validations } = useValidator();
 const $attrs = useAttrs();
 const model = defineModel({ type: String });
@@ -107,6 +109,7 @@ function dateToTime(newDate) {
                 />
             </template>
             <QMenu
+                v-if="$q.screen.gt.xs"
                 transition-show="scale"
                 transition-hide="scale"
                 v-model="isPopupOpen"
@@ -115,8 +118,11 @@ function dateToTime(newDate) {
                 :no-focus="true"
                 :no-parent-event="true"
             >
-                <QTime v-model="formattedTime" mask="HH:mm" landscape now-btn />
+                <VnTime v-model="formattedTime" />
             </QMenu>
+            <QDialog v-else v-model="isPopupOpen">
+                <VnTime v-model="formattedTime" />
+            </QDialog>
         </QInput>
     </div>
 </template>

From 5d65d3e20cfbe5f96e42978a17f9b9e7d4df2883 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 7 Oct 2024 09:48:57 +0200
Subject: [PATCH 095/131] refs #6898 hotfix agency

---
 src/pages/Supplier/Card/SupplierAgencyTermCreate.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
index a87ea502b..515d157e5 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
@@ -15,12 +15,12 @@ const route = useRoute();
 const agenciesOptions = ref(null);
 const newAgencyTermForm = reactive({
     agencyFk: null,
-    minimumM3: null,
-    packagePrice: null,
-    kmPrice: null,
-    m3Price: null,
-    routePrice: null,
-    minimumKm: null,
+    minimumM3: 0,
+    packagePrice: 0,
+    kmPrice: 0,
+    m3Price: 0,
+    routePrice: 0,
+    minimumKm: 0,
     supplierFk: route.params.id,
 });
 

From 4f3e7e26309aced2bd4a98f1bffd13b5a05bc65b Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 7 Oct 2024 10:03:05 +0200
Subject: [PATCH 096/131] feat: refs #7893 Added waste recalc section

---
 src/i18n/locale/en.yml               |  6 +++
 src/i18n/locale/es.yml               |  6 +++
 src/pages/Entry/EntryWasteRecalc.vue | 76 ++++++++++++++++++++++++++++
 src/router/modules/entry.js          | 17 ++++++-
 4 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Entry/EntryWasteRecalc.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 20a612a82..68214129f 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -105,6 +105,7 @@ globals:
     campaign: Campaign
     weight: Weight
     error: Ups! Something went wrong
+    recalc: Recalculate
     pageTitles:
         logIn: Login
         addressEdit: Update address
@@ -275,6 +276,7 @@ globals:
         serial: Serial
         medical: Mutual
         RouteExtendedList: Router
+        wasteRecalc: Waste recaclulate
     supplier: Supplier
     created: Created
     worker: Worker
@@ -465,6 +467,10 @@ entry:
             landing: Landing
             isExcludedFromAvailable: Es inventory
             isRaid: Raid
+    wasteRecalc:
+        dateRequired: The date fields are required
+        dateIncoherent: The "from" date cannot be later than the "to" date
+        recalcOk: The wastes were successfully recalculated
 ticket:
     pageTitles:
         tickets: Tickets
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index ae0274415..7e1671fbf 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -107,6 +107,7 @@ globals:
     campaign: Campaña
     weight: Peso
     error: ¡Ups! Algo salió mal
+    recalc: Recalcular
     pageTitles:
         logIn: Inicio de sesión
         addressEdit: Modificar consignatario
@@ -279,6 +280,7 @@ globals:
         clientsActionsMonitor: Clientes y acciones
         serial: Facturas por serie
         medical: Mutua
+        wasteRecalc: Recalcular mermas
     supplier: Proveedor
     created: Fecha creación
     worker: Trabajador
@@ -467,6 +469,10 @@ entry:
             landing: Llegada
             isExcludedFromAvailable: Es inventario
             isRaid: Redada
+    wasteRecalc:
+        dateRequired: Los campos de tipo fecha son obligatorios
+        dateIncoherent: La fecha "desde" no puede ser superior a la fecha "hasta"
+        recalcOk: Se han recalculado las mermas correctamente
 ticket:
     pageTitles:
         tickets: Tickets
diff --git a/src/pages/Entry/EntryWasteRecalc.vue b/src/pages/Entry/EntryWasteRecalc.vue
new file mode 100644
index 000000000..2fb9c3abf
--- /dev/null
+++ b/src/pages/Entry/EntryWasteRecalc.vue
@@ -0,0 +1,76 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const { t } = useI18n();
+
+const isLoading = ref(false);
+const dateFrom = ref();
+const dateTo = ref();
+const recalc = async () => {
+    const { notify } = useNotify();
+    if (!dateFrom.value || !dateTo.value) {
+        notify('entry.wasteRecalc.dateRequired', 'negative');
+        return;
+    }
+
+    const from = new Date(dateFrom.value);
+    const to = new Date(dateTo.value);
+
+    if (from > to) {
+        notify('entry.wasteRecalc.dateIncoherent', 'negative');
+        return;
+    }
+
+    const params = {
+        schema: 'bs',
+        params: [from, to],
+    };
+
+    try {
+        isLoading.value = true;
+        await axios.post('Applications/waste_addSales/execute-proc', params);
+        notify('entry.wasteRecalc.recalcOk', 'positive');
+    } catch (err) {
+        console.error('Error in execution:', err);
+        notify('entry.wasteRecalc.recalcOk', 'negative');
+    } finally {
+        isLoading.value = false;
+    }
+};
+</script>
+
+<template>
+    <div class="q-pa-lg row justify-center">
+        <QCard class="bg-light" style="width: 300px">
+            <QCardSection>
+                <VnInputDate
+                    class="q-mb-lg"
+                    v-model="dateFrom"
+                    :label="t('globals.from')"
+                    rounded
+                    dense
+                />
+                <VnInputDate
+                    class="q-mb-lg"
+                    v-model="dateTo"
+                    :label="t('globals.to')"
+                    rounded
+                    dense
+                />
+                <QBtn
+                    color="primary"
+                    text-color="white"
+                    :label="t('globals.recalc')"
+                    icon="Calculate"
+                    :loading="isLoading"
+                    :disable="isLoading"
+                    @click="recalc()"
+                />
+            </QCardSection>
+        </QCard>
+    </div>
+</template>
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 4750a4301..3add239df 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -12,7 +12,13 @@ export default {
     component: RouterView,
     redirect: { name: 'EntryMain' },
     menus: {
-        main: ['EntryList', 'MyEntries', 'EntryLatestBuys', 'EntryStockBought'],
+        main: [
+            'EntryList',
+            'MyEntries',
+            'EntryLatestBuys',
+            'EntryStockBought',
+            'EntryWasteRecalc',
+        ],
         card: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryDms', 'EntryLog'],
     },
     children: [
@@ -67,6 +73,15 @@ export default {
                     },
                     component: () => import('src/pages/Entry/EntryStockBought.vue'),
                 },
+                {
+                    path: 'waste-recalc',
+                    name: 'EntryWasteRecalc',
+                    meta: {
+                        title: 'wasteRecalc',
+                        icon: 'compost',
+                    },
+                    component: () => import('src/pages/Entry/EntryWasteRecalc.vue'),
+                },
             ],
         },
         {

From 178fa8cd21328a688a7697f2c3c38a7408ed2775 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 7 Oct 2024 11:31:16 +0200
Subject: [PATCH 097/131] feat: refs #7893 Requested changes

---
 src/pages/Entry/EntryWasteRecalc.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Entry/EntryWasteRecalc.vue b/src/pages/Entry/EntryWasteRecalc.vue
index 2fb9c3abf..1dbf8cdf0 100644
--- a/src/pages/Entry/EntryWasteRecalc.vue
+++ b/src/pages/Entry/EntryWasteRecalc.vue
@@ -65,7 +65,6 @@ const recalc = async () => {
                     color="primary"
                     text-color="white"
                     :label="t('globals.recalc')"
-                    icon="Calculate"
                     :loading="isLoading"
                     :disable="isLoading"
                     @click="recalc()"

From e396cd0cac48bf8bf5761d575758489e69a93102 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 7 Oct 2024 12:16:32 +0200
Subject: [PATCH 098/131] hotfix: routePrice null

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

diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
index 515d157e5..038eaa356 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
@@ -19,7 +19,7 @@ const newAgencyTermForm = reactive({
     packagePrice: 0,
     kmPrice: 0,
     m3Price: 0,
-    routePrice: 0,
+    routePrice: null,
     minimumKm: 0,
     supplierFk: route.params.id,
 });

From 0ed9fdd55da1c3939848129bc0c7b72daa3660b8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 7 Oct 2024 13:02:40 +0200
Subject: [PATCH 099/131] fix: refs VnImg zoom resolution missing property

---
 src/components/ui/CatalogItem.vue    | 2 +-
 src/pages/Item/ItemList.vue          | 3 +--
 src/pages/Order/Card/OrderLines.vue  | 6 +++++-
 src/pages/Ticket/Card/TicketSale.vue | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/ui/CatalogItem.vue b/src/components/ui/CatalogItem.vue
index 545bfbbb4..7dca19770 100644
--- a/src/components/ui/CatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@@ -31,7 +31,7 @@ const dialog = ref(null);
     <div class="container order-catalog-item overflow-hidden">
         <QCard class="card shadow-6">
             <div class="img-wrapper">
-                <VnImg :id="item.id" class="image" />
+                <VnImg :id="item.id" class="image" zoom-resolution="1600x900" />
                 <div v-if="item.hex && isCatalog" class="item-color-container">
                     <div
                         class="item-color"
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index e3fcceb3a..ae4c9531c 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -491,9 +491,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         <QTd>
                             <VnImg
                                 size="50x50"
+                                zoom-resolution="1600x900"
                                 :id="row.id"
-                                height="50px"
-                                width="50px"
                                 class="image"
                             />
                         </QTd>
diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue
index 17a157797..0223aa9c6 100644
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@@ -278,7 +278,11 @@ watch(
     >
         <template #column-image="{ row }">
             <div class="image-wrapper">
-                <VnImg :id="parseInt(row?.item?.image)" class="rounded" />
+                <VnImg
+                    :id="parseInt(row?.item?.image)"
+                    class="rounded"
+                    zoom-resolution="1600x900"
+                />
             </div>
         </template>
         <template #column-id="{ row }">
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index f86863f05..f179257f7 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -591,7 +591,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <template #body-cell-picture="{ row }">
             <QTd>
                 <div class="image-wrapper">
-                    <VnImg :id="row.itemFk" class="rounded" />
+                    <VnImg :id="row.itemFk" class="rounded" zoom-resolution="1600x900" />
                 </div>
             </QTd>
         </template>

From d1b3e01d871e95a7472900225fa2b2d545aef19c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 7 Oct 2024 13:36:27 +0200
Subject: [PATCH 100/131] chore: refs #8019 refactor css scoped

---
 src/components/common/VnDate.vue | 36 ++++++++++++++++++++++++++++++++
 src/components/ui/VnImg.vue      |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnDate.vue b/src/components/common/VnDate.vue
index 4b65ec4da..cdfa0d258 100644
--- a/src/components/common/VnDate.vue
+++ b/src/components/common/VnDate.vue
@@ -9,3 +9,39 @@ const model = defineModel({ type: [String, Number], required: true });
         :options="$attrs.options"
     />
 </template>
+<style lang="scss" scoped>
+.q-date {
+    width: 240px;
+    min-width: none;
+
+    :deep(.q-date__calendar) {
+        padding-bottom: 0;
+    }
+    :deep(.q-date__view) {
+        min-height: 240px;
+        padding: 8px;
+    }
+    :deep(.q-date__calendar-days-container) {
+        min-height: 160px;
+        height: unset;
+    }
+}
+.q-date--portrait-standard :deep(.q-date__header) {
+    padding: 2px 2px 5px 12px;
+    height: 60px;
+}
+
+@media (min-width: $breakpoint-xs-max) {
+    .q-date--landscape-standard {
+        min-width: 280px;
+
+        :deep(.q-date__header) {
+            min-width: 0;
+            padding: 10px 8px 0 8px;
+        }
+    }
+    .q-date--landscape-standard :deep(.q-date__view) {
+        width: 220px;
+    }
+}
+</style>
diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue
index ceb4e8468..1b57c20d0 100644
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@@ -58,7 +58,7 @@ defineExpose({
         :class="{ zoomIn: zoom }"
         :src="getUrl()"
         v-bind="$attrs"
-        @click.stop="show = $props.zoom ? true : false"
+        @click.stop="show = $props.zoom"
         spinner-color="primary"
     />
     <QDialog v-if="$props.zoom" v-model="show">

From 50eed83d05dabadd46fe0f07948564d9ef953ea2 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Mon, 7 Oct 2024 13:50:19 +0200
Subject: [PATCH 101/131] feat: refs #7893 Requested changes

---
 src/i18n/locale/en.yml               |  4 ---
 src/i18n/locale/es.yml               |  4 ---
 src/pages/Entry/EntryWasteRecalc.vue | 45 +++++++++++++---------------
 src/pages/Entry/locale/en.yml        |  2 ++
 src/pages/Entry/locale/es.yml        |  2 ++
 5 files changed, 25 insertions(+), 32 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index c6a597dea..b73395df2 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -474,10 +474,6 @@ entry:
             landing: Landing
             isExcludedFromAvailable: Es inventory
             isRaid: Raid
-    wasteRecalc:
-        dateRequired: The date fields are required
-        dateIncoherent: The "from" date cannot be later than the "to" date
-        recalcOk: The wastes were successfully recalculated
 ticket:
     pageTitles:
         tickets: Tickets
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 78a67aceb..2552c9549 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -476,10 +476,6 @@ entry:
             landing: Llegada
             isExcludedFromAvailable: Es inventario
             isRaid: Redada
-    wasteRecalc:
-        dateRequired: Los campos de tipo fecha son obligatorios
-        dateIncoherent: La fecha "desde" no puede ser superior a la fecha "hasta"
-        recalcOk: Se han recalculado las mermas correctamente
 ticket:
     pageTitles:
         tickets: Tickets
diff --git a/src/pages/Entry/EntryWasteRecalc.vue b/src/pages/Entry/EntryWasteRecalc.vue
index 1dbf8cdf0..cd823beb4 100644
--- a/src/pages/Entry/EntryWasteRecalc.vue
+++ b/src/pages/Entry/EntryWasteRecalc.vue
@@ -1,42 +1,37 @@
 <script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
+import { ref, computed, watch } from 'vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 
-const { t } = useI18n();
-
 const isLoading = ref(false);
 const dateFrom = ref();
 const dateTo = ref();
+
+const optionsTo = computed(() => (date) => {
+    if (!dateFrom.value) return true;
+    return new Date(date) >= new Date(dateFrom.value);
+});
+
+watch(dateFrom, (newDateFrom) => {
+    if (dateTo.value && new Date(dateTo.value) < new Date(newDateFrom))
+        dateTo.value = newDateFrom;
+});
+
 const recalc = async () => {
     const { notify } = useNotify();
-    if (!dateFrom.value || !dateTo.value) {
-        notify('entry.wasteRecalc.dateRequired', 'negative');
-        return;
-    }
-
-    const from = new Date(dateFrom.value);
-    const to = new Date(dateTo.value);
-
-    if (from > to) {
-        notify('entry.wasteRecalc.dateIncoherent', 'negative');
-        return;
-    }
 
     const params = {
         schema: 'bs',
-        params: [from, to],
+        params: [new Date(dateFrom.value), new Date(dateTo.value)],
     };
 
     try {
         isLoading.value = true;
         await axios.post('Applications/waste_addSales/execute-proc', params);
-        notify('entry.wasteRecalc.recalcOk', 'positive');
+        notify('wasteRecalc.recalcOk', 'positive');
     } catch (err) {
-        console.error('Error in execution:', err);
-        notify('entry.wasteRecalc.recalcOk', 'negative');
+        console.error(err);
     } finally {
         isLoading.value = false;
     }
@@ -50,23 +45,25 @@ const recalc = async () => {
                 <VnInputDate
                     class="q-mb-lg"
                     v-model="dateFrom"
-                    :label="t('globals.from')"
+                    :label="$t('globals.from')"
                     rounded
                     dense
                 />
                 <VnInputDate
                     class="q-mb-lg"
                     v-model="dateTo"
-                    :label="t('globals.to')"
+                    :options="optionsTo"
+                    :label="$t('globals.to')"
+                    :disable="!dateFrom"
                     rounded
                     dense
                 />
                 <QBtn
                     color="primary"
                     text-color="white"
-                    :label="t('globals.recalc')"
+                    :label="$t('globals.recalc')"
                     :loading="isLoading"
-                    :disable="isLoading"
+                    :disable="isLoading || !(dateFrom && dateTo)"
                     @click="recalc()"
                 />
             </QCardSection>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index b4d7c33bc..f9dbd0589 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -18,3 +18,5 @@ myEntries:
     warehouseInFk: Warehouse in
     daysOnward: Days onward
     daysAgo: Days ago
+wasteRecalc:
+    recalcOk: The wastes were successfully recalculated
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 2dfd601b1..feeea1fc9 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -21,3 +21,5 @@ myEntries:
     warehouseInFk: Alm. entrada
     daysOnward: Días adelante
     daysAgo: Días atras
+wasteRecalc:
+    recalcOk: Se han recalculado las mermas correctamente

From c81506695314e291aa22d7433d65521711921d37 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 7 Oct 2024 15:55:18 +0200
Subject: [PATCH 102/131] feat: refs #8019 fine-tunning vnDate

---
 src/components/common/VnDate.vue | 32 +++++++-------------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/src/components/common/VnDate.vue b/src/components/common/VnDate.vue
index cdfa0d258..761ac995e 100644
--- a/src/components/common/VnDate.vue
+++ b/src/components/common/VnDate.vue
@@ -2,46 +2,28 @@
 const model = defineModel({ type: [String, Number], required: true });
 </script>
 <template>
-    <QDate
-        v-model="model"
-        :landscape="$q.screen.gt.xs"
-        :today-btn="true"
-        :options="$attrs.options"
-    />
+    <QDate v-model="model" :today-btn="true" :options="$attrs.options" />
 </template>
 <style lang="scss" scoped>
 .q-date {
-    width: 240px;
-    min-width: none;
+    width: 245px;
+    min-width: unset;
 
     :deep(.q-date__calendar) {
         padding-bottom: 0;
     }
     :deep(.q-date__view) {
-        min-height: 240px;
+        min-height: 245px;
         padding: 8px;
     }
     :deep(.q-date__calendar-days-container) {
         min-height: 160px;
         height: unset;
     }
-}
-.q-date--portrait-standard :deep(.q-date__header) {
-    padding: 2px 2px 5px 12px;
-    height: 60px;
-}
 
-@media (min-width: $breakpoint-xs-max) {
-    .q-date--landscape-standard {
-        min-width: 280px;
-
-        :deep(.q-date__header) {
-            min-width: 0;
-            padding: 10px 8px 0 8px;
-        }
-    }
-    .q-date--landscape-standard :deep(.q-date__view) {
-        width: 220px;
+    :deep(.q-date__header) {
+        padding: 2px 2px 5px 12px;
+        height: 60px;
     }
 }
 </style>

From 4344458bb067f4c6595f02df580dffd3e5e08a84 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 7 Oct 2024 16:02:29 +0200
Subject: [PATCH 103/131] feat: refs #8019 fine-tunning vnTime

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

diff --git a/src/components/common/VnTime.vue b/src/components/common/VnTime.vue
index 135709d2b..369f80432 100644
--- a/src/components/common/VnTime.vue
+++ b/src/components/common/VnTime.vue
@@ -2,5 +2,15 @@
 const model = defineModel({ type: [String, Number], required: true });
 </script>
 <template>
-    <QTime v-model="model" :landscape="$q.screen.gt.xs" now-btn mask="HH:mm" />
+    <QTime v-model="model" now-btn mask="HH:mm" />
 </template>
+<style lang="scss" scoped>
+.q-time {
+    width: 230px;
+    min-width: unset;
+    :deep(.q-time__header) {
+        min-height: unset;
+        height: 50px;
+    }
+}
+</style>

From 56fff55f71bc97c59d1300144adcfee69f3241cf Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 8 Oct 2024 09:26:00 +0200
Subject: [PATCH 104/131] fix: unnecessary property

---
 src/pages/Item/Card/ItemTags.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
index 1b5eb28f0..6f31d0cf8 100644
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -171,7 +171,6 @@ const insertTag = (rows) => {
                             <QBtn
                                 @click="insertTag(rows)"
                                 class="cursor-pointer"
-                                :disable="!validRow"
                                 color="primary"
                                 flat
                                 icon="add"

From e0f60ed1181c2548ba77b4e2a55461c7b6492e5e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 8 Oct 2024 11:07:05 +0000
Subject: [PATCH 105/131] test: fix VnLocation

---
 .../integration/vnComponent/vnLocation.spec.js       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 78dc38899..c1b0cf929 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -64,7 +64,7 @@ describe('VnLocation', () => {
                 `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(3) > .q-icon`
             ).click();
             cy.get(
-                `#q-portal--dialog--4 > .q-dialog > ${createForm.prefix} > .vn-row > .q-select > ${createForm.sufix} > :nth-child(1) input`
+                `#q-portal--dialog--5 > .q-dialog > ${createForm.prefix} > .vn-row > .q-select > ${createForm.sufix} > :nth-child(1) input`
             ).should('have.value', province);
         });
     });
@@ -133,6 +133,8 @@ describe('VnLocation', () => {
             );
             cy.get('.q-mt-lg > .q-btn--standard').click();
             cy.get(`${createForm.prefix}`).should('not.exist');
+            cy.waitForElement('.q-form');
+
             checkVnLocation(postCode, province);
         });
         it('Create city', () => {
@@ -144,10 +146,12 @@ describe('VnLocation', () => {
             cy.get(
                 `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) > .q-icon`
             ).click();
-            cy.selectOption('#q-portal--dialog--2 .q-select', 'one');
-            cy.get('#q-portal--dialog--2 .q-input').type(province);
-            cy.get('#q-portal--dialog--2 .q-btn--standard').click();
+            cy.selectOption('#q-portal--dialog--3 .q-select', 'one');
+            cy.get('#q-portal--dialog--3 .q-input').type(province);
+            cy.get('#q-portal--dialog--3 .q-btn--standard').click();
             cy.get('#q-portal--dialog--1 .q-btn--standard').click();
+            cy.waitForElement('.q-form');
+
             checkVnLocation(postCode, province);
         });
 

From 6a797460806cf628f9310a7c54d35fb878c29b03 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 8 Oct 2024 13:18:51 +0200
Subject: [PATCH 106/131] test: fix TicketDescriptor

---
 test/cypress/integration/ticket/ticketDescriptor.spec.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index 8192b7c7c..0ba2723a2 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -1,7 +1,8 @@
 /// <reference types="cypress" />
 describe('Ticket descriptor', () => {
-    const toCloneOpt = '[role="menu"] .q-list > :nth-child(5)';
-    const setWeightOpt = '[role="menu"] .q-list > :nth-child(6)';
+    const listItem = '[role="menu"] .q-list .q-item';
+    const toCloneOpt = 'To clone ticket';
+    const setWeightOpt = 'Set weight';
     const warehouseValue = ':nth-child(1) > :nth-child(6) > .value > span';
     const summaryHeader = '.summaryHeader > div';
     const weight = 25;
@@ -14,7 +15,7 @@ describe('Ticket descriptor', () => {
     it('should clone the ticket without warehouse', () => {
         cy.visit('/#/ticket/1/summary');
         cy.openActionsDescriptor();
-        cy.get(toCloneOpt).click();
+        cy.contains(listItem, toCloneOpt).click();
         cy.clickConfirm();
         cy.get(warehouseValue).contains('Warehouse One');
         cy.get(summaryHeader)
@@ -28,7 +29,7 @@ describe('Ticket descriptor', () => {
     it('should set the weight of the ticket', () => {
         cy.visit('/#/ticket/10/summary');
         cy.openActionsDescriptor();
-        cy.get(setWeightOpt).click();
+        cy.contains(listItem, setWeightOpt).click();
         cy.intercept('POST', /\/api\/Tickets\/\d+\/setWeight/).as('weight');
         cy.get('.q-dialog input').type(weight);
         cy.clickConfirm();

From cfe95df9e84c5841077bdcb480459a19940dfd7c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 10 Oct 2024 09:46:07 +0200
Subject: [PATCH 107/131] fix: refs #7524 use dynamic load

---
 src/pages/Ticket/TicketCreateDialog.vue | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/pages/Ticket/TicketCreateDialog.vue b/src/pages/Ticket/TicketCreateDialog.vue
index 1493adc53..4138884bf 100644
--- a/src/pages/Ticket/TicketCreateDialog.vue
+++ b/src/pages/Ticket/TicketCreateDialog.vue
@@ -27,7 +27,6 @@ const initialFormState = reactive({
     warehouseId: user.value.warehouseFk,
     landed: null,
 });
-const clientOptions = ref([]);
 const agenciesOptions = ref([]);
 const addressesOptions = ref([]);
 const warehousesOptions = ref([]);
@@ -111,12 +110,6 @@ const redirectToTicketList = (_, { id }) => {
 </script>
 
 <template>
-    <FetchData
-        url="Clients"
-        @on-fetch="(data) => (clientOptions = data)"
-        :filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
-        auto-load
-    />
     <FetchData
         url="Warehouses"
         @on-fetch="(data) => (warehousesOptions = data)"
@@ -137,7 +130,9 @@ const redirectToTicketList = (_, { id }) => {
                     <VnSelect
                         :label="t('ticket.create.client')"
                         v-model="data.clientId"
-                        :options="clientOptions"
+                        url="Clients"
+                        :fields="['id', 'name', 'defaultAddressFk']"
+                        sort-by="id"
                         option-value="id"
                         option-label="name"
                         hide-selected

From e58818e89116805f718e2b6e0ec1c1f3d7878736 Mon Sep 17 00:00:00 2001
From: Jon Elias <jon@verdnatura.es>
Date: Thu, 10 Oct 2024 08:14:24 +0000
Subject: [PATCH 108/131] fix: Use geoFk for ZoneDeliveryPanel

---
 src/pages/Zone/ZoneDeliveryPanel.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 088811b01..8057f4ba4 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -94,9 +94,10 @@ watch(
                 url="Postcodes/location"
                 :fields="['geoFk', 'code', 'townFk', 'countryFk']"
                 sort-by="code, townFk"
-                option-value="code"
+                option-value="geoFk"
                 option-label="code"
                 option-filter="code"
+                option-filter-value="code"
                 hide-selected
                 dense
                 outlined

From 8b68c0afeb3ac857c8fb70a7b92ea4d2f1296836 Mon Sep 17 00:00:00 2001
From: Jon Elias <jon@verdnatura.es>
Date: Thu, 10 Oct 2024 08:30:56 +0000
Subject: [PATCH 109/131] fix: improve geoFk for ZoneDeliveryPanel

---
 src/pages/Zone/ZoneDeliveryPanel.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 8057f4ba4..423095d6e 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -96,8 +96,7 @@ watch(
                 sort-by="code, townFk"
                 option-value="geoFk"
                 option-label="code"
-                option-filter="code"
-                option-filter-value="code"
+                :filter-options="['code', 'geoFk']"
                 hide-selected
                 dense
                 outlined

From 44c4c378f998f430418d8258f3906544c43d0791 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 10 Oct 2024 11:02:03 +0200
Subject: [PATCH 110/131] chore: refs #7874 add default ob type

---
 .../CustomerDefaulterAddObservation.vue       | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
index 5798e7512..9bdb0ad5b 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
@@ -28,16 +28,26 @@ const newObservation = ref(null);
 
 const onSubmit = async () => {
     try {
-        const data = $props.clients.map((item) => {
-            return { clientFk: item.clientFk, text: newObservation.value };
-        });
-        await axios.post('ClientObservations', data);
+        const observationTypeFk = (
+            await axios.get('ObservationTypes/findOne', {
+                params: { filter: { where: { description: 'Finance' } } },
+            })
+        ).data?.id;
 
-        const payload = {
+        const bodyObs = $props.clients.map((item) => {
+            return {
+                clientFk: item.clientFk,
+                text: newObservation.value,
+                observationTypeFk,
+            };
+        });
+        await axios.post('ClientObservations', bodyObs);
+
+        const bodyObsMail = {
             defaulters: $props.clients,
             observation: newObservation.value,
         };
-        await axios.post('Defaulters/observationEmail', payload);
+        await axios.post('Defaulters/observationEmail', bodyObsMail);
 
         await $props.promise();
 

From 5af14b1b528a36c3c50134bfb7cb93f17c8af18c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 10 Oct 2024 12:12:03 +0200
Subject: [PATCH 111/131] chore: refs #7874 fix test

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

diff --git a/test/cypress/integration/claim/claimNotes.spec.js b/test/cypress/integration/claim/claimNotes.spec.js
index a4a493cda..d7a918db1 100644
--- a/test/cypress/integration/claim/claimNotes.spec.js
+++ b/test/cypress/integration/claim/claimNotes.spec.js
@@ -1,4 +1,6 @@
 describe('ClaimNotes', () => {
+    const saveBtn = '.q-field__append > .q-btn > .q-btn__content > .q-icon';
+    const firstNote = '.q-infinite-scroll :nth-child(1) > .q-card__section--vert';
     beforeEach(() => {
         cy.login('developer');
         cy.visit(`/#/claim/${2}/notes`);
@@ -7,7 +9,7 @@ describe('ClaimNotes', () => {
     it('should add a new note', () => {
         const message = 'This is a new message.';
         cy.get('.q-textarea').type(message);
-        cy.get('.q-field__append > .q-btn > .q-btn__content > .q-icon').click(); //save
-        cy.get(':nth-child(1) > .q-card__section--vert').should('have.text', message);
+        cy.get(saveBtn).click();
+        cy.get(firstNote).should('have.text', message);
     });
 });

From 3dfb836f8ea024242cf844190f3f58fd0ded5704 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 10 Oct 2024 13:56:11 +0200
Subject: [PATCH 112/131] revert: rollback compress spacestyle

---
 src/components/common/VnInput.vue  | 20 --------------------
 src/components/common/VnSelect.vue | 11 -----------
 src/components/ui/VnRow.vue        |  1 -
 src/css/app.scss                   | 11 -----------
 4 files changed, 43 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index d93ad7465..1246eedcd 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -130,24 +130,4 @@ const mixinRules = [
 .q-field__append {
     padding-inline: 0;
 }
-
-.q-field__append.q-field__marginal.row.no-wrap.items-center.row {
-    height: 20px;
-}
-.q-field--outlined .q-field__append.q-field__marginal.row.no-wrap.items-center.row {
-    height: auto;
-}
-.q-field__control {
-    height: unset;
-}
-
-.q-field--labeled {
-    .q-field__native,
-    .q-field__prefix,
-    .q-field__suffix,
-    .q-field__input {
-        padding-bottom: 0;
-        min-height: 15px;
-    }
-}
 </style>
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 84ab4b4b6..aa629767d 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -283,15 +283,4 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 .q-field--outlined {
     max-width: 100%;
 }
-.q-field__inner {
-    .q-field__control {
-        min-height: auto !important;
-
-        display: flex;
-        align-items: flex-end;
-        .q-field__native.row {
-            min-height: auto !important;
-        }
-    }
-}
 </style>
diff --git a/src/components/ui/VnRow.vue b/src/components/ui/VnRow.vue
index 0df1fb7d4..16bcfab7d 100644
--- a/src/components/ui/VnRow.vue
+++ b/src/components/ui/VnRow.vue
@@ -9,7 +9,6 @@ defineProps({ wrap: { type: Boolean, default: false } });
 <style lang="scss" scoped>
 .vn-row {
     display: flex;
-    align-items: flex-end;
     > :deep(*) {
         flex: 1;
     }
diff --git a/src/css/app.scss b/src/css/app.scss
index c77af41f9..905934d4c 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -288,14 +288,3 @@ input::-webkit-inner-spin-button {
         color: $info;
     }
 }
-.q-field__inner {
-    .q-field__control {
-        min-height: auto !important;
-        display: flex;
-        align-items: flex-end;
-        padding-bottom: 2px;
-        .q-field__native.row {
-            min-height: auto !important;
-        }
-    }
-}

From 2ff99d3faa63e2cd2ae7e41dec0dbfed7335715e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 10 Oct 2024 13:56:14 +0200
Subject: [PATCH 113/131] feat: define as global dense value

---
 src/boot/defaults/qInput.js  | 4 ++++
 src/boot/defaults/qSelect.js | 4 ++++
 src/boot/quasar.defaults.js  | 2 ++
 3 files changed, 10 insertions(+)
 create mode 100644 src/boot/defaults/qInput.js
 create mode 100644 src/boot/defaults/qSelect.js

diff --git a/src/boot/defaults/qInput.js b/src/boot/defaults/qInput.js
new file mode 100644
index 000000000..299b98718
--- /dev/null
+++ b/src/boot/defaults/qInput.js
@@ -0,0 +1,4 @@
+import { QInput } from 'quasar';
+import setDefault from './setDefault';
+
+setDefault(QInput, 'dense', true);
diff --git a/src/boot/defaults/qSelect.js b/src/boot/defaults/qSelect.js
new file mode 100644
index 000000000..be0ba048a
--- /dev/null
+++ b/src/boot/defaults/qSelect.js
@@ -0,0 +1,4 @@
+import { QSelect } from 'quasar';
+import setDefault from './setDefault';
+
+setDefault(QSelect, 'dense', true);
diff --git a/src/boot/quasar.defaults.js b/src/boot/quasar.defaults.js
index c792100d7..9638e2057 100644
--- a/src/boot/quasar.defaults.js
+++ b/src/boot/quasar.defaults.js
@@ -1 +1,3 @@
 export * from './defaults/qTable';
+export * from './defaults/qInput';
+export * from './defaults/qSelect';

From 50042ed45be0484c3c5d9ed5c71fdb5ffba97250 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 10 Oct 2024 16:49:41 +0200
Subject: [PATCH 114/131] feat: refs #7874 prevent submit if empty fields

---
 src/components/ui/VnNotes.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 92dd32691..63b21f92a 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -34,6 +34,8 @@ const observationTypes = ref([]);
 const vnPaginateRef = ref();
 
 async function insert() {
+    if (!newNote.text || !newNote.observationTypeFk) return;
+
     const body = $props.body;
     const newBody = {
         ...body,

From 64c8d264af9a740f6bee51c7d17baa44f31c454f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 14 Oct 2024 07:43:29 +0200
Subject: [PATCH 115/131] warmFix(TravelList): add daysOnward in travelFilter

---
 src/pages/Travel/TravelFilter.vue | 6 ++++++
 src/pages/Travel/TravelList.vue   | 9 ---------
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index 96298853f..c91146257 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -124,6 +124,12 @@ defineExpose({ states });
                     lazy-rules
                     is-outlined
                 />
+                <VnInput
+                    :label="t('travel.travelList.tableVisibleColumns.daysOnward')"
+                    v-model="params.daysOnward"
+                    lazy-rules
+                    is-outlined
+                />
             </div>
         </template>
     </VnFilterPanel>
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 05d2e5eda..a8c0e69cb 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -161,15 +161,6 @@ const columns = computed(() => [
         cardVisible: true,
         create: true,
     },
-    {
-        align: 'left',
-        name: 'daysOnward',
-        label: t('travel.travelList.tableVisibleColumns.daysOnward'),
-        visible: false,
-        columnFilter: {
-            inWhere: false,
-        },
-    },
     {
         align: 'right',
         label: '',

From eebac7b36cc41c19f5df82f485e02efb5989acbe Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 14 Oct 2024 08:51:26 +0200
Subject: [PATCH 116/131] fix: fixed e2e test

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

diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js
index dca74dec2..4addec1c4 100644
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@@ -11,7 +11,7 @@ describe('EntryMy when is supplier', () => {
 
     it('should open buyLabel when is supplier', () => {
         cy.get(
-            '[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
+            '[to="/null/3"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
         ).click();
         cy.get('.q-card__actions > .q-btn').click();
         cy.window().its('open').should('be.called');

From 6a624b12a5a8f37325d08781b48e6cccaec17b97 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 14 Oct 2024 09:28:51 +0200
Subject: [PATCH 117/131] refs: #6898 hotfix accounts

---
 src/pages/Supplier/Card/SupplierAccounts.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 177466478..bc009d3ad 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -99,7 +99,11 @@ const setWireTransfer = async () => {
                     :key="index"
                     class="row q-gutter-md q-mb-md"
                 >
-                    <VnInput :label="t('supplier.accounts.iban')" v-model="row.iban">
+                    <VnInput
+                        :label="t('supplier.accounts.iban')"
+                        v-model="row.iban"
+                        :required="true"
+                    >
                         <template #append>
                             <QIcon name="info" class="cursor-info">
                                 <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
@@ -113,6 +117,7 @@ const setWireTransfer = async () => {
                         option-label="bic"
                         option-value="id"
                         hide-selected
+                        :required="true"
                         :roles-allowed-to-create="['financial']"
                     >
                         <template #form>

From 85b068eddb3262e762b403a286cdbcdb49895eab Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 14 Oct 2024 10:21:02 +0200
Subject: [PATCH 118/131] refs #6898 #6899 hotfix lists

---
 src/pages/InvoiceOut/InvoiceOutList.vue | 8 ++++++++
 src/pages/Supplier/SupplierList.vue     | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 5157d957b..09de62b27 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -13,6 +13,8 @@ import { toCurrency, toDate } from 'src/filters/index';
 import { useStateStore } from 'stores/useStateStore';
 import { QBtn } from 'quasar';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import InvoiceOutFilter from './InvoiceOutFilter.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -179,6 +181,11 @@ watchEffect(selectedRows);
         :label="t('searchInvoice')"
         data-key="invoiceOut"
     />
+    <RightMenu>
+        <template #right-panel>
+            <InvoiceOutFilter data-key="invoiceOut" />
+        </template>
+    </RightMenu>
     <VnSubToolbar>
         <template #st-actions>
             <QBtn
@@ -203,6 +210,7 @@ watchEffect(selectedRows);
                 active: true,
             },
         }"
+        :right-search="false"
         v-model:selected="selectedRows"
         order="id DESC"
         :columns="columns"
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index ad668f0c0..ea79947a4 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -3,6 +3,8 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import SupplierListFilter from './SupplierListFilter.vue';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -93,6 +95,11 @@ const columns = computed(() => [
 
 <template>
     <VnSearchbar data-key="SuppliersList" :limit="20" :label="t('Search suppliers')" />
+    <RightMenu>
+        <template #right-panel>
+            <SupplierListFilter data-key="SuppliersList" />
+        </template>
+    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"
@@ -109,6 +116,7 @@ const columns = computed(() => [
                 return data;
             },
         }"
+        :right-search="false"
         order="id ASC"
         :columns="columns"
         auto-load

From 4b78c1acd001fff12223ba5323a254571ada921d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 14 Oct 2024 12:00:05 +0200
Subject: [PATCH 119/131] fix: refs #7524 dynamic

---
 src/components/common/VnSelect.vue            |  2 ++
 .../Department/Card/DepartmentBasicData.vue   | 15 ++---------
 src/pages/InvoiceOut/InvoiceOutFilter.vue     | 15 -----------
 src/pages/Item/ItemTypeCreate.vue             | 11 +++-----
 src/pages/ItemType/Card/ItemTypeBasicData.vue | 11 +++-----
 src/pages/Order/Card/OrderCreateDialog.vue    | 13 ++++------
 src/pages/Order/Card/OrderFilter.vue          | 12 ---------
 src/pages/Shelving/Card/ShelvingFilter.vue    | 15 -----------
 src/pages/Ticket/TicketFilter.vue             | 26 ++++++-------------
 9 files changed, 23 insertions(+), 97 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index aa629767d..952b7dd8c 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -227,6 +227,8 @@ function nullishToTrue(value) {
 }
 
 const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
+
+defineExpose({ opts: myOptions });
 </script>
 
 <template>
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index 98abfd6b9..141bb4159 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -1,9 +1,7 @@
 <script setup>
-import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -11,17 +9,8 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const { t } = useI18n();
-
-const workersOptions = ref([]);
-const clientsOptions = ref([]);
 </script>
 <template>
-    <FetchData
-        url="Workers/search"
-        @on-fetch="(data) => (workersOptions = data)"
-        auto-load
-    />
-    <FetchData url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
     <FormModel
         :url="`Departments/${route.params.id}`"
         model="department"
@@ -62,7 +51,7 @@ const clientsOptions = ref([]);
                 <VnSelect
                     :label="t('department.bossDepartment')"
                     v-model="data.workerFk"
-                    :options="workersOptions"
+                    url="Workers/search"
                     option-value="id"
                     option-label="name"
                     hide-selected
@@ -72,7 +61,7 @@ const clientsOptions = ref([]);
                 <VnSelect
                     :label="t('department.selfConsumptionCustomer')"
                     v-model="data.clientFk"
-                    :options="clientsOptions"
+                    url="Clients"
                     option-value="id"
                     option-label="name"
                     hide-selected
diff --git a/src/pages/InvoiceOut/InvoiceOutFilter.vue b/src/pages/InvoiceOut/InvoiceOutFilter.vue
index d0d42ea9b..9ce8cc254 100644
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@@ -15,25 +15,10 @@ const props = defineProps({
         required: true,
     },
 });
-
-const workers = ref();
-const workersCopy = ref();
 const states = ref();
-
-function setWorkers(data) {
-    workers.value = data;
-    workersCopy.value = data;
-}
 </script>
-
 <template>
     <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="setWorkers"
-        auto-load
-    />
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
diff --git a/src/pages/Item/ItemTypeCreate.vue b/src/pages/Item/ItemTypeCreate.vue
index b7b06bbe6..290a40389 100644
--- a/src/pages/Item/ItemTypeCreate.vue
+++ b/src/pages/Item/ItemTypeCreate.vue
@@ -15,7 +15,6 @@ const router = useRouter();
 
 const newItemTypeForm = reactive({});
 
-const workersOptions = ref([]);
 const categoriesOptions = ref([]);
 const temperaturesOptions = ref([]);
 
@@ -25,12 +24,6 @@ const redirectToItemTypeBasicData = (_, { id }) => {
 </script>
 
 <template>
-    <FetchData
-        url="Workers"
-        @on-fetch="(data) => (workersOptions = data)"
-        :filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
-        auto-load
-    />
     <FetchData
         url="ItemCategories"
         @on-fetch="(data) => (categoriesOptions = data)"
@@ -61,7 +54,9 @@ const redirectToItemTypeBasicData = (_, { id }) => {
                     <VnSelect
                         v-model="data.workerFk"
                         :label="t('itemType.shared.worker')"
-                        :options="workersOptions"
+                        url="Workers"
+                        sort-by="firstName ASC"
+                        :fields="['id', 'firstName']"
                         option-value="id"
                         option-label="firstName"
                         hide-selected
diff --git a/src/pages/ItemType/Card/ItemTypeBasicData.vue b/src/pages/ItemType/Card/ItemTypeBasicData.vue
index 51e24272d..39076f129 100644
--- a/src/pages/ItemType/Card/ItemTypeBasicData.vue
+++ b/src/pages/ItemType/Card/ItemTypeBasicData.vue
@@ -12,17 +12,10 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 const route = useRoute();
 const { t } = useI18n();
 
-const workersOptions = ref([]);
 const categoriesOptions = ref([]);
 const temperaturesOptions = ref([]);
 </script>
 <template>
-    <FetchData
-        url="Workers"
-        @on-fetch="(data) => (workersOptions = data)"
-        :filter="{ order: 'firstName ASC', fields: ['id', 'firstName'] }"
-        auto-load
-    />
     <FetchData
         url="ItemCategories"
         @on-fetch="(data) => (categoriesOptions = data)"
@@ -50,7 +43,9 @@ const temperaturesOptions = ref([]);
                 <VnSelect
                     v-model="data.workerFk"
                     :label="t('shared.worker')"
-                    :options="workersOptions"
+                    url="Workers"
+                    sort-by="firstName"
+                    :fields="['id', 'firstName']"
                     option-value="id"
                     option-label="firstName"
                     hide-selected
diff --git a/src/pages/Order/Card/OrderCreateDialog.vue b/src/pages/Order/Card/OrderCreateDialog.vue
index 27b0171f2..bcc62aa43 100644
--- a/src/pages/Order/Card/OrderCreateDialog.vue
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@@ -126,12 +126,6 @@ onMounted(async () => {
 </script>
 
 <template>
-    <FetchData
-        url="addresses"
-        @on-fetch="(data) => (clientOptions = data)"
-        :filter="{ fields: ['id', 'name', 'defaultAddressFk'], order: 'id' }"
-        auto-load
-    />
     <FormModelPopup
         url-create="Orders/new"
         :title="t('Create Order')"
@@ -165,13 +159,16 @@ onMounted(async () => {
                     </template>
                 </VnSelect>
                 <VnSelect
+                    ref="addressRef"
                     :label="t('order.form.addressFk')"
                     v-model="data.addressId"
-                    :options="addressList"
+                    url="addresses"
+                    :fields="['id', 'nickname', 'defaultAddressFk', 'street', 'city']"
+                    sort-by="id"
                     option-value="id"
                     option-label="street"
                     hide-selected
-                    :disable="!addressList?.length"
+                    :disable="!$refs.addressRef?.length"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
diff --git a/src/pages/Order/Card/OrderFilter.vue b/src/pages/Order/Card/OrderFilter.vue
index be47eed54..917369919 100644
--- a/src/pages/Order/Card/OrderFilter.vue
+++ b/src/pages/Order/Card/OrderFilter.vue
@@ -17,10 +17,6 @@ const props = defineProps({
 
 const agencyFilter = { fields: ['id', 'name'] };
 const agencyList = ref(null);
-const salesPersonFilter = {
-    fields: ['id', 'nickname'],
-};
-const salesPersonList = ref(null);
 const sourceList = ref([]);
 </script>
 
@@ -32,14 +28,6 @@ const sourceList = ref([]);
         auto-load
         @on-fetch="(data) => (agencyList = data)"
     />
-    <FetchData
-        url="Workers/search"
-        :filter="salesPersonFilter"
-        sort-by="nickname ASC"
-        @on-fetch="(data) => (salesPersonList = data)"
-        :params="{ departmentCodes: ['VT'] }"
-        auto-load
-    />
     <FetchData
         url="Orders/getSourceValues"
         :filter="{ fields: ['value'] }"
diff --git a/src/pages/Shelving/Card/ShelvingFilter.vue b/src/pages/Shelving/Card/ShelvingFilter.vue
index 0056ffaec..56cf4f58c 100644
--- a/src/pages/Shelving/Card/ShelvingFilter.vue
+++ b/src/pages/Shelving/Card/ShelvingFilter.vue
@@ -1,7 +1,5 @@
 <script setup>
-import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
@@ -14,22 +12,9 @@ const props = defineProps({
 });
 
 const emit = defineEmits(['search']);
-
-const workers = ref();
-
-function setWorkers(data) {
-    workers.value = data;
-}
 </script>
 
 <template>
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        sort-by="firstName ASC"
-        @on-fetch="setWorkers"
-        auto-load
-    />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 3b9833ce2..95cac4a47 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -6,6 +6,7 @@ import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -15,7 +16,6 @@ const props = defineProps({
     },
 });
 
-const workers = ref([]);
 const provinces = ref([]);
 const states = ref([]);
 const agencies = ref([]);
@@ -27,12 +27,6 @@ const warehouses = ref([]);
     <FetchData url="States" @on-fetch="(data) => (states = data)" auto-load />
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
     <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
     <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -66,23 +60,19 @@ const warehouses = ref([]);
                 </QItemSection>
             </QItem>
             <QItem>
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
-                    <QSelect
+                <QItemSection>
+                    <VnSelect
                         :label="t('Salesperson')"
                         v-model="params.salesPersonFk"
-                        :options="workers"
+                        url="Workers/activeWithInheritedRole"
+                        :where="{ role: 'salesPerson' }"
                         option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
+                        option-label="firstName"
+                        :use-like="false"
+                        sort-by="firstName ASC"
                         dense
                         outlined
                         rounded
-                        :input-debounce="0"
                     />
                 </QItemSection>
             </QItem>

From 4ff3c18f33bc8738655b27c0c1ba20c991591d2d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 14 Oct 2024 13:00:15 +0200
Subject: [PATCH 120/131] feat: refs #7874 use badge type

---
 src/components/ui/VnNotes.vue | 69 +++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 32 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 63b21f92a..98a511484 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -81,7 +81,7 @@ onBeforeRouteLeave((to, from, next) => {
                     url="ObservationTypes"
                     v-model="newNote.observationTypeFk"
                     option-label="description"
-                    style="flex: 0.15; margin-left: 0"
+                    style="flex: 0.15"
                     :required="true"
                     @keyup.enter.stop="insert"
                 />
@@ -142,35 +142,29 @@ onBeforeRouteLeave((to, from, next) => {
                             :title="note.worker?.user.nickname"
                         />
                         <div class="full-width row justify-between q-pa-xs">
-                            <VnUserLink
-                                :name="`${note.worker.user.nickname}`"
-                                :worker-id="note.worker.id"
-                            />
+                            <div>
+                                <VnUserLink
+                                    :name="`${note.worker.user.nickname}`"
+                                    :worker-id="note.worker.id"
+                                />
+                                <QBadge
+                                    class="q-ml-xs"
+                                    outline
+                                    color="grey"
+                                    v-if="selectType && note.observationTypeFk"
+                                >
+                                    {{
+                                        observationTypes.find(
+                                            (ot) => ot.id === note.observationTypeFk
+                                        )?.description
+                                    }}
+                                </QBadge>
+                            </div>
                             <span v-text="toDateHourMin(note.created)" />
                         </div>
                     </QCardSection>
                     <QCardSection class="q-pa-xs q-my-none q-py-none">
-                        <VnRow>
-                            <VnSelect
-                                :label="t('Observation type')"
-                                v-if="selectType && note.observationTypeFk"
-                                url="ObservationTypes"
-                                v-model="note.observationTypeFk"
-                                option-label="description"
-                                style="flex: 0.15"
-                                dense
-                                readonly
-                                :is-clearable="false"
-                            />
-                            <span
-                                :style="{
-                                    flex: 0.85,
-                                    'align-self':
-                                        selectType & $q.screen.gt.xs ? 'end' : 'baseline',
-                                }"
-                                v-text="note.text"
-                            />
-                        </VnRow>
+                        {{ note.text }}
                     </QCardSection>
                 </QCard>
             </TransitionGroup>
@@ -180,12 +174,6 @@ onBeforeRouteLeave((to, from, next) => {
 <style lang="scss" scoped>
 .q-card {
     width: 90%;
-    @media (max-width: $breakpoint-sm) {
-        width: 100%;
-    }
-    &__section {
-        word-wrap: break-word;
-    }
 }
 .q-dialog .q-card {
     width: 400px;
@@ -199,6 +187,23 @@ onBeforeRouteLeave((to, from, next) => {
     opacity: 0;
     background-color: $primary;
 }
+
+.vn-row > :nth-child(2) {
+    margin-left: 0;
+}
+
+@media (max-width: $breakpoint-xs) {
+    .vn-row > :deep(*) {
+        margin-left: 0;
+    }
+    .q-card {
+        width: 100%;
+
+        &__section {
+            padding: 0;
+        }
+    }
+}
 </style>
 <i18n>
     es:

From b225f6a4c879cd1151aec64ed3bb0f48cedc2b73 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 14 Oct 2024 13:18:34 +0200
Subject: [PATCH 121/131] refs #7767 fix contractHolidays

---
 .../Worker/Card/WorkerCalendarFilter.vue      | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index 95fb2d393..cc99cde0e 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import VnSelect from 'components/common/VnSelect.vue';
 import useNotify from 'src/composables/useNotify';
 import { useRoute } from 'vue-router';
-import { computed, onMounted, ref } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 import { toDateFormat } from '../../../filters/date';
 const { notify } = useNotify();
 
@@ -35,9 +35,13 @@ const props = defineProps({
     },
 });
 
-onMounted(async () => {
-    await checkHolidays(props.contractHolidays);
-});
+watch(
+    () => props.contractHolidays,
+    (newValue) => {
+        checkHolidays(newValue);
+    },
+    { deep: true, immediate: true }
+);
 const emit = defineEmits(['update:businessFk', 'update:year', 'update:absenceType']);
 
 const selectedBusinessFk = computed({
@@ -58,22 +62,23 @@ const selectedAbsenceType = computed({
     },
 });
 
-const generateYears = () => {
+function generateYears() {
     const now = Date.vnNew();
     const maxYear = now.getFullYear() + 1;
 
     return Array.from({ length: 5 }, (_, i) => String(maxYear - i)) || [];
-};
+}
 
-const checkHolidays = (contractHolidays) => {
+function checkHolidays(contractHolidays) {
     console.log('contractHolidays', contractHolidays);
+    if (!contractHolidays) return;
     if (
         contractHolidays.holidaysEnjoyed > contractHolidays.totalHolidays ||
         contractHolidays.hoursEnjoyed > contractHolidays.totalHours
     ) {
         notify(t('Vacation days have been exceeded'), 'negative');
     }
-};
+}
 
 const absenceTypeList = ref([]);
 const contractList = ref([]);

From 0f3168456aac154a0e7ab3d81f0f97d19f1af358 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 14 Oct 2024 13:22:59 +0200
Subject: [PATCH 122/131] chore: refs #7524 sort by firstName

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

diff --git a/src/pages/ItemType/Card/ItemTypeBasicData.vue b/src/pages/ItemType/Card/ItemTypeBasicData.vue
index 39076f129..d35fbb17d 100644
--- a/src/pages/ItemType/Card/ItemTypeBasicData.vue
+++ b/src/pages/ItemType/Card/ItemTypeBasicData.vue
@@ -44,7 +44,7 @@ const temperaturesOptions = ref([]);
                     v-model="data.workerFk"
                     :label="t('shared.worker')"
                     url="Workers"
-                    sort-by="firstName"
+                    sort-by="firstName ASC"
                     :fields="['id', 'firstName']"
                     option-value="id"
                     option-label="firstName"

From 8258fbb91ee478798dc56d3b126bb425620b61e1 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 14 Oct 2024 13:24:12 +0200
Subject: [PATCH 123/131] refs #7767 remove onMounted

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

diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index cc99cde0e..963fb05a7 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -5,7 +5,7 @@ import { useI18n } from 'vue-i18n';
 import VnSelect from 'components/common/VnSelect.vue';
 import useNotify from 'src/composables/useNotify';
 import { useRoute } from 'vue-router';
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
 import { toDateFormat } from '../../../filters/date';
 const { notify } = useNotify();
 

From 0fb9b22935c1dec0e5d456e29e92d6dcd355e491 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 14 Oct 2024 14:09:52 +0200
Subject: [PATCH 124/131] chore: refs #7874 refactor code

---
 src/components/ui/VnNotes.vue                      |  2 +-
 .../Defaulter/CustomerDefaulterAddObservation.vue  | 14 ++++++++------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 98a511484..e23eeb121 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -29,7 +29,7 @@ const { t } = useI18n();
 const state = useState();
 const quasar = useQuasar();
 const currentUser = ref(state.getUser());
-const newNote = reactive({ text: '', observationTypeFk: null });
+const newNote = reactive({ text: null, observationTypeFk: null });
 const observationTypes = ref([]);
 const vnPaginateRef = ref();
 
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
index 9bdb0ad5b..27dfe48e6 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
@@ -25,20 +25,22 @@ const { notify } = useNotify();
 const { t } = useI18n();
 
 const newObservation = ref(null);
+const obsId = ref(null);
 
 const onSubmit = async () => {
     try {
-        const observationTypeFk = (
-            await axios.get('ObservationTypes/findOne', {
-                params: { filter: { where: { description: 'Finance' } } },
-            })
-        ).data?.id;
+        if (!obsId.value)
+            obsId.value = (
+                await axios.get('ObservationTypes/findOne', {
+                    params: { filter: { where: { description: 'Finance' } } },
+                })
+            ).data?.id;
 
         const bodyObs = $props.clients.map((item) => {
             return {
                 clientFk: item.clientFk,
                 text: newObservation.value,
-                observationTypeFk,
+                observationTypeFk: obsId.value,
             };
         });
         await axios.post('ClientObservations', bodyObs);

From 245c02735756d9c62ff5658ba967ce08efef7d23 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 14 Oct 2024 15:43:59 +0200
Subject: [PATCH 125/131] chore: refs #7874 refactor imports

---
 src/components/ui/VnNotes.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index e23eeb121..876081235 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -12,10 +12,10 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnUserLink from 'components/ui/VnUserLink.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnAvatar from 'components/ui/VnAvatar.vue';
-import VnRow from './VnRow.vue';
-import VnSelect from '../common/VnSelect.vue';
-import FetchData from '../FetchData.vue';
-import VnInput from '../common/VnInput.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+import VnInput from 'components/common/VnInput.vue';
 
 const $props = defineProps({
     url: { type: String, default: null },

From 2d34921cf5a29addf67aa87bc27b202db77ee4e2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 14 Oct 2024 15:52:12 +0200
Subject: [PATCH 126/131] fix: refs #7524 paginate

---
 src/pages/InvoiceOut/InvoiceOutNegativeBases.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 774b42478..53a1f2ec1 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -168,7 +168,6 @@ const downloadCSV = async () => {
                 }
             }
         "
-        :limit="0"
         :columns="columns"
         auto-load
         :is-editable="false"

From bc581caa4ebd0b5ab2c9c2fd9f3ded1ef4b1579a Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 15 Oct 2024 07:57:19 +0200
Subject: [PATCH 127/131] fix: refs #7767 console remove

---
 src/pages/Worker/Card/WorkerCalendarFilter.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Worker/Card/WorkerCalendarFilter.vue b/src/pages/Worker/Card/WorkerCalendarFilter.vue
index 963fb05a7..67b7df907 100644
--- a/src/pages/Worker/Card/WorkerCalendarFilter.vue
+++ b/src/pages/Worker/Card/WorkerCalendarFilter.vue
@@ -70,7 +70,6 @@ function generateYears() {
 }
 
 function checkHolidays(contractHolidays) {
-    console.log('contractHolidays', contractHolidays);
     if (!contractHolidays) return;
     if (
         contractHolidays.holidaysEnjoyed > contractHolidays.totalHolidays ||

From 3bb5f66ce727184f7ffb80236c676eb8acbf7150 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 15 Oct 2024 08:43:58 +0200
Subject: [PATCH 128/131] fix(claimNotes): refs #8093 $props.selectType &&
 !newNote.observationTypeFk

---
 src/components/ui/VnNotes.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 876081235..b395b3934 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -34,7 +34,7 @@ const observationTypes = ref([]);
 const vnPaginateRef = ref();
 
 async function insert() {
-    if (!newNote.text || !newNote.observationTypeFk) return;
+    if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
 
     const body = $props.body;
     const newBody = {

From 0f84baf1a8c4db983d30e74ab99a6410d8800199 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 15 Oct 2024 09:29:06 +0200
Subject: [PATCH 129/131] build: init version 24.44

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index eaaa0b812..a61c8f21a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.42.0",
+    "version": "24.44.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

From 15f171da0fe58dd80b6945c8fc454d925b075bb3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 15 Oct 2024 13:12:37 +0200
Subject: [PATCH 130/131] perf: refs #7825 create bank entity

---
 src/components/CreateBankEntityForm.vue |  4 ++--
 src/pages/Worker/WorkerList.vue         | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 0a3c10f57..a42be6ef8 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -31,8 +31,8 @@ const countriesFilter = {
 
 const countriesOptions = ref([]);
 
-const onDataSaved = (formData, requestResponse) => {
-    emit('onDataSaved', formData, requestResponse);
+const onDataSaved = (...args) => {
+    emit('onDataSaved', ...args);
 };
 
 onMounted(async () => {
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 4b7d028e7..99ea609a1 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -29,6 +29,7 @@ const postcodesOptions = ref([]);
 
 const user = useState().getUser();
 const defaultPayMethod = ref();
+const bankEntitiesRef = ref();
 const columns = computed(() => [
     {
         align: 'left',
@@ -93,10 +94,11 @@ onBeforeMount(async () => {
     ).data?.payMethodFk;
 });
 
-const handleNewBankEntity = (response, formData) => {
-    bankEntitiesOptions.value = [...bankEntitiesOptions.value, response];
-    formData.bankEntityFk = response.id;
-};
+async function handleNewBankEntity(data, resp) {
+    await bankEntitiesRef.value.fetch();
+    data.bankEntityFk = resp.id;
+    bankEntitiesOptions.value.push(resp);
+}
 
 function handleLocation(data, location) {
     const { town, code, provinceFk, countryFk } = location ?? {};
@@ -157,6 +159,7 @@ async function autofillBic(worker) {
         auto-load
     />
     <FetchData
+        ref="bankEntitiesRef"
         url="BankEntities"
         @on-fetch="(data) => (bankEntitiesOptions = data)"
         auto-load
@@ -325,8 +328,7 @@ async function autofillBic(worker) {
                         <template #form>
                             <CreateBankEntityForm
                                 @on-data-saved="
-                                    (_, requestResponse) =>
-                                        handleNewBankEntity(requestResponse, data)
+                                    (_, resp) => handleNewBankEntity(data, resp)
                                 "
                             />
                         </template>

From e0c294bce61f055809d52c89a92ad91d1ab4788b Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 16 Oct 2024 09:16:57 +0200
Subject: [PATCH 131/131] test(claimDevelopment): skip intermitent e2e

---
 test/cypress/integration/claim/claimDevelopment.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/cypress/integration/claim/claimDevelopment.spec.js b/test/cypress/integration/claim/claimDevelopment.spec.js
index 81fc33ecd..eb39f340a 100755
--- a/test/cypress/integration/claim/claimDevelopment.spec.js
+++ b/test/cypress/integration/claim/claimDevelopment.spec.js
@@ -33,7 +33,8 @@ describe('ClaimDevelopment', () => {
         cy.saveCard();
     });
 
-    it('should add and remove new line', () => {
+    // TODO: #8112
+    xit('should add and remove new line', () => {
         cy.wait(['@workers', '@workers']);
         cy.addCard();