From c4de1beabf6b736c3849c618c00d05c2e522fe7e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 12 Aug 2024 13:46:56 +0200
Subject: [PATCH 01/47] feat: refs #6900 add InvoiceInSerial

---
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 .../InvoiceIn/Serial/InvoiceInSerial.vue      | 63 +++++++++++++++++++
 .../Serial/InvoiceInSerialFilter.vue          | 49 +++++++++++++++
 src/router/modules/invoiceIn.js               | 12 +++-
 5 files changed, 125 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/InvoiceIn/Serial/InvoiceInSerial.vue
 create mode 100644 src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 12680d0cb..6065ddaff 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -251,6 +251,7 @@ globals:
         privileges: Privileges
         ldap: LDAP
         samba: Samba
+        serial: Serial
     created: Created
     worker: Worker
     now: Now
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 747a10d51..de3aa8fd1 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -253,6 +253,7 @@ globals:
         packages: Bultos
         ldap: LDAP
         samba: Samba
+        serial: Facturas por serie
     created: Fecha creación
     worker: Trabajador
     now: Ahora
diff --git a/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue b/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue
new file mode 100644
index 000000000..b6bcf7a9b
--- /dev/null
+++ b/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue
@@ -0,0 +1,63 @@
+<script setup>
+import { ref, computed, onBeforeMount } from 'vue';
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import InvoiceInSerialFilter from './InvoiceInSerialFilter.vue';
+import { useArrayData } from 'src/composables/useArrayData';
+
+const { t } = useI18n();
+
+const cols = computed(() => [
+    {
+        align: 'left',
+        name: 'serial',
+        label: t('Serial'),
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        name: 'pending',
+        label: t('Pending'),
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        name: 'total',
+        label: 'Total',
+        columnFilter: false,
+    },
+]);
+
+const arrayData = useArrayData('InvoiceInSerial');
+const table = ref();
+onBeforeMount(async () => {
+    const { data } = await axios.get('InvoiceInConfigs/findOne', {
+        params: { filter: { fields: ['daysAgo'] } },
+    });
+
+    arrayData.store.userParams.daysAgo = data.daysAgo;
+    await table.value.reload();
+});
+</script>
+<template>
+    <RightMenu>
+        <template #right-panel>
+            <InvoiceInSerialFilter data-key="InvoiceInSerial" />
+        </template>
+    </RightMenu>
+    <VnTable
+        ref="table"
+        data-key="InvoiceInSerial"
+        url="InvoiceIns/getSerial"
+        :columns="cols"
+        :right-search="false"
+        :disable-option="{ card: true }"
+    />
+</template>
+<i18n>
+es:
+    Serial: Serie
+    Pending: Pendiente
+</i18n>
diff --git a/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue b/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue
new file mode 100644
index 000000000..b1cfb4e03
--- /dev/null
+++ b/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue
@@ -0,0 +1,49 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+defineProps({ dataKey: { type: String, required: true } });
+
+const { t } = useI18n();
+</script>
+<template>
+    <VnFilterPanel :data-key="dataKey" :search-button="true">
+        <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>
+                <QItemSection>
+                    <VnInputNumber
+                        v-model="params.daysAgo"
+                        :label="t('params.daysAgo')"
+                        outlined
+                        rounded
+                        dense
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.serial"
+                        :label="t('params.serial')"
+                        outlined
+                        rounded
+                        dense
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+<i18n>
+es:
+    params:
+        daysAgo: 'Últimos días'
+        serial: 'serie'
+</i18n>
diff --git a/src/router/modules/invoiceIn.js b/src/router/modules/invoiceIn.js
index cd8f7de9c..906db8a58 100644
--- a/src/router/modules/invoiceIn.js
+++ b/src/router/modules/invoiceIn.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'InvoiceInMain' },
     menus: {
-        main: ['InvoiceInList'],
+        main: ['InvoiceInList', 'InvoiceInSerial'],
         card: [
             'InvoiceInBasicData',
             'InvoiceInVat',
@@ -37,6 +37,16 @@ export default {
                     },
                     component: () => import('src/pages/InvoiceIn/InvoiceInList.vue'),
                 },
+                {
+                    path: 'serial',
+                    name: 'InvoiceInSerial',
+                    meta: {
+                        title: 'serial',
+                        icon: 'view_list',
+                    },
+                    component: () =>
+                        import('src/pages/InvoiceIn/Serial/InvoiceInSerial.vue'),
+                },
                 {
                     path: 'create',
                     name: 'InvoiceInCreare',

From de24a3efdb74d4b41da6701772ba97be39a9e9f2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 12 Aug 2024 15:34:09 +0200
Subject: [PATCH 02/47] feat: refs #6900 add locale

---
 src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue b/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue
index b1cfb4e03..4f8c9d70b 100644
--- a/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue
+++ b/src/pages/InvoiceIn/Serial/InvoiceInSerialFilter.vue
@@ -42,8 +42,12 @@ const { t } = useI18n();
     </VnFilterPanel>
 </template>
 <i18n>
+en:
+    params:
+        daysAgo: Last days
+        serial: serial
 es:
     params:
-        daysAgo: 'Últimos días'
-        serial: 'serie'
+        daysAgo: Últimos días
+        serial: serie
 </i18n>

From 6dd9029871f15622aa8a3e519080b85986fc70bc Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 14 Aug 2024 14:27:54 +0200
Subject: [PATCH 03/47] fix: refs #6900 improve logic

---
 .../InvoiceIn/Serial/InvoiceInSerial.vue      | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue b/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue
index b6bcf7a9b..f5354da18 100644
--- a/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue
+++ b/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue
@@ -1,11 +1,11 @@
 <script setup>
 import { ref, computed, onBeforeMount } from 'vue';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import InvoiceInSerialFilter from './InvoiceInSerialFilter.vue';
-import { useArrayData } from 'src/composables/useArrayData';
 
 const { t } = useI18n();
 
@@ -30,15 +30,18 @@ const cols = computed(() => [
     },
 ]);
 
-const arrayData = useArrayData('InvoiceInSerial');
-const table = ref();
-onBeforeMount(async () => {
-    const { data } = await axios.get('InvoiceInConfigs/findOne', {
-        params: { filter: { fields: ['daysAgo'] } },
-    });
+const daysAgo = ref(0);
 
-    arrayData.store.userParams.daysAgo = data.daysAgo;
-    await table.value.reload();
+onBeforeMount(async () => {
+    const tableParam = useRoute().query.table;
+
+    if (tableParam) daysAgo.value = JSON.parse(tableParam).daysAgo;
+    else
+        daysAgo.value = (
+            await axios.get('InvoiceInConfigs/findOne', {
+                params: { filter: { fields: ['daysAgo'] } },
+            })
+        ).data?.daysAgo;
 });
 </script>
 <template>
@@ -48,12 +51,14 @@ onBeforeMount(async () => {
         </template>
     </RightMenu>
     <VnTable
-        ref="table"
+        v-if="daysAgo"
         data-key="InvoiceInSerial"
         url="InvoiceIns/getSerial"
         :columns="cols"
         :right-search="false"
+        :user-params="{ daysAgo }"
         :disable-option="{ card: true }"
+        auto-load
     />
 </template>
 <i18n>

From 3bba5db1b518d6ee02f0a46cad654dd6f4c04b09 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 14 Aug 2024 14:52:47 +0200
Subject: [PATCH 04/47] fix: refs #6900 improve logic

---
 src/pages/InvoiceIn/Serial/InvoiceInSerial.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue b/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue
index f5354da18..4eb9fa69d 100644
--- a/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue
+++ b/src/pages/InvoiceIn/Serial/InvoiceInSerial.vue
@@ -30,7 +30,7 @@ const cols = computed(() => [
     },
 ]);
 
-const daysAgo = ref(0);
+const daysAgo = ref();
 
 onBeforeMount(async () => {
     const tableParam = useRoute().query.table;
@@ -51,7 +51,7 @@ onBeforeMount(async () => {
         </template>
     </RightMenu>
     <VnTable
-        v-if="daysAgo"
+        v-if="!isNaN(daysAgo)"
         data-key="InvoiceInSerial"
         url="InvoiceIns/getSerial"
         :columns="cols"

From ecfdf0b6b9b9cd52d9aac61321926050c6bf8fd3 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 14 Aug 2024 15:27:36 +0200
Subject: [PATCH 05/47] fix: refs #6900 improve loading

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

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 4fd511631..ab4e2e0da 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -117,14 +117,17 @@ async function search(evt) {
     isLoading.value = true;
     const filter = { ...userParams.value, ...$props.modelValue };
     store.userParamsChanged = true;
-    const { params: newParams } = await arrayData.addFilter({
-        params: filter,
-    });
-    userParams.value = newParams;
+    try {
+        const { params: newParams } = await arrayData.addFilter({
+            params: filter,
+        });
+        userParams.value = newParams;
 
-    if (!$props.showAll && !Object.values(filter).length) store.data = [];
+        if (!$props.showAll && !Object.values(filter).length) store.data = [];
+    } finally {
+        isLoading.value = false;
+    }
 
-    isLoading.value = false;
     emit('search');
 }
 

From 83a8f7e1473bda689cbda9c01b65c0234dd3b55d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 16 Aug 2024 09:20:53 +0200
Subject: [PATCH 06/47] fix(invoiceOutGlobal): formData is object

---
 src/pages/InvoiceOut/InvoiceOutGlobalForm.vue | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 23c63ee6a..be55c58fc 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -48,7 +48,7 @@ const getStatus = computed({
 
 onMounted(async () => {
     await invoiceOutGlobalStore.init();
-    formData.value = formInitialData.value.invoiceDate;
+    formData.value = { invoiceDate: formInitialData.value.invoiceDate };
 });
 </script>
 
@@ -88,9 +88,6 @@ onMounted(async () => {
                 :label="t('client')"
                 v-model="formData.clientId"
                 :options="clientsOptions"
-                option-value="id"
-                option-label="name"
-                hide-selected
                 dense
                 outlined
                 rounded
@@ -109,9 +106,7 @@ onMounted(async () => {
                 :label="t('company')"
                 v-model="formData.companyFk"
                 :options="companiesOptions"
-                option-value="id"
                 option-label="code"
-                hide-selected
                 dense
                 outlined
                 rounded
@@ -120,9 +115,6 @@ onMounted(async () => {
                 :label="t('printer')"
                 v-model="formData.printer"
                 :options="printersOptions"
-                option-value="id"
-                option-label="name"
-                hide-selected
                 dense
                 outlined
                 rounded

From 06c0f491281df78a661a71a0a9bb21c4e25411b1 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Fri, 16 Aug 2024 10:10:40 +0200
Subject: [PATCH 07/47] feat: refs #7346 add seriaType option

---
 src/pages/InvoiceOut/InvoiceOutGlobalForm.vue | 38 ++++++++++++++++---
 src/pages/InvoiceOut/InvoiceOutList.vue       |  4 +-
 src/stores/invoiceOutGlobal.js                | 11 +++++-
 3 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 23c63ee6a..5fc519061 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -20,20 +20,18 @@ const { initialDataLoading, formInitialData, invoicing, status } =
 const { makeInvoice, setStatusValue } = invoiceOutGlobalStore;
 
 const clientsToInvoice = ref('all');
-
 const companiesOptions = ref([]);
-
 const printersOptions = ref([]);
-
 const clientsOptions = ref([]);
-
+const serialTypesOptions = ref([]);
 const formData = ref({});
 
 const optionsInitialData = computed(() => {
     return (
         companiesOptions.value.length > 0 &&
         printersOptions.value.length > 0 &&
-        clientsOptions.value.length > 0
+        clientsOptions.value.length > 0 &&
+        serialTypesOptions.value.length > 0
     );
 });
 
@@ -60,7 +58,22 @@ onMounted(async () => {
     />
     <FetchData url="Printers" @on-fetch="(data) => (printersOptions = data)" auto-load />
     <FetchData url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
-
+    <FetchData
+        url="invoiceOutSerials"
+        @on-fetch="
+            (data) => {
+                const uniqueTypes = new Set();
+                serialTypesOptions = data.filter((item) => {
+                    if (item.type === null || uniqueTypes.has(item.type)) {
+                        return false;
+                    }
+                    uniqueTypes.add(item.type);
+                    return true;
+                });
+            }
+        "
+        auto-load
+    />
     <QForm
         v-if="!initialDataLoading && optionsInitialData"
         @submit="makeInvoice(formData, clientsToInvoice)"
@@ -95,6 +108,17 @@ onMounted(async () => {
                 outlined
                 rounded
             />
+            <VnSelect
+                :label="t('invoiceOutSerialType')"
+                v-model="formData.invoiceType"
+                :options="serialTypesOptions"
+                option-value="type"
+                option-label="type"
+                hide-selected
+                dense
+                outlined
+                rounded
+            />
             <VnInputDate
                 v-model="formData.invoiceDate"
                 :label="t('invoiceDate')"
@@ -168,6 +192,7 @@ en:
     printer: Printer
     invoiceOut: Invoice out
     client: Client
+    invoiceOutSerialType: Serial Type
     stop: Stop
 
 es:
@@ -179,5 +204,6 @@ es:
     printer: Impresora
     invoiceOut: Facturar
     client: Cliente
+    invoiceOutSerialType: Tipo de Serie
     stop: Parar
 </i18n>
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 822f6bb33..b08e12b3e 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -198,7 +198,7 @@ watchEffect(selectedRows);
         :url="`${MODEL}/filter`"
         :create="{
             urlCreate: 'InvoiceOuts/createManualInvoice',
-            title: t('Create Manual Invoice'),
+            title: t('Create manual invoice'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
             formInitialData: {
                 active: true,
@@ -275,10 +275,12 @@ en:
     fileAllowed: Successful download of CSV file
     youCanSearchByInvoiceReference: You can search by invoice reference
     createInvoice: Make invoice
+    Create manual invoice: Create manual invoice
 es:
     searchInvoice: Buscar factura emitida
     fileDenied: El navegador denegó la descarga de archivos...
     fileAllowed: Descarga exitosa de archivo CSV
     youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
     createInvoice: Crear factura
+    Create manual invoice: Crear factura manual
 </i18n>
diff --git a/src/stores/invoiceOutGlobal.js b/src/stores/invoiceOutGlobal.js
index bb9a3d376..ca123d0b3 100644
--- a/src/stores/invoiceOutGlobal.js
+++ b/src/stores/invoiceOutGlobal.js
@@ -19,6 +19,7 @@ export const useInvoiceOutGlobalStore = defineStore({
             maxShipped: null,
             clientId: null,
             printer: null,
+            invoiceType: null,
         },
         addresses: [],
         minInvoicingDate: null,
@@ -100,6 +101,7 @@ export const useInvoiceOutGlobalStore = defineStore({
                     maxShipped: new Date(formData.maxShipped),
                     clientId: formData.clientId ? formData.clientId : null,
                     companyFk: formData.companyFk,
+                    invoiceType: formData.invoiceType,
                 };
 
                 this.validateMakeInvoceParams(params, clientsToInvoice);
@@ -152,7 +154,13 @@ export const useInvoiceOutGlobalStore = defineStore({
                 );
                 throw new Error('Invoice date in the future');
             }
-
+            if (!params.invoiceType) {
+                notify(
+                    'invoiceOut.globalInvoices.errors.chooseValidinvoiceType',
+                    'negative'
+                );
+                throw new Error('Invalid Serial Type');
+            }
             if (!params.companyFk) {
                 notify('invoiceOut.globalInvoices.errors.chooseValidCompany', 'negative');
                 throw new Error('Invalid company');
@@ -180,6 +188,7 @@ export const useInvoiceOutGlobalStore = defineStore({
                     invoiceDate: new Date(formData.invoiceDate),
                     maxShipped: new Date(formData.maxShipped),
                     companyFk: formData.companyFk,
+                    invoiceType: formData.invoiceType,
                 };
 
                 this.status = 'invoicing';

From b35bf85f4a241d5287ed90c5f07f4d83ea34ea76 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 16 Aug 2024 10:50:45 +0200
Subject: [PATCH 08/47] fix(claim_summary): url links

---
 src/pages/Claim/Card/ClaimSummary.vue | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 4d817c3c2..9538e753f 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -36,8 +36,6 @@ const $props = defineProps({
 
 const entityId = computed(() => $props.id || route.params.id);
 const ClaimStates = ref([]);
-const claimUrl = ref();
-const salixUrl = ref();
 const claimDmsRef = ref();
 const claimDms = ref([]);
 const multimediaDialog = ref();
@@ -152,11 +150,6 @@ const developmentColumns = ref([
     },
 ]);
 
-onMounted(async () => {
-    salixUrl.value = await getUrl('');
-    claimUrl.value = salixUrl.value + `claim/${entityId.value}/`;
-});
-
 async function getClaimDms() {
     claimDmsFilter.value.where = { claimFk: entityId.value };
     await claimDmsRef.value.fetch();
@@ -177,10 +170,15 @@ function openDialog(dmsId) {
     multimediaSlide.value = dmsId;
     multimediaDialog.value = true;
 }
+
 async function changeState(value) {
     await axios.patch(`Claims/updateClaim/${entityId.value}`, { claimStateFk: value });
     router.go(route.fullPath);
 }
+
+function claimUrl(section) {
+    return '#/claim/' + entityId.value + '/' + section;
+}
 </script>
 
 <template>
@@ -234,7 +232,7 @@ async function changeState(value) {
         <template #body="{ entity: { claim, salesClaimed, developments } }">
             <QCard class="vn-one" v-if="$route.name != 'ClaimSummary'">
                 <VnTitle
-                    :url="`#/claim/${entityId}/basic-data`"
+                    :url="claimUrl('basic-data')"
                     :text="t('globals.pageTitles.basicData')"
                 />
                 <VnLv :label="t('claim.created')" :value="toDate(claim.created)" />
@@ -275,7 +273,7 @@ async function changeState(value) {
                 />
             </QCard>
             <QCard class="vn-two">
-                <VnTitle :url="`#/claim/${entityId}/notes`" :text="t('claim.notes')" />
+                <VnTitle :url="claimUrl('notes')" :text="t('claim.notes')" />
                 <ClaimNotes
                     :id="entityId"
                     :add-note="false"
@@ -284,7 +282,7 @@ async function changeState(value) {
                 />
             </QCard>
             <QCard class="vn-two" v-if="claimDms?.length">
-                <VnTitle :url="`#/claim/${entityId}/photos`" :text="t('claim.photos')" />
+                <VnTitle :url="claimUrl('photos')" :text="t('claim.photos')" />
                 <div class="container max-container-height" style="overflow: auto">
                     <div
                         class="multimedia-container"
@@ -326,7 +324,7 @@ async function changeState(value) {
                 </div>
             </QCard>
             <QCard class="vn-max" v-if="salesClaimed.length > 0">
-                <VnTitle :url="`#/claim/${entityId}/lines`" :text="t('claim.details')" />
+                <VnTitle :url="claimUrl('lines')" :text="t('claim.details')" />
                 <QTable
                     :columns="detailsColumns"
                     :rows="salesClaimed"
@@ -365,7 +363,7 @@ async function changeState(value) {
                 </QTable>
             </QCard>
             <QCard class="vn-max" v-if="developments.length > 0">
-                <VnTitle :url="claimUrl + 'development'" :text="t('claim.development')" />
+                <VnTitle :url="claimUrl('development')" :text="t('claim.development')" />
                 <QTable
                     :columns="developmentColumns"
                     :rows="developments"
@@ -390,7 +388,7 @@ async function changeState(value) {
                 </QTable>
             </QCard>
             <QCard class="vn-max">
-                <VnTitle :url="claimUrl + 'action'" :text="t('claim.actions')" />
+                <VnTitle :url="claimUrl('action')" :text="t('claim.actions')" />
                 <div id="slider-container" class="q-px-xl q-py-md">
                     <QSlider
                         v-model="claim.responsibility"

From 9086735aa1dc1588f4947524b6ba52fba00763e4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 20 Aug 2024 08:22:20 +0200
Subject: [PATCH 09/47] test: fix routeList

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

diff --git a/test/cypress/integration/route/routeList.spec.js b/test/cypress/integration/route/routeList.spec.js
index afc0fc395..c9d7147c2 100644
--- a/test/cypress/integration/route/routeList.spec.js
+++ b/test/cypress/integration/route/routeList.spec.js
@@ -10,12 +10,13 @@ describe('Route', () => {
 
     it('Route list create route', () => {
         cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('input[name="description"]').eq(1).type('routeTestOne{enter}');
+        cy.get('input[name="description"]').type('routeTestOne{enter}');
         cy.get('.q-notification__message').should('have.text', 'Data created');
         cy.url().should('include', '/summary');
     });
 
     it('Route list search and edit', () => {
+        cy.get('#searchbar input').type('{enter}');
         cy.get('input[name="description"]').type('routeTestOne{enter}');
         cy.get('.q-table tr')
             .its('length')

From 6e814ed4a865e8709d7637e68b132aba6be812e6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 20 Aug 2024 08:02:06 +0000
Subject: [PATCH 10/47] fix: remove full-height class

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

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 87ff44e63..74346638c 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -549,7 +549,7 @@ onMounted(async () => {
                         :key="index"
                         style="padding: 20px 16px !important"
                     >
-                        <div class="full-height full-width column items-center">
+                        <div class="full-width column items-center">
                             <WorkerTimeHourChip
                                 v-for="(hour, ind) in day.dayData?.hours"
                                 :key="ind"

From 0eb699bcbedd910007abee213e271962e77118d8 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 20 Aug 2024 10:10:11 +0200
Subject: [PATCH 11/47] feat: refs #7346 formdata uses serialType

---
 src/i18n/locale/en.yml                                 |  1 +
 src/i18n/locale/es.yml                                 |  1 +
 src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue |  4 ++--
 src/pages/InvoiceOut/InvoiceOutGlobalForm.vue          |  2 +-
 src/pages/Ticket/Card/TicketSaleMoreActions.vue        |  4 ++--
 src/stores/invoiceOutGlobal.js                         | 10 +++++-----
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 7d3682525..7f15ecf6a 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -689,6 +689,7 @@ invoiceOut:
             chooseValidClient: Choose a valid client
             chooseValidCompany: Choose a valid company
             chooseValidPrinter: Choose a valid printer
+            chooseValidSerialType: Choose a serial type
             fillDates: Invoice date and the max date should be filled
             invoiceDateLessThanMaxDate: Invoice date can not be less than max date
             invoiceWithFutureDate: Exists an invoice with a future date
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 8157f1803..fb892f015 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -695,6 +695,7 @@ invoiceOut:
             chooseValidClient: Selecciona un cliente válido
             chooseValidCompany: Selecciona una empresa válida
             chooseValidPrinter: Selecciona una impresora válida
+            chooseValidSerialType: Selecciona una tipo de serie válida
             fillDates: La fecha de la factura y la fecha máxima deben estar completas
             invoiceDateLessThanMaxDate: La fecha de la factura no puede ser menor que la fecha máxima
             invoiceWithFutureDate: Existe una factura con una fecha futura
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index e524faa24..4c02ccf84 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -222,7 +222,7 @@ const showTransferInvoiceForm = async () => {
         <QItemSection>{{ t('Generate PDF invoice') }}</QItemSection>
     </QItem>
     <QItem v-ripple clickable>
-        <QItemSection>{{ t('Refund...') }}</QItemSection>
+        <QItemSection>{{ t('Refund') }}</QItemSection>
         <QItemSection side>
             <QIcon name="keyboard_arrow_right" />
         </QItemSection>
@@ -250,7 +250,7 @@ es:
     Delete invoice: Eliminar factura
     Book invoice: Asentar factura
     Generate PDF invoice: Generar PDF factura
-    Refund...: Abono
+    Refund: Abono
     As PDF: como PDF
     As CSV: como CSV
     Send PDF: Enviar PDF
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 5fc519061..88d55b093 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -110,7 +110,7 @@ onMounted(async () => {
             />
             <VnSelect
                 :label="t('invoiceOutSerialType')"
-                v-model="formData.invoiceType"
+                v-model="formData.serialType"
                 :options="serialTypesOptions"
                 option-value="type"
                 option-label="type"
diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
index 9ec6b303a..f6803a9f1 100644
--- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@@ -244,7 +244,7 @@ const createRefund = async (withWarehouse) => {
             </QItem>
             <QItem clickable v-ripple>
                 <QItemSection>
-                    <QItemLabel>{{ t('Refund...') }}</QItemLabel>
+                    <QItemLabel>{{ t('Refund') }}</QItemLabel>
                 </QItemSection>
                 <QItemSection side>
                     <QIcon name="keyboard_arrow_right" />
@@ -279,7 +279,7 @@ es:
     Add claim: Crear reclamación
     Mark as reserved: Marcar como reservado
     Unmark as reserved: Desmarcar como reservado
-    Refund...: Abono...
+    Refund: Abono
     with warehouse: con almacén
     without warehouse: sin almacén
     Claim out of time: Reclamación fuera de plazo
diff --git a/src/stores/invoiceOutGlobal.js b/src/stores/invoiceOutGlobal.js
index ca123d0b3..669d65728 100644
--- a/src/stores/invoiceOutGlobal.js
+++ b/src/stores/invoiceOutGlobal.js
@@ -19,7 +19,7 @@ export const useInvoiceOutGlobalStore = defineStore({
             maxShipped: null,
             clientId: null,
             printer: null,
-            invoiceType: null,
+            serialType: null,
         },
         addresses: [],
         minInvoicingDate: null,
@@ -101,7 +101,7 @@ export const useInvoiceOutGlobalStore = defineStore({
                     maxShipped: new Date(formData.maxShipped),
                     clientId: formData.clientId ? formData.clientId : null,
                     companyFk: formData.companyFk,
-                    invoiceType: formData.invoiceType,
+                    serialType: formData.serialType,
                 };
 
                 this.validateMakeInvoceParams(params, clientsToInvoice);
@@ -154,9 +154,9 @@ export const useInvoiceOutGlobalStore = defineStore({
                 );
                 throw new Error('Invoice date in the future');
             }
-            if (!params.invoiceType) {
+            if (!params.serialType) {
                 notify(
-                    'invoiceOut.globalInvoices.errors.chooseValidinvoiceType',
+                    'invoiceOut.globalInvoices.errors.chooseValidSerialType',
                     'negative'
                 );
                 throw new Error('Invalid Serial Type');
@@ -188,7 +188,7 @@ export const useInvoiceOutGlobalStore = defineStore({
                     invoiceDate: new Date(formData.invoiceDate),
                     maxShipped: new Date(formData.maxShipped),
                     companyFk: formData.companyFk,
-                    invoiceType: formData.invoiceType,
+                    serialType: formData.serialType,
                 };
 
                 this.status = 'invoicing';

From 145c8b00d58a1019b3f694089621572b9c2b31c8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 20 Aug 2024 09:32:01 +0000
Subject: [PATCH 12/47] fix: limit and order TicketTracking

---
 src/pages/Ticket/Card/TicketTracking.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
index 2ddb278fa..53f59adf9 100644
--- a/src/pages/Ticket/Card/TicketTracking.vue
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -82,7 +82,9 @@ const openCreateModal = () => createTrackingDialogRef.value.show();
             data-key="TicketTracking"
             :filter="paginateFilter"
             url="TicketTrackings"
-            auto-load
+            auto-load            
+            order="created DESC"
+            :limit="0"
         >
             <template #body="{ rows }">
                 <QTable

From 472d477b158a90e3976b70c9d9aace7c1b430191 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 20 Aug 2024 09:32:50 +0000
Subject: [PATCH 13/47] fix: trim vnsearchbar input value

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

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 2053efd62..a34eba6af 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -123,7 +123,7 @@ async function search() {
         <QForm @submit="search" id="searchbarForm">
             <VnInput
                 id="searchbar"
-                v-model="searchText"
+                v-model.trim="searchText"
                 :placeholder="t(props.label)"
                 dense
                 standout

From 0277aa50ce38c21fda162688e79c69fc839d94e7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 20 Aug 2024 16:55:39 +0200
Subject: [PATCH 14/47] fix: set right time

---
 src/components/common/VnInputTime.vue | 41 +++++++--------------------
 1 file changed, 11 insertions(+), 30 deletions(-)

diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 7ee93de19..12c0817e2 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { watch, computed, ref, nextTick } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
 
@@ -14,6 +14,7 @@ const props = defineProps({
         default: false,
     },
 });
+const initialDate = ref(model.value);
 const { t } = useI18n();
 const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
 
@@ -49,8 +50,9 @@ const formattedTime = computed({
                     time = time.substring(0, 2) + ':' + time.substring(3, 5);
             }
             if (!props.timeOnly) {
-                const [hh, mm] = time.split(':');
-                const date = new Date(model.value ? model.value : null);
+                let [hh, mm] = time.split(':');
+
+                const date = new Date(model.value ? model.value : initialDate.value);
                 date.setHours(hh, mm, 0);
                 time = date?.toISOString();
             }
@@ -62,33 +64,7 @@ const formattedTime = computed({
 function dateToTime(newDate) {
     return date.formatDate(new Date(newDate), dateFormat);
 }
-
-watch(
-    () => model.value,
-    (val) => (formattedTime.value = val),
-    { immediate: true }
-);
-
-watch(
-    () => formattedTime.value,
-    async (val) => {
-        let position = 3;
-        const input = inputRef.value?.getNativeElement();
-        if (!val || !input) return;
-
-        let [hh, mm] = val.split(':');
-        hh = parseInt(hh);
-        if (hh >= 10 || mm != '00') return;
-
-        await nextTick();
-        await nextTick();
-        if (!hh) position = 0;
-        input.setSelectionRange(position, position);
-    },
-    { immediate: true }
-);
 </script>
-
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
@@ -102,7 +78,7 @@ watch(
             style="min-width: 100px"
             :rules="$attrs.required ? [requiredFieldRule] : null"
             @click="isPopupOpen = false"
-            @focus="inputRef.getNativeElement().setSelectionRange(0, 0)"
+            type="time"
         >
             <template #append>
                 <QIcon
@@ -149,6 +125,11 @@ watch(
     border-style: solid;
 }
 </style>
+<style lang="scss" scoped>
+:deep(input[type='time']::-webkit-calendar-picker-indicator) {
+    display: none;
+}
+</style>
 <i18n>
     es:
         Open time: Abrir tiempo

From d89d324a7e58baf94ce7381c147d7a99512cf2b1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 20 Aug 2024 16:59:16 +0200
Subject: [PATCH 15/47] chore: drop ref

---
 src/components/common/VnInputTime.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 12c0817e2..8167bac0b 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -21,7 +21,6 @@ const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
 const dateFormat = 'HH:mm';
 const isPopupOpen = ref();
 const hover = ref();
-const inputRef = ref();
 
 const styleAttrs = computed(() => {
     return props.isOutlined
@@ -68,7 +67,6 @@ function dateToTime(newDate) {
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
-            ref="inputRef"
             class="vn-input-time"
             mask="##:##"
             placeholder="--:--"

From 7f2407996fb7f986374d92e473ab6982b0c481ee Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 20 Aug 2024 17:02:38 +0200
Subject: [PATCH 16/47] chore: const var

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

diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 8167bac0b..0b4e72cb8 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -49,7 +49,7 @@ const formattedTime = computed({
                     time = time.substring(0, 2) + ':' + time.substring(3, 5);
             }
             if (!props.timeOnly) {
-                let [hh, mm] = time.split(':');
+                const [hh, mm] = time.split(':');
 
                 const date = new Date(model.value ? model.value : initialDate.value);
                 date.setHours(hh, mm, 0);

From 89eaf02800b9839c58565fa389e40588ee546b64 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 21 Aug 2024 11:45:26 +0200
Subject: [PATCH 17/47] feat: #7323 handle workerPhoto

---
 src/css/app.scss                            |  7 +++
 src/pages/Item/Card/ItemDescriptorImage.vue |  8 ---
 src/pages/Worker/Card/WorkerDescriptor.vue  | 70 +++++++++++++++------
 3 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index c233b14f0..525fb2a95 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -268,3 +268,10 @@ input::-webkit-inner-spin-button {
         max-width: 400px;
     }
 }
+.edit-photo-btn {
+    position: absolute;
+    right: 12px;
+    bottom: 12px;
+    z-index: 1;
+    cursor: pointer;
+}
diff --git a/src/pages/Item/Card/ItemDescriptorImage.vue b/src/pages/Item/Card/ItemDescriptorImage.vue
index d923dd28f..d83f534b8 100644
--- a/src/pages/Item/Card/ItemDescriptorImage.vue
+++ b/src/pages/Item/Card/ItemDescriptorImage.vue
@@ -138,14 +138,6 @@ en:
 </i18n>
 
 <style lang="scss" scoped>
-.edit-photo-btn {
-    position: absolute;
-    right: 12px;
-    bottom: 12px;
-    z-index: 1;
-    cursor: pointer;
-}
-
 .separation-borders {
     border-left: 1px solid $white;
     border-right: 1px solid $white;
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 8fbb23ef8..154db1258 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -10,6 +10,7 @@ import useCardDescription from 'src/composables/useCardDescription';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import VnImg from 'src/components/ui/VnImg.vue';
+import EditPictureForm from 'components/EditPictureForm.vue';
 
 const $props = defineProps({
     id: {
@@ -18,6 +19,7 @@ const $props = defineProps({
         default: null,
     },
 });
+const image = ref(null);
 
 const route = useRoute();
 const { t } = useI18n();
@@ -25,6 +27,10 @@ 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;
@@ -99,7 +105,9 @@ const handleExcluded = async () => {
 
     workerExcluded.value = !workerExcluded.value;
 };
-
+const handlePhotoUpdated = (evt = false) => {
+    image.value.reload(evt);
+};
 const refetch = async () => await cardDescriptorRef.value.getData();
 </script>
 <template>
@@ -144,27 +152,49 @@ const refetch = async () => await cardDescriptorRef.value.getData();
             </QItem>
         </template>
         <template #before>
-            <VnImg
-                :id="parseInt(entityId)"
-                collection="user"
-                resolution="520x520"
-                class="photo"
-            >
-                <template #error>
-                    <div
-                        class="absolute-full picture text-center q-pa-md flex flex-center"
-                    >
-                        <div>
-                            <div class="text-grey-5" style="opacity: 0.4; font-size: 5vh">
-                                <QIcon name="vn:claims" />
-                            </div>
-                            <div class="text-grey-5" style="opacity: 0.4">
-                                {{ t('worker.imageNotFound') }}
+            <div class="relative-position">
+                <VnImg
+                    ref="image"
+                    :id="parseInt(entityId)"
+                    collection="user"
+                    resolution="520x520"
+                    class="photo"
+                >
+                    <template #error>
+                        <div
+                            class="absolute-full picture text-center q-pa-md flex flex-center"
+                        >
+                            <div>
+                                <div
+                                    class="text-grey-5"
+                                    style="opacity: 0.4; font-size: 5vh"
+                                >
+                                    <QIcon name="vn:claims" />
+                                </div>
+                                <div class="text-grey-5" style="opacity: 0.4">
+                                    {{ t('worker.imageNotFound') }}
+                                </div>
                             </div>
                         </div>
-                    </div>
-                </template>
-            </VnImg>
+                    </template> </VnImg
+                ><QBtn
+                    color="primary"
+                    size="lg"
+                    round
+                    class="edit-photo-btn"
+                    @click="toggleEditPictureForm()"
+                >
+                    <QIcon name="edit" size="sm" />
+                    <QDialog ref="editPhotoFormDialog" v-model="showEditPhotoForm">
+                        <EditPictureForm
+                            collection="user"
+                            :id="entityId"
+                            @close-form="toggleEditPictureForm()"
+                            @on-photo-uploaded="handlePhotoUpdated"
+                        />
+                    </QDialog>
+                </QBtn>
+            </div>
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('worker.card.name')" :value="entity.user?.nickname" />

From bac0a3ba6ce2ecb80414fa99acabcd77d035b544 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 21 Aug 2024 11:29:12 +0000
Subject: [PATCH 18/47] fix: Show name in descriptor instead current value

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

diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index bc0c8c713..4571ee8ab 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -72,7 +72,7 @@ const hasAccount = ref(false);
             </VnImg>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('account.card.nickname')" :value="entity.nickname" />
+            <VnLv :label="t('account.card.nickname')" :value="entity.name" />
             <VnLv :label="t('account.card.role')" :value="entity.role.name" />
         </template>
         <template #actions="{ entity }">

From 292253fb4593b79574f5377648aaf1a369dce9c9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 21 Aug 2024 11:29:35 +0000
Subject: [PATCH 19/47] fix: Show name in summary instead current value

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

diff --git a/src/pages/Account/Card/AccountSummary.vue b/src/pages/Account/Card/AccountSummary.vue
index 1901f9cde..5a21e18a5 100644
--- a/src/pages/Account/Card/AccountSummary.vue
+++ b/src/pages/Account/Card/AccountSummary.vue
@@ -48,7 +48,7 @@ const filter = {
                         <QIcon name="open_in_new" />
                     </router-link>
                 </QCardSection>
-                <VnLv :label="t('account.card.nickname')" :value="account.nickname" />
+                <VnLv :label="t('account.card.nickname')" :value="account.name" />
                 <VnLv :label="t('account.card.role')" :value="account.role.name" />
             </QCard>
         </template>

From 635ac2716d083bb6478a8d63f31fd1ad443420bb Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 21 Aug 2024 13:33:50 +0200
Subject: [PATCH 20/47] fix: refs #7323  generate code & minor changes

---
 src/pages/Worker/Card/WorkerSummary.vue | 33 +++++++++----------
 src/pages/Worker/WorkerCreate.vue       | 40 ++++++++++++++++-------
 src/pages/Worker/WorkerList.vue         | 42 +++++++++++++++++++++++--
 3 files changed, 81 insertions(+), 34 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 5c6261b94..33d949dbb 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -93,7 +93,6 @@ const filter = {
                         />
                     </template>
                 </VnLv>
-                <VnLv :label="t('worker.list.email')" :value="worker.user.email" copy />
                 <VnLv :label="t('worker.summary.boss')" link>
                     <template #value>
                         <VnUserLink
@@ -139,29 +138,25 @@ const filter = {
                 />
                 <VnLv :label="t('worker.summary.fi')" :value="worker.fi" />
                 <VnLv :label="t('worker.summary.birth')" :value="toDate(worker.birth)" />
-                <VnRow class="q-mt-sm" wrap>
-                    <VnLv
-                        :label="t('worker.summary.isFreelance')"
-                        :value="worker.isFreelance"
-                    />
-                    <VnLv
-                        :label="t('worker.summary.isSsDiscounted')"
-                        :value="worker.isSsDiscounted"
-                    />
-                    <VnLv
-                        :label="t('worker.summary.hasMachineryAuthorized')"
-                        :value="worker.hasMachineryAuthorized"
-                    />
-                    <VnLv
-                        :label="t('worker.summary.isDisable')"
-                        :value="worker.isDisable"
-                    />
-                </VnRow>
+                <VnLv
+                    :label="t('worker.summary.isFreelance')"
+                    :value="worker.isFreelance"
+                />
+                <VnLv
+                    :label="t('worker.summary.isSsDiscounted')"
+                    :value="worker.isSsDiscounted"
+                />
+                <VnLv
+                    :label="t('worker.summary.hasMachineryAuthorized')"
+                    :value="worker.hasMachineryAuthorized"
+                />
+                <VnLv :label="t('worker.summary.isDisable')" :value="worker.isDisable" />
             </QCard>
             <QCard class="vn-one">
                 <VnTitle :text="t('worker.summary.userData')" />
                 <VnLv :label="t('worker.summary.userId')" :value="worker.user.id" />
                 <VnLv :label="t('worker.card.name')" :value="worker.user.nickname" />
+                <VnLv :label="t('worker.list.email')" :value="worker.user.email" copy />
                 <VnLv :label="t('worker.summary.role')">
                     <template #value>
                         <span class="link">
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index a1ded2bfd..23f92bef1 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -2,7 +2,6 @@
 import { onBeforeMount, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
-import { useUserConfig } from 'src/composables/useUserConfig';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
@@ -14,15 +13,26 @@ import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
 import VnRadio from 'src/components/common/VnRadio.vue';
+import { useState } from 'src/composables/useState';
 
 const { t } = useI18n();
+const user = useState().getUser();
 
 const companiesOptions = ref([]);
 const workersOptions = ref([]);
 const payMethodsOptions = ref([]);
 const bankEntitiesOptions = ref([]);
-const formData = ref({ isFreelance: false });
-const defaultPayMethod = ref(0);
+const formData = ref({ companyFk: user.value.companyFk, isFreelance: false });
+const defaultPayMethod = ref();
+
+onBeforeMount(async () => {
+    defaultPayMethod.value = (
+        await axios.get('WorkerConfigs/findOne', {
+            params: { field: ['payMethodFk'] },
+        })
+    ).data.payMethodFk;
+    formData.value.payMethodFk = defaultPayMethod.value;
+});
 
 function handleLocation(data, location) {
     const { town, code, provinceFk, countryFk } = location ?? {};
@@ -32,16 +42,20 @@ function handleLocation(data, location) {
     data.countryFk = countryFk;
 }
 
-onBeforeMount(async () => {
-    const userInfo = await useUserConfig().fetch();
-    formData.value.companyFk = userInfo.companyFk;
+function generateCodeUser(worker) {
+    if (!worker.firstName || !worker.lastNames) return;
 
-    const { data } = await axios.get('WorkerConfigs/findOne', {
-        params: { field: ['payMethodFk'] },
-    });
-    defaultPayMethod.value = data.payMethodFk;
-    formData.value.payMethodFk = defaultPayMethod.value;
-});
+    const totalName = worker.firstName.concat(' ' + worker.lastNames).toLowerCase();
+    const totalNameArray = totalName.split(' ');
+    let newCode = '';
+
+    for (let part of totalNameArray) newCode += part.charAt(0);
+
+    worker.code = newCode.toUpperCase().slice(0, 3);
+    worker.name = totalNameArray[0] + newCode.slice(1);
+
+    if (!worker.companyFk) worker.companyFk = user.companyFk;
+}
 </script>
 <template>
     <FetchData
@@ -93,11 +107,13 @@ onBeforeMount(async () => {
                         v-model="data.firstName"
                         :label="t('worker.create.name')"
                         :rules="validate('Worker.firstName')"
+                        @update:model-value="generateCodeUser(data)"
                     />
                     <VnInput
                         v-model="data.lastNames"
                         :label="t('worker.create.lastName')"
                         :rules="validate('Worker.lastNames')"
+                        @update:model-value="generateCodeUser(data)"
                     />
                     <VnInput
                         v-model="data.code"
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 7b3237f70..a10bdd040 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { onBeforeMount, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
@@ -16,6 +16,8 @@ import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
 import FetchData from 'src/components/FetchData.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import WorkerFilter from './WorkerFilter.vue';
+import { useState } from 'src/composables/useState';
+import axios from 'axios';
 
 const { t } = useI18n();
 const tableRef = ref();
@@ -26,6 +28,8 @@ const payMethodsOptions = ref([]);
 const bankEntitiesOptions = ref([]);
 const postcodesOptions = ref([]);
 
+const user = useState().getUser();
+const defaultPayMethod = ref();
 const columns = computed(() => [
     {
         align: 'left',
@@ -82,6 +86,14 @@ const columns = computed(() => [
     },
 ]);
 
+onBeforeMount(async () => {
+    defaultPayMethod.value = (
+        await axios.get('WorkerConfigs/findOne', {
+            params: { field: ['payMethodFk'] },
+        })
+    ).data?.payMethodFk;
+});
+
 function handleLocation(data, location) {
     const { town, code, provinceFk, countryFk } = location ?? {};
     data.postcode = code;
@@ -98,6 +110,21 @@ function uppercaseStreetModel(data) {
         },
     };
 }
+
+function generateCodeUser(worker) {
+    if (!worker.firstName || !worker.lastNames) return;
+
+    const totalName = worker.firstName.concat(' ' + worker.lastNames).toLowerCase();
+    const totalNameArray = totalName.split(' ');
+    let newCode = '';
+
+    for (let part of totalNameArray) newCode += part.charAt(0);
+
+    worker.code = newCode.toUpperCase().slice(0, 3);
+    worker.name = totalNameArray[0] + newCode.slice(1);
+
+    if (!worker.companyFk) worker.companyFk = user.companyFk;
+}
 </script>
 <template>
     <VnSearchbar
@@ -131,6 +158,7 @@ function uppercaseStreetModel(data) {
         </template>
     </RightMenu>
     <VnTable
+        v-if="defaultPayMethod"
         ref="tableRef"
         data-key="Worker"
         url="Workers/filter"
@@ -139,6 +167,8 @@ function uppercaseStreetModel(data) {
             title: t('Create worker'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
             formInitialData: {
+                payMethodFk: defaultPayMethod,
+                companyFk: user.companyFk,
                 isFreelance: false,
             },
         }"
@@ -149,7 +179,7 @@ function uppercaseStreetModel(data) {
         auto-load
     >
         <template #more-create-dialog="{ data }">
-            <div class="q-pa-lg full-width" style="max-width: 1200px">
+            <div class="q-pa-lg full-width">
                 <VnRadio
                     v-model="data.isFreelance"
                     :val="false"
@@ -163,10 +193,16 @@ function uppercaseStreetModel(data) {
                     @update:model-value="delete data.payMethodFk"
                 />
                 <VnRow>
-                    <VnInput v-model="data.firstName" :label="t('worker.create.name')" />
+                    <VnInput
+                        next
+                        v-model="data.firstName"
+                        :label="t('worker.create.name')"
+                        @update:model-value="generateCodeUser(data)"
+                    />
                     <VnInput
                         v-model="data.lastNames"
                         :label="t('worker.create.lastName')"
+                        @update:model-value="generateCodeUser(data)"
                     />
                     <VnInput v-model="data.code" :label="t('worker.create.code')" />
                 </VnRow>

From 3d5807463b55065b053d6235452927eb1fe3263e Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 21 Aug 2024 13:46:19 +0200
Subject: [PATCH 21/47] feat: refs #7346 refactor

---
 src/pages/InvoiceOut/InvoiceOutGlobalForm.vue | 38 ++++++++++---------
 src/pages/Item/Card/ItemBasicData.vue         |  1 -
 2 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 88d55b093..3dc34dc15 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -24,15 +24,28 @@ const companiesOptions = ref([]);
 const printersOptions = ref([]);
 const clientsOptions = ref([]);
 const serialTypesOptions = ref([]);
+
+const handleInvoiceOutSerialsFetch = (data) => {
+    const uniqueTypes = new Set();
+    serialTypesOptions.value = data.filter((item) => {
+        if (item.type === null || uniqueTypes.has(item.type)) {
+            return false;
+        }
+        uniqueTypes.add(item.type);
+        return true;
+    });
+};
+
 const formData = ref({});
 
 const optionsInitialData = computed(() => {
-    return (
-        companiesOptions.value.length > 0 &&
-        printersOptions.value.length > 0 &&
-        clientsOptions.value.length > 0 &&
-        serialTypesOptions.value.length > 0
-    );
+    const optionsArrays = [
+        companiesOptions.value,
+        printersOptions.value,
+        clientsOptions.value,
+        serialTypesOptions.value,
+    ];
+    return optionsArrays.every((arr) => arr.length > 0);
 });
 
 const getStatus = computed({
@@ -60,18 +73,7 @@ onMounted(async () => {
     <FetchData url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
     <FetchData
         url="invoiceOutSerials"
-        @on-fetch="
-            (data) => {
-                const uniqueTypes = new Set();
-                serialTypesOptions = data.filter((item) => {
-                    if (item.type === null || uniqueTypes.has(item.type)) {
-                        return false;
-                    }
-                    uniqueTypes.add(item.type);
-                    return true;
-                });
-            }
-        "
+        @on-fetch="handleInvoiceOutSerialsFetch"
         auto-load
     />
     <QForm
diff --git a/src/pages/Item/Card/ItemBasicData.vue b/src/pages/Item/Card/ItemBasicData.vue
index 89c883295..ae9e45983 100644
--- a/src/pages/Item/Card/ItemBasicData.vue
+++ b/src/pages/Item/Card/ItemBasicData.vue
@@ -16,7 +16,6 @@ const route = useRoute();
 const { t } = useI18n();
 
 const itemTypesOptions = ref([]);
-const itemsWithNameOptions = ref([]);
 const intrastatsOptions = ref([]);
 const expensesOptions = ref([]);
 

From b71d24cf3d47edcda32e6a7734112796b5510cde Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 21 Aug 2024 14:13:36 +0200
Subject: [PATCH 22/47] feat: refs #7346 sonarLint warnings

---
 src/css/app.scss                          |  4 ----
 src/pages/InvoiceOut/InvoiceOutGlobal.vue | 12 +++++++-----
 src/stores/invoiceOutGlobal.js            |  9 ++-------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index c233b14f0..b2976b86a 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -103,10 +103,6 @@ select:-webkit-autofill {
     border-radius: 8px;
 }
 
-.card-width {
-    width: 770px;
-}
-
 .vn-card-list {
     width: 100%;
     max-width: 60em;
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobal.vue b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
index eecc61bc2..5f2eb3c02 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
@@ -94,11 +94,13 @@ const selectCustomerId = (id) => {
 };
 
 const statusText = computed(() => {
-    return status.value === 'invoicing'
-        ? `${t(`status.${status.value}`)} ${
-              addresses.value[getAddressNumber.value]?.clientId
-          }`
-        : t(`status.${status.value}`);
+    const baseStatus = t(`status.${status.value}`);
+    const clientId =
+        status.value === 'invoicing'
+            ? addresses.value[getAddressNumber.value]?.clientId || ''
+            : '';
+
+    return clientId ? `${baseStatus} ${clientId}`.trim() : baseStatus;
 });
 
 onMounted(() => (stateStore.rightDrawer = true));
diff --git a/src/stores/invoiceOutGlobal.js b/src/stores/invoiceOutGlobal.js
index 669d65728..42acac013 100644
--- a/src/stores/invoiceOutGlobal.js
+++ b/src/stores/invoiceOutGlobal.js
@@ -200,12 +200,7 @@ export const useInvoiceOutGlobalStore = defineStore({
                 this.addressIndex++;
                 this.isInvoicing = false;
             } catch (err) {
-                if (
-                    err &&
-                    err.response &&
-                    err.response.status >= 400 &&
-                    err.response.status < 500
-                ) {
+                if (err?.response?.status >= 400 && err?.response?.status < 500) {
                     this.invoiceClientError(address, err.response?.data?.error?.message);
                     return;
                 } else {
@@ -252,7 +247,7 @@ export const useInvoiceOutGlobalStore = defineStore({
                     params,
                 });
 
-                if (data.data && data.data.error) throw new Error();
+                if (data?.data?.error) throw new Error();
 
                 const status = exportFile('negativeBases.csv', data, {
                     encoding: 'windows-1252',

From 517ec87e1619f035bb7394c264c7950b557ddbb7 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 21 Aug 2024 14:18:01 +0200
Subject: [PATCH 23/47] fix: refs #7323 use timeStamp

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

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 74346638c..83d41c2af 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -34,6 +34,10 @@ const weekdayStore = useWeekdayStore();
 const weekDays = ref([]);
 const { openConfirmationModal } = useVnConfirm();
 const { getWeekOfYear } = date;
+const defaultDate = computed(() => {
+    const timestamp = route.query.timestamp;
+    return timestamp ? new Date(timestamp * 1000) : Date.vnNew();
+});
 
 const workerTimeFormDialogRef = ref(null);
 const workerTimeReasonFormDialogRef = ref(null);
@@ -56,7 +60,7 @@ const workerTimeFormProps = reactive({
 // Array utilizado por QCalendar para seleccionar un rango de fechas
 const selectedCalendarDates = ref([]);
 // Date formateada para bindear al componente QDate
-const selectedDateFormatted = ref(toDateString(Date.vnNew()));
+const selectedDateFormatted = ref(toDateString(defaultDate.value));
 
 const arrayData = useArrayData('workerData');
 
@@ -423,7 +427,7 @@ onBeforeMount(() => {
 });
 
 onMounted(async () => {
-    await setDate(Date.vnNew());
+    await setDate(defaultDate.value);
     await getMailStates(selectedDate.value);
     stateStore.rightDrawer = true;
 });

From 6197d283e4fa2d104644848e3fa98ae7d60cf496 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 21 Aug 2024 10:51:38 -0300
Subject: [PATCH 24/47] Create ticket future filter

---
 src/components/ui/VnFilterPanel.vue     |   2 +-
 src/pages/Ticket/TicketFuture.vue       |  19 +-
 src/pages/Ticket/TicketFutureFilter.vue | 244 ++++++++++++++++++++++++
 src/pages/Ticket/locale/en.yml          |   5 +
 src/pages/Ticket/locale/es.yml          |   5 +
 5 files changed, 269 insertions(+), 6 deletions(-)
 create mode 100644 src/pages/Ticket/TicketFutureFilter.vue

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 9059605ca..3598f96a5 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -202,7 +202,7 @@ function formatValue(value) {
 
 function sanitizer(params) {
     for (const [key, value] of Object.entries(params)) {
-        if (typeof value == 'object') {
+        if (value && typeof value === 'object') {
             const param = Object.values(value)[0];
             if (typeof param == 'string') params[key] = param.replaceAll('%', '');
         }
diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index 2fec6dc18..4ec430e2e 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -8,6 +8,8 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import TicketFutureFilter from './TicketFutureFilter.vue';
 
 import { dashIfEmpty, toCurrency } from 'src/filters';
 import { useVnConfirm } from 'composables/useVnConfirm';
@@ -37,9 +39,9 @@ const exprBuilder = (param, value) => {
             return { liters: value };
         case 'lines':
             return { lines: value };
-        case 'ipt':
+        case 'iptColFilter':
             return { ipt: { like: `%${value}%` } };
-        case 'futureIpt':
+        case 'futureIptColFilter':
             return { futureIpt: { like: `%${value}%` } };
         case 'totalWithVat':
             return { totalWithVat: value };
@@ -83,6 +85,8 @@ const getInputEvents = (col) => {
           };
 };
 
+const tickets = computed(() => store.data);
+
 const ticketColumns = computed(() => [
     {
         label: t('futureTickets.problems'),
@@ -121,7 +125,7 @@ const ticketColumns = computed(() => [
         sortable: true,
         columnFilter: {
             component: VnSelect,
-            filterParamKey: 'ipt',
+            filterParamKey: 'iptColFilter',
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -214,7 +218,7 @@ const ticketColumns = computed(() => [
         sortable: true,
         columnFilter: {
             component: VnSelect,
-            filterParamKey: 'futureIpt',
+            filterParamKey: 'futureIptColFilter',
             type: 'select',
             filterValue: null,
             event: getInputEvents,
@@ -305,9 +309,14 @@ onMounted(async () => {
             </QBtn>
         </template>
     </VnSubToolbar>
+    <RightMenu>
+        <template #right-panel>
+            <TicketFutureFilter data-key="FutureTickets" />
+        </template>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <QTable
-            :rows="store.data"
+            :rows="tickets"
             :columns="ticketColumns"
             row-key="id"
             selection="multiple"
diff --git a/src/pages/Ticket/TicketFutureFilter.vue b/src/pages/Ticket/TicketFutureFilter.vue
new file mode 100644
index 000000000..36a9d154f
--- /dev/null
+++ b/src/pages/Ticket/TicketFutureFilter.vue
@@ -0,0 +1,244 @@
+<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 VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import axios from 'axios';
+import { onMounted } from 'vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const warehousesOptions = ref([]);
+const itemPackingTypes = ref([]);
+const stateOptions = ref([]);
+
+const getItemPackingTypes = async () => {
+    try {
+        const filter = {
+            where: { isActive: true },
+        };
+        const { data } = await axios.get('ItemPackingTypes', {
+            params: { filter: JSON.stringify(filter) },
+        });
+        itemPackingTypes.value = data.map((ipt) => ({
+            description: t(ipt.description),
+            code: ipt.code,
+        }));
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const getGroupedStates = async () => {
+    try {
+        const { data } = await axios.get('AlertLevels');
+        stateOptions.value = data.map((state) => ({
+            id: state.id,
+            name: t(`futureTickets.${state.code}`),
+            code: state.code,
+        }));
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+onMounted(async () => {
+    getItemPackingTypes();
+    getGroupedStates();
+});
+</script>
+
+<template>
+    <FetchData
+        url="Warehouses"
+        @on-fetch="(data) => (warehousesOptions = data)"
+        auto-load
+    />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :hidden-tags="['search']"
+        :unremovable-params="['warehouseFk', 'originDated', 'futureDated']"
+    >
+        <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 }">
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.originDated"
+                        :label="t('params.originDated')"
+                        is-outlined
+                        @update:model-value="searchFn()"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.futureDated"
+                        :label="t('params.futureDated')"
+                        is-outlined
+                        @update:model-value="searchFn()"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.litersMax')"
+                        v-model="params.litersMax"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.linesMax')"
+                        v-model="params.linesMax"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        :label="t('params.ipt')"
+                        v-model="params.ipt"
+                        :options="itemPackingTypes"
+                        option-value="code"
+                        option-label="description"
+                        :info="t('iptInfo')"
+                        @update:model-value="searchFn()"
+                        dense
+                        outlined
+                        rounded
+                    >
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        :label="t('params.futureIpt')"
+                        v-model="params.futureIpt"
+                        :options="itemPackingTypes"
+                        option-value="code"
+                        option-label="description"
+                        :info="t('iptInfo')"
+                        @update:model-value="searchFn()"
+                        dense
+                        outlined
+                        rounded
+                    >
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        :label="t('params.state')"
+                        v-model="params.state"
+                        :options="stateOptions"
+                        option-value="code"
+                        option-label="name"
+                        @update:model-value="searchFn()"
+                        dense
+                        outlined
+                        rounded
+                    >
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        :label="t('params.futureState')"
+                        v-model="params.futureState"
+                        :options="stateOptions"
+                        option-value="code"
+                        option-label="name"
+                        @update:model-value="searchFn()"
+                        dense
+                        outlined
+                        rounded
+                    >
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.problems')"
+                        v-model="params.problems"
+                        :toggle-indeterminate="false"
+                        @update:model-value="searchFn()"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        :label="t('params.warehouseFk')"
+                        v-model="params.warehouseFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        @update:model-value="searchFn()"
+                        dense
+                        outlined
+                        rounded
+                    >
+                    </VnSelect>
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    iptInfo: IPT
+    params:
+        originDated: Origin date
+        futureDated: Destination date
+        futureIpt: Destination IPT
+        ipt: Origin IPT
+        warehouseFk: Warehouse
+        litersMax: Max liters
+        linesMax: Max lines
+        state: Origin grouped state
+        futureState: Destination grouped state
+        problems: With problems
+es:
+    Horizontal: Horizontal
+    Vertical: Vertical
+    iptInfo: Encajado
+    params:
+        originDated: Fecha origen
+        futureDated: Fecha destino
+        futureIpt: IPT destino
+        ipt: IPT Origen
+        warehouseFk: Almacén
+        litersMax: Litros máx.
+        linesMax: Líneas máx.
+        state: Estado agrupado origen
+        futureState: Estado agrupado destino
+        problems: Con problemas
+</i18n>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 10a8e1fa4..305228669 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -93,6 +93,11 @@ futureTickets:
     moveTicketSuccess: Tickets moved successfully!
     searchInfo: Search future tickets by date
     futureTicket: Future tickets
+    FREE: Free
+    ON_PREVIOUS: ON_PREVIOUS
+    ON_PREPARATION: On preparation
+    PACKED: Packed
+    DELIVERED: Delivered
 expedition:
     id: Expedition
     item: Item
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index a80692bfe..20b4edf16 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -140,6 +140,11 @@ futureTickets:
     moveTicketSuccess: Tickets movidos correctamente
     searchInfo: Buscar tickets por fecha
     futureTicket: Tickets a futuro
+    FREE: Libre
+    ON_PREVIOUS: ON_PREVIOUS
+    ON_PREPARATION: En preparación
+    PACKED: Encajado
+    DELIVERED: Servido
 ticketSale:
     id: Id
     visible: Visible

From 9c99266da6b1087c3e6994a7873b8e1a60b7a961 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 21 Aug 2024 16:02:16 +0200
Subject: [PATCH 25/47] fix: refs #7323 replace day

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

diff --git a/src/pages/Worker/Card/WorkerCalendarItem.vue b/src/pages/Worker/Card/WorkerCalendarItem.vue
index 91e118708..05a013d6b 100644
--- a/src/pages/Worker/Card/WorkerCalendarItem.vue
+++ b/src/pages/Worker/Card/WorkerCalendarItem.vue
@@ -152,7 +152,7 @@ const getEventAttrs = (timestamp) => {
 
     if (isFestive) {
         attrs.class = '--festive';
-        attrs.label = event.absenceId ?? timestamp.day;
+        attrs.label = timestamp.day;
     } else attrs.class = `--${type}`;
 
     return attrs;

From fd09a6bfbe482c0c3a6b6263de8c28b73d880275 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 21 Aug 2024 16:36:45 +0200
Subject: [PATCH 26/47] fix: refs #7323 test

---
 test/cypress/integration/worker/workerCreate.spec.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/test/cypress/integration/worker/workerCreate.spec.js b/test/cypress/integration/worker/workerCreate.spec.js
index c1832ad67..50afe1892 100644
--- a/test/cypress/integration/worker/workerCreate.spec.js
+++ b/test/cypress/integration/worker/workerCreate.spec.js
@@ -2,6 +2,9 @@ describe('WorkerCreate', () => {
     const externalRadio = '.q-radio:nth-child(2)';
     const notification = '.q-notification__message';
     const developerBossId = 120;
+    const payMethodCross =
+        '.grid-create .full-width > :nth-child(9) .q-select .q-field__append:not(.q-anchor--skip)';
+    const saveBtn = '.q-mt-lg > .q-btn--standard';
 
     const internal = {
         Fi: { val: '78457139E' },
@@ -36,7 +39,8 @@ describe('WorkerCreate', () => {
 
     it('should throw an error if a pay method has not been selected', () => {
         cy.fillInForm(internal);
-        cy.get('.q-mt-lg > .q-btn--standard').click();
+        cy.get(payMethodCross).click();
+        cy.get(saveBtn).click();
         cy.get(notification).should('contains.text', 'Payment method is required');
     });
 
@@ -45,14 +49,14 @@ describe('WorkerCreate', () => {
             ...internal,
             'Pay method': { val: 'PayMethod one', type: 'select' },
         });
-        cy.get('.q-mt-lg > .q-btn--standard').click();
+        cy.get(saveBtn).click();
         cy.get(notification).should('contains.text', 'Data created');
     });
 
     it('should create an external', () => {
         cy.get(externalRadio).click();
         cy.fillInForm(external);
-        cy.get('.q-mt-lg > .q-btn--standard').click();
+        cy.get(saveBtn).click();
         cy.get(notification).should('contains.text', 'Data created');
     });
 });

From 48277a5f20cac54f325564eb476bc05712b7f310 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 22 Aug 2024 12:14:16 +0200
Subject: [PATCH 27/47] fix: refs #7323 vertical align

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

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 83d41c2af..f560fcfed 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -551,7 +551,10 @@ onMounted(async () => {
                     <QTd
                         v-for="(day, index) in props.cols"
                         :key="index"
-                        style="padding: 20px 16px !important"
+                        :style="{
+                            padding: '20px 16px !important',
+                            'vertical-align': 'baseline',
+                        }"
                     >
                         <div class="full-width column items-center">
                             <WorkerTimeHourChip

From 54eb567e39e43fc6c87f8de52c9359a487b59a5c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 22 Aug 2024 22:13:50 +0200
Subject: [PATCH 28/47] perf: date fields

---
 src/pages/Ticket/TicketAdvance.vue       | 2 +-
 src/pages/Ticket/TicketAdvanceFilter.vue | 4 +---
 src/pages/Ticket/TicketFuture.vue        | 4 ++--
 src/pages/Ticket/TicketFutureFilter.vue  | 4 +---
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index bf4000fdf..45bd8fd39 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -448,7 +448,7 @@ const handleCloseProgressDialog = () => {
 const handleCancelProgress = () => (cancelProgress.value = true);
 
 onMounted(async () => {
-    let today = Date.vnNew();
+    let today = Date.vnNew().toISOString();
     const tomorrow = new Date(today);
     tomorrow.setDate(tomorrow.getDate() + 1);
     userParams.dateFuture = tomorrow;
diff --git a/src/pages/Ticket/TicketAdvanceFilter.vue b/src/pages/Ticket/TicketAdvanceFilter.vue
index c4548763a..ed61d9447 100644
--- a/src/pages/Ticket/TicketAdvanceFilter.vue
+++ b/src/pages/Ticket/TicketAdvanceFilter.vue
@@ -55,7 +55,7 @@ onMounted(async () => await getItemPackingTypes());
         :data-key="props.dataKey"
         :search-button="true"
         :hidden-tags="['search']"
-        :unremovable-params="['warehouseFk', 'dateFuture', 'dateToAdvance']"
+        :un-removable-params="['warehouseFk', 'dateFuture', 'dateToAdvance']"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -70,7 +70,6 @@ onMounted(async () => await getItemPackingTypes());
                         v-model="params.dateFuture"
                         :label="t('params.dateFuture')"
                         is-outlined
-                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
             </QItem>
@@ -80,7 +79,6 @@ onMounted(async () => await getItemPackingTypes());
                         v-model="params.dateToAdvance"
                         :label="t('params.dateToAdvance')"
                         is-outlined
-                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index 4ec430e2e..14a4a5ac8 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -49,8 +49,8 @@ const exprBuilder = (param, value) => {
 };
 
 const userParams = reactive({
-    futureDated: Date.vnNew(),
-    originDated: Date.vnNew(),
+    futureDated: Date.vnNew().toISOString(),
+    originDated: Date.vnNew().toISOString(),
     warehouseFk: user.value.warehouseFk,
 });
 
diff --git a/src/pages/Ticket/TicketFutureFilter.vue b/src/pages/Ticket/TicketFutureFilter.vue
index 36a9d154f..c5e647d64 100644
--- a/src/pages/Ticket/TicketFutureFilter.vue
+++ b/src/pages/Ticket/TicketFutureFilter.vue
@@ -68,7 +68,7 @@ onMounted(async () => {
     <VnFilterPanel
         :data-key="props.dataKey"
         :hidden-tags="['search']"
-        :unremovable-params="['warehouseFk', 'originDated', 'futureDated']"
+        :un-removable-params="['warehouseFk', 'originDated', 'futureDated']"
     >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -83,7 +83,6 @@ onMounted(async () => {
                         v-model="params.originDated"
                         :label="t('params.originDated')"
                         is-outlined
-                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
             </QItem>
@@ -93,7 +92,6 @@ onMounted(async () => {
                         v-model="params.futureDated"
                         :label="t('params.futureDated')"
                         is-outlined
-                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
             </QItem>

From 1984e1d0d81cc21578b86cd279fe0fab7f9fabe3 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Fri, 23 Aug 2024 10:25:05 +0200
Subject: [PATCH 29/47] feat: refs #7710 uses cloneAll

---
 src/pages/Ticket/Card/TicketExpedition.vue    |  1 -
 .../Ticket/Card/TicketSaleMoreActions.vue     | 22 +++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index a7eb9e27e..f344e4276 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -268,7 +268,6 @@ onMounted(async () => {
     stateStore.rightDrawer = true;
     const filteredColumns = columns.value.filter((col) => col.name !== 'history');
     allColumnNames.value = filteredColumns.map((col) => col.name);
-    // await expeditionsArrayData.fetch({ append: false });
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
index 9ec6b303a..ba827d062 100644
--- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@@ -153,14 +153,22 @@ const setReserved = async (reserved) => {
 };
 
 const createRefund = async (withWarehouse) => {
-    if (!props.sales) return;
+    if (!props.ticket) return;
 
-    const salesIds = props.sales.map((sale) => sale.id);
-    const params = { salesIds: salesIds, withWarehouse: withWarehouse, negative: true };
-    const { data } = await axios.post('Sales/clone', params);
-    const [refundTicket] = data;
-    notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
-    router.push({ name: 'TicketSale', params: { id: refundTicket.id } });
+    const params = {
+        ticketsIds: [props.ticket.id],
+        withWarehouse: withWarehouse,
+        negative: true,
+    };
+
+    try {
+        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 } });
+    } catch (error) {
+        console.error(error);
+    }
 };
 </script>
 

From d0ccce26567cee02c49466d62a78312d45529ee3 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Fri, 23 Aug 2024 10:32:36 +0200
Subject: [PATCH 30/47] feat: refs #7346 elimino ===

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

diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 3dc34dc15..362ede4be 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -26,14 +26,9 @@ const clientsOptions = ref([]);
 const serialTypesOptions = ref([]);
 
 const handleInvoiceOutSerialsFetch = (data) => {
-    const uniqueTypes = new Set();
-    serialTypesOptions.value = data.filter((item) => {
-        if (item.type === null || uniqueTypes.has(item.type)) {
-            return false;
-        }
-        uniqueTypes.add(item.type);
-        return true;
-    });
+    serialTypesOptions.value = Array.from(
+        new Set(data.map((item) => item.type).filter((type) => type))
+    );
 };
 
 const formData = ref({});

From efc7df5a60cd4b5ea0c0fa00a8a8b55c20840bca Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Fri, 23 Aug 2024 12:19:54 +0200
Subject: [PATCH 31/47] delivery traducido a Reparto

---
 src/pages/Claim/locale/es.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Claim/locale/es.yml b/src/pages/Claim/locale/es.yml
index 90bef8e66..052416aa7 100644
--- a/src/pages/Claim/locale/es.yml
+++ b/src/pages/Claim/locale/es.yml
@@ -42,7 +42,7 @@ claim:
     pickup: Recoger
     null: No
     agency: Agencia
-    delivery: Entrega
+    delivery: Reparto
     fileDescription: 'ID de reclamación {claimId} del cliente {clientName} con ID {clientId}'
     noData: 'No hay imágenes/videos, haz clic aquí o arrastra y suelta el archivo'
     dragDrop: Arrastra y suelta aquí

From fb0ed9c4ce8b5ab956d1a74de4031c941a40f2cc Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Fri, 23 Aug 2024 13:52:46 +0200
Subject: [PATCH 32/47] para que no de el fallo de muchos registros

---
 src/pages/InvoiceOut/InvoiceOutGlobalForm.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 362ede4be..2070ef09c 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -22,7 +22,6 @@ const { makeInvoice, setStatusValue } = invoiceOutGlobalStore;
 const clientsToInvoice = ref('all');
 const companiesOptions = ref([]);
 const printersOptions = ref([]);
-const clientsOptions = ref([]);
 const serialTypesOptions = ref([]);
 
 const handleInvoiceOutSerialsFetch = (data) => {
@@ -37,7 +36,6 @@ const optionsInitialData = computed(() => {
     const optionsArrays = [
         companiesOptions.value,
         printersOptions.value,
-        clientsOptions.value,
         serialTypesOptions.value,
     ];
     return optionsArrays.every((arr) => arr.length > 0);
@@ -65,7 +63,6 @@ onMounted(async () => {
         auto-load
     />
     <FetchData url="Printers" @on-fetch="(data) => (printersOptions = data)" auto-load />
-    <FetchData url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
     <FetchData
         url="invoiceOutSerials"
         @on-fetch="handleInvoiceOutSerialsFetch"
@@ -97,7 +94,7 @@ onMounted(async () => {
                 v-if="clientsToInvoice === 'one'"
                 :label="t('client')"
                 v-model="formData.clientId"
-                :options="clientsOptions"
+                url="Clients"
                 option-value="id"
                 option-label="name"
                 hide-selected

From c84786e0534bf1b4172ee6f67cbc98a94b982f0d Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 26 Aug 2024 11:41:35 +0200
Subject: [PATCH 33/47] refs #7355 fix accountPrivileges

---
 src/pages/Account/Card/AccountPrivileges.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/pages/Account/Card/AccountPrivileges.vue b/src/pages/Account/Card/AccountPrivileges.vue
index 1300f5018..04ae702ad 100644
--- a/src/pages/Account/Card/AccountPrivileges.vue
+++ b/src/pages/Account/Card/AccountPrivileges.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -9,21 +9,28 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const route = useRoute();
+const loading = ref(false);
 
 const rolesOptions = ref([]);
 const formModelRef = ref();
+watch(
+    () => route.params.id,
+    () => formModelRef.value.reset()
+);
 </script>
 <template>
     <FetchData url="VnRoles" auto-load @on-fetch="(data) => (rolesOptions = data)" />
+
+    <QSpinner v-if="loading" color="primary" size="md" />
     <FormModel
         ref="formModelRef"
         model="AccountPrivileges"
-        :url="`VnUsers/${route.params.id}/privileges`"
-        :url-create="`VnUsers/${route.params.id}/privileges`"
+        url="VnUsers/preview"
         auto-load
         @on-data-saved="formModelRef.fetch()"
     >
         <template #form="{ data }">
+            {{ data }}
             <div class="q-gutter-y-sm">
                 <QCheckbox
                     v-model="data.hasGrant"

From 8568d36ee579189fac38bec19ce5673e03341853 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 26 Aug 2024 12:40:01 +0200
Subject: [PATCH 34/47] refs #7355 fix privileges

---
 src/pages/Account/Card/AccountPrivileges.vue | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/pages/Account/Card/AccountPrivileges.vue b/src/pages/Account/Card/AccountPrivileges.vue
index 04ae702ad..ac2ce4007 100644
--- a/src/pages/Account/Card/AccountPrivileges.vue
+++ b/src/pages/Account/Card/AccountPrivileges.vue
@@ -9,7 +9,6 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const loading = ref(false);
 
 const rolesOptions = ref([]);
 const formModelRef = ref();
@@ -17,18 +16,11 @@ watch(
     () => route.params.id,
     () => formModelRef.value.reset()
 );
+console.log('formModelRef', formModelRef.value);
 </script>
 <template>
     <FetchData url="VnRoles" auto-load @on-fetch="(data) => (rolesOptions = data)" />
-
-    <QSpinner v-if="loading" color="primary" size="md" />
-    <FormModel
-        ref="formModelRef"
-        model="AccountPrivileges"
-        url="VnUsers/preview"
-        auto-load
-        @on-data-saved="formModelRef.fetch()"
-    >
+    <FormModel ref="formModelRef" model="AccountPrivileges" url="VnUsers" auto-load>
         <template #form="{ data }">
             {{ data }}
             <div class="q-gutter-y-sm">

From 6f9cd7fe15ab965a5d30c8ccff257e7b66486627 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 26 Aug 2024 12:47:05 +0200
Subject: [PATCH 35/47] fix: refs #7323 auto fill bic

---
 src/components/common/VnSelect.vue | 17 ++++++++++++++---
 src/pages/Worker/WorkerCreate.vue  | 23 ++++++++++++++++-------
 src/pages/Worker/WorkerList.vue    | 23 ++++++++++++++++-------
 3 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 63a3f088f..420e977b9 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -73,6 +73,10 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    params: {
+        type: Object,
+        default: null,
+    },
 });
 
 const { t } = useI18n();
@@ -153,9 +157,15 @@ async function fetchFilter(val) {
             ? optionValue.value
             : optionFilter.value ?? optionLabel.value);
 
-    const defaultWhere = $props.useLike
-        ? { [key]: { like: `%${val}%` } }
-        : { [key]: val };
+    let defaultWhere = {};
+    if ($props.filterOptions.length) {
+        defaultWhere = $props.filterOptions.reduce((obj, prop) => {
+            if (!obj.or) obj.or = [];
+            obj.or.push({ [prop]: { like: `%${val}%` } });
+            return obj;
+        }, {});
+    } else
+        defaultWhere = $props.useLike ? { [key]: { like: `%${val}%` } } : { [key]: val };
     const where = { ...(val ? defaultWhere : {}), ...$props.where };
     const fetchOptions = { where, include, limit };
     if (fields) fetchOptions.fields = fields;
@@ -205,6 +215,7 @@ function nullishToTrue(value) {
         :limit="limit"
         :sort-by="sortBy"
         :fields="fields"
+        :params="params"
     />
     <QSelect
         v-model="value"
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 23f92bef1..297aa4182 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -19,7 +19,6 @@ const { t } = useI18n();
 const user = useState().getUser();
 
 const companiesOptions = ref([]);
-const workersOptions = ref([]);
 const payMethodsOptions = ref([]);
 const bankEntitiesOptions = ref([]);
 const formData = ref({ companyFk: user.value.companyFk, isFreelance: false });
@@ -56,6 +55,18 @@ function generateCodeUser(worker) {
 
     if (!worker.companyFk) worker.companyFk = user.companyFk;
 }
+
+async function autofillBic(worker) {
+    if (!worker || !worker.iban) return;
+
+    let bankEntityId = parseInt(worker.iban.substr(4, 4));
+    let filter = { where: { id: bankEntityId } };
+
+    const { data } = await axios.get(`BankEntities`, { params: { filter } });
+    const hasData = data && data[0];
+    if (hasData) worker.bankEntityFk = data[0].id;
+    else if (!hasData) worker.bankEntityFk = undefined;
+}
 </script>
 <template>
     <FetchData
@@ -63,11 +74,6 @@ function generateCodeUser(worker) {
         @on-fetch="(data) => (companiesOptions = data)"
         auto-load
     />
-    <FetchData
-        url="Workers/search"
-        @on-fetch="(data) => (workersOptions = data)"
-        auto-load
-    />
     <FetchData
         url="Paymethods"
         @on-fetch="(data) => (payMethodsOptions = data)"
@@ -146,7 +152,7 @@ function generateCodeUser(worker) {
                     <VnSelect
                         :label="t('worker.create.boss')"
                         v-model="data.bossFk"
-                        :options="workersOptions"
+                        url="Workers/search"
                         option-value="id"
                         option-label="name"
                         hide-selected
@@ -220,6 +226,7 @@ function generateCodeUser(worker) {
                         :label="t('worker.create.iban')"
                         :rules="validate('Worker.iban')"
                         :disable="formData.isFreelance"
+                        @update:model-value="autofillBic(data)"
                     >
                         <template #append>
                             <QIcon name="info" class="cursor-info">
@@ -237,6 +244,8 @@ function generateCodeUser(worker) {
                         :roles-allowed-to-create="['salesAssistant', 'hr']"
                         :rules="validate('Worker.bankEntity')"
                         :disable="formData.isFreelance"
+                        @update:model-value="autofillBic(data)"
+                        :filter-options="['bic', 'name']"
                     >
                         <template #form>
                             <CreateBankEntityForm
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index a10bdd040..b06444775 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -23,7 +23,6 @@ const { t } = useI18n();
 const tableRef = ref();
 const { viewSummary } = useSummaryDialog();
 const companiesOptions = ref([]);
-const workersOptions = ref([]);
 const payMethodsOptions = ref([]);
 const bankEntitiesOptions = ref([]);
 const postcodesOptions = ref([]);
@@ -125,6 +124,18 @@ function generateCodeUser(worker) {
 
     if (!worker.companyFk) worker.companyFk = user.companyFk;
 }
+
+async function autofillBic(worker) {
+    if (!worker || !worker.iban) return;
+
+    let bankEntityId = parseInt(worker.iban.substr(4, 4));
+    let filter = { where: { id: bankEntityId } };
+
+    const { data } = await axios.get(`BankEntities`, { params: { filter } });
+    const hasData = data && data[0];
+    if (hasData) worker.bankEntityFk = data[0].id;
+    else if (!hasData) worker.bankEntityFk = undefined;
+}
 </script>
 <template>
     <VnSearchbar
@@ -137,11 +148,6 @@ function generateCodeUser(worker) {
         @on-fetch="(data) => (companiesOptions = data)"
         auto-load
     />
-    <FetchData
-        url="Workers/search"
-        @on-fetch="(data) => (workersOptions = data)"
-        auto-load
-    />
     <FetchData
         url="Paymethods"
         @on-fetch="(data) => (payMethodsOptions = data)"
@@ -225,7 +231,7 @@ function generateCodeUser(worker) {
                     <VnSelect
                         :label="t('worker.create.boss')"
                         v-model="data.bossFk"
-                        :options="workersOptions"
+                        url="Workers/search"
                         option-value="id"
                         option-label="name"
                         hide-selected
@@ -290,6 +296,7 @@ function generateCodeUser(worker) {
                         v-model="data.iban"
                         :label="t('worker.create.iban')"
                         :disable="data.isFreelance"
+                        @update:model-value="autofillBic(data)"
                     >
                         <template #append>
                             <QIcon name="info" class="cursor-info">
@@ -308,6 +315,8 @@ function generateCodeUser(worker) {
                         hide-selected
                         :roles-allowed-to-create="['salesAssistant', 'hr']"
                         :disable="data.isFreelance"
+                        @update:model-value="autofillBic(data)"
+                        :filter-options="['bic', 'name']"
                     >
                         <template #form>
                             <CreateBankEntityForm

From c4fc644a35a54c13105efd74b47e45c03d4de0c2 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 26 Aug 2024 13:08:47 +0200
Subject: [PATCH 36/47] refs #7355 remove data

---
 src/pages/Account/Card/AccountPrivileges.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Account/Card/AccountPrivileges.vue b/src/pages/Account/Card/AccountPrivileges.vue
index ac2ce4007..5700f9f88 100644
--- a/src/pages/Account/Card/AccountPrivileges.vue
+++ b/src/pages/Account/Card/AccountPrivileges.vue
@@ -22,7 +22,6 @@ console.log('formModelRef', formModelRef.value);
     <FetchData url="VnRoles" auto-load @on-fetch="(data) => (rolesOptions = data)" />
     <FormModel ref="formModelRef" model="AccountPrivileges" url="VnUsers" auto-load>
         <template #form="{ data }">
-            {{ data }}
             <div class="q-gutter-y-sm">
                 <QCheckbox
                     v-model="data.hasGrant"

From c47635fcf27d04f1e509d8180bd6b35b37a542ad Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 26 Aug 2024 13:42:08 +0200
Subject: [PATCH 37/47] chore: refs #7323 refactor autofillbic

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

diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index b06444775..0ea094e23 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -132,9 +132,7 @@ async function autofillBic(worker) {
     let filter = { where: { id: bankEntityId } };
 
     const { data } = await axios.get(`BankEntities`, { params: { filter } });
-    const hasData = data && data[0];
-    if (hasData) worker.bankEntityFk = data[0].id;
-    else if (!hasData) worker.bankEntityFk = undefined;
+    worker.bankEntityFk = data?.[0]?.id ?? undefined;
 }
 </script>
 <template>

From e1e768948e4d7c8e08159ef1a7e08d7a9892549a Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 26 Aug 2024 13:44:35 +0200
Subject: [PATCH 38/47] chore: refs #7323 improve vnselect

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

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 420e977b9..83d0ce845 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -161,7 +161,7 @@ async function fetchFilter(val) {
     if ($props.filterOptions.length) {
         defaultWhere = $props.filterOptions.reduce((obj, prop) => {
             if (!obj.or) obj.or = [];
-            obj.or.push({ [prop]: { like: `%${val}%` } });
+            obj.or.push({ [prop]: $props.useLike ? { like: `%${val}%` } : val });
             return obj;
         }, {});
     } else

From c418899fb35d5e751619d5d3d308ecabf32c8997 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 26 Aug 2024 13:54:48 +0200
Subject: [PATCH 39/47] chore: refs #7323 improve vnselect

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

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 83d0ce845..b6dc226cc 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -161,11 +161,10 @@ async function fetchFilter(val) {
     if ($props.filterOptions.length) {
         defaultWhere = $props.filterOptions.reduce((obj, prop) => {
             if (!obj.or) obj.or = [];
-            obj.or.push({ [prop]: $props.useLike ? { like: `%${val}%` } : val });
+            obj.or.push({ [prop]: getVal(val) });
             return obj;
         }, {});
-    } else
-        defaultWhere = $props.useLike ? { [key]: { like: `%${val}%` } } : { [key]: val };
+    } else defaultWhere = { [key]: getVal(val) };
     const where = { ...(val ? defaultWhere : {}), ...$props.where };
     const fetchOptions = { where, include, limit };
     if (fields) fetchOptions.fields = fields;
@@ -204,6 +203,8 @@ async function filterHandler(val, update) {
 function nullishToTrue(value) {
     return value ?? true;
 }
+
+const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 </script>
 
 <template>

From 64e776d3116c227ae8a6d07939bc9f1ecce10e4d Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 27 Aug 2024 10:02:59 +0200
Subject: [PATCH 40/47] refs #6899 fix invoiceFix

---
 src/pages/InvoiceOut/InvoiceOutGlobalForm.vue | 12 +++++++++++-
 src/pages/InvoiceOut/InvoiceOutList.vue       | 14 +++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 2070ef09c..32018cdd6 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -101,7 +101,17 @@ onMounted(async () => {
                 dense
                 outlined
                 rounded
-            />
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>
+                                {{ scope.opt?.name }} #{{ scope.opt?.id }}
+                            </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
             <VnSelect
                 :label="t('invoiceOutSerialType')"
                 v-model="formData.serialType"
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index b08e12b3e..c2fcd049e 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -226,10 +226,18 @@ watchEffect(selectedRows);
                     url="Tickets"
                     v-model="data.ticketFk"
                     :label="t('invoiceOutList.tableVisibleColumns.ticket')"
-                    :options="ticketsOptions"
-                    option-label="nickname"
+                    option-label="id"
                     option-value="id"
-                />
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
                 <span class="q-ml-md">O</span>
             </div>
             <VnSelect

From 39656ee3f56c97a921bff335fd01ad6d136fa8c0 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 27 Aug 2024 10:11:38 +0200
Subject: [PATCH 41/47] refs #7355 remove privileges

---
 src/pages/Account/Card/AccountPrivileges.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Account/Card/AccountPrivileges.vue b/src/pages/Account/Card/AccountPrivileges.vue
index 5700f9f88..0574e08d2 100644
--- a/src/pages/Account/Card/AccountPrivileges.vue
+++ b/src/pages/Account/Card/AccountPrivileges.vue
@@ -16,7 +16,6 @@ watch(
     () => route.params.id,
     () => formModelRef.value.reset()
 );
-console.log('formModelRef', formModelRef.value);
 </script>
 <template>
     <FetchData url="VnRoles" auto-load @on-fetch="(data) => (rolesOptions = data)" />

From 72e4f102879816793bf27362b43b5e1bec54fe5c Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 27 Aug 2024 10:17:06 +0200
Subject: [PATCH 42/47] refs #6899 fix order

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

diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 32018cdd6..334933447 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -106,7 +106,7 @@ onMounted(async () => {
                     <QItem v-bind="scope.itemProps">
                         <QItemSection>
                             <QItemLabel>
-                                {{ scope.opt?.name }} #{{ scope.opt?.id }}
+                                #{{ scope.opt?.id }} {{ scope.opt?.name }}
                             </QItemLabel>
                         </QItemSection>
                     </QItem>

From 4a815988837815dd835650c654af639a23ffedb4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 10:27:43 +0200
Subject: [PATCH 43/47] fix: ticketDescriptorMenu

---
 src/pages/Ticket/Card/TicketDescriptorMenu.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index c7784bc2a..d5a578ca7 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -30,10 +30,13 @@ const actions = {
         let clonedTicketId;
 
         try {
-            const { data } = await axios.post(`Tickets/${ticketId}/clone`, {
+            const { data } = await axios.post(`Tickets/cloneAll`, {
                 shipped: ticket.value.shipped,
+                ticketsIds: [ticket.value.id],
+                withWarehouse: true,
+                negative: false,
             });
-            clonedTicketId = data;
+            clonedTicketId = data[0].id;
         } catch (e) {
             opts.message = t('It was not able to clone the ticket');
             opts.type = 'negative';

From ceec78da17b6ceec640e6fb6d37d37c49d8d43b3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 10:27:51 +0200
Subject: [PATCH 44/47] test: ticketDescriptorMenu

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

diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
index fc920f346..882aab157 100644
--- a/test/cypress/integration/ticket/ticketDescriptor.spec.js
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -16,7 +16,7 @@ describe('Ticket descriptor', () => {
         cy.openActionsDescriptor();
         cy.get(toCloneOpt).click();
         cy.clickConfirm();
-        cy.get(warehouseValue).contains('-');
+        cy.get(warehouseValue).contains('Warehouse One');
         cy.get(summaryHeader)
             .invoke('text')
             .then((text) => {

From 137ed40f333440d41dab07462f83e926191491d8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 13:53:45 +0200
Subject: [PATCH 45/47] feat: update version and changelog

---
 CHANGELOG.md | 96 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 package.json |  2 +-
 2 files changed, 97 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86ffce3fd..3868ceddd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,99 @@
+# Version 24.36 - 2024-08-27
+
+### Added 🆕
+
+### Changed 📦
+
+### Fixed 🛠️
+
+# Version 24.34 - 2024-08-20
+
+### Added 🆕
+
+-   chore: #6900 order params by:jorgep
+-   chore: refs #6900 drop console log by:jorgep
+-   chore: refs #6900 drop vnCurrency by:jorgep
+-   chore: refs #6900 fix e2e tests by:jorgep
+-   chore: refs #6900 mv rectificative logic by:jorgep
+-   chore: refs #6900 responsive code by:jorgep
+-   chore: refs #7283 drop array types by:jorgep
+-   chore: refs #7283 drop import by:jorgep
+-   chore: refs #7283 fix e2e logout by:jorgep
+-   chore: refs #7283 update VnAvatar title handling by:jorgep
+-   chore: refs #7323 fix test by:jorgep
+-   chore: refs #7323 remove unused import by:jorgep
+-   chore: refs #7323drop commented code by:jorgep
+-   feat(VnCard): use props searchbar by:alexm
+-   feat(customer): improve basicData to balance by:alexm
+-   feat(customer_balance): refs #6943 add functionality from salix by:alexm
+-   feat(customer_balance): refs #6943 translations by:alexm
+-   feat: refs #6130 husky commitLint config by:pablone
+-   feat: refs #6130 husky hooks by:pablone
+-   feat: refs #6900 add InvoiceInSerial by:jorgep
+-   feat: refs #6900 add locale by:jorgep
+-   feat: refs #6900 use VnTable & sort filter fields by:jorgep
+-   feat: refs #7323 add flex-wrap by:jorgep
+-   feat: refs #7323 add my account" btn & fix models log selectable by:jorgep
+-   feat: refs #7323 improve test by:jorgep
+
+### Changed 📦
+
+-   refactor(customer_log: use VnLog by:alexm
+-   refactor(customer_recovery): to vnTable by:alexm
+-   refactor(customer_webAccess): FormModel by:alexm
+-   refactor: refs #7283 update avatar size and color by:jorgep
+
+### Fixed 🛠️
+
+-   chore: refs #6900 fix e2e tests by:jorgep
+-   chore: refs #7283 fix e2e logout by:jorgep
+-   chore: refs #7323 fix test by:jorgep
+-   feat: refs #7323 add my account" btn & fix models log selectable by:jorgep
+-   fix #7355 fix acls list by:carlossa
+-   fix(VnFilterPanel): emit userParams better by:alexm
+-   fix(claim_summary): url links (HEAD -> 7864_testToMaster_2434, origin/test, origin/7864_testToMaster_2434, test) by:alexm
+-   fix(customer_sms: fix reload by:alexm
+-   fix(twoFactor): unify code login and twoFactor by:alexm
+-   fix: VnCard VnSearchbar props by:alexm
+-   fix: accountMailAlias by:alexm
+-   fix: refs #6130 add commit lint modules by:pablone
+-   fix: refs #6130 pnpm-lock.yml by:pablone
+-   fix: refs #6900 improve loading by:jorgep
+-   fix: refs #6900 improve logic (origin/6900-addSerial) by:jorgep
+-   fix: refs #6900 improve logic by:jorgep
+-   fix: refs #6900 rectificative btn reactivity by:jorgep
+-   fix: refs #6900 use type number by:jorgep
+-   fix: refs #6900 vat & dueday by:jorgep
+-   fix: refs #6900 vat, dueday & intrastat by:jorgep
+-   fix: refs #6989 show entity name & default time from config table by:jorgep
+-   fix: refs #7283 basicData locale by:jorgep
+-   fix: refs #7283 itemLastEntries filter by:jorgep
+-   fix: refs #7283 itemTags & VnImg by:jorgep
+-   fix: refs #7283 locale by:jorgep
+-   fix: refs #7283 min-width vnImg by:jorgep
+-   fix: refs #7283 use vnAvatar & add optional zoom by:jorgep
+-   fix: refs #7283 userPanel pic by:jorgep
+-   fix: refs #7323 add department popup by:jorgep
+-   fix: refs #7323 add locale by:jorgep
+-   fix: refs #7323 css righ menu by:jorgep
+-   fix: refs #7323 data-key & add select by:jorgep
+-   fix: refs #7323 load all opts by:jorgep
+-   fix: refs #7323 righ menu bug by:jorgep
+-   fix: refs #7323 use global locale by:jorgep
+-   fix: refs #7323 use workerFilter (origin/7323-warmfix-fixErrors) by:jorgep
+-   fix: refs #7323 vnsubtoolbar css by:jorgep
+-   fix: refs #7323 wrong css by:jorgep
+-   refs #7355 fix Rol, alias by:carlossa
+-   refs #7355 fix accountAlias by:carlossa
+-   refs #7355 fix alias summary by:carlossa
+-   refs #7355 fix conflicts by:carlossa
+-   refs #7355 fix create Rol by:carlossa
+-   refs #7355 fix list by:carlossa
+-   refs #7355 fix lists redirects summary by:carlossa
+-   refs #7355 fix roles by:carlossa
+-   refs #7355 fix search exprBuilder by:carlossa
+-   refs #7355 fix vnTable by:carlossa
+
 # Version 24.32 - 2024-08-06
 
 ### Added 🆕
diff --git a/package.json b/package.json
index 72bada823..f25e570a3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.34.0",
+    "version": "24.36.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

From 636861234b9e31665e4326776f5e81f5e822bae4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 14:00:21 +0200
Subject: [PATCH 46/47] fix: remove property

---
 src/pages/Ticket/Card/TicketDescriptorMenu.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index d5a578ca7..9a50288a0 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -31,7 +31,6 @@ const actions = {
 
         try {
             const { data } = await axios.post(`Tickets/cloneAll`, {
-                shipped: ticket.value.shipped,
                 ticketsIds: [ticket.value.id],
                 withWarehouse: true,
                 negative: false,

From f88dc4a59deb0d95c8d5851df74ba225abf7b946 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 27 Aug 2024 14:01:48 +0200
Subject: [PATCH 47/47] feat: update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3868ceddd..8e1d4c433 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,10 +2,52 @@
 
 ### Added 🆕
 
+-   feat(FormModel): trim data by default by:alexm
+-   feat(orderBasicData): add notes by:alexm
+-   feat(orderList): correct create order by:alexm
+-   feat(orderList): use orderFilter and fixed this by:alexm
+-   feat: #7323 handle workerPhoto (origin/7323_workerPhoto, 7323_workerPhoto) by:Javier Segarra
+-   feat: add recover password and reset password by:alexm
+-   feat: refs #7346 add seriaType option by:jgallego
+-   feat: refs #7346 elimino === by:jgallego
+-   feat: refs #7346 formdata uses serialType by:jgallego
+-   feat: refs #7346 refactor by:jgallego
+-   feat: refs #7346 sonarLint warnings (origin/7346-invoiceOutMultilple, 7346-invoiceOutMultilple) by:jgallego
+-   feat: refs #7710 uses cloneAll by:jgallego
+-   fix: refs #7717 fix OrderList table filters' and summary table style by:Jon
+
 ### Changed 📦
 
+-   feat: refs #7346 refactor by:jgallego
+-   perf: date fields (mindshore/feature/TicketFutureFilter, feature/TicketFutureFilter) by:Javier Segarra
+-   perf: refs #7717 right menu filter by:Jon
+-   perf: use ref at component start by:Javier Segarra
+-   refactor: refs #7717 delete useless function and import by:Jon
+-   refactor: refs #7717 deleted useless code by:Jon
+
 ### Fixed 🛠️
 
+-   feat(orderList): use orderFilter and fixed this by:alexm
+-   fix(VnTable): orderBy v-model by:alexm
+-   fix(account_card): redirection by:carlossa
+-   fix(orderLines): reload when delete and redirect when confirm by:alexm
+-   fix: #6336 ClaimListStates by:Javier Segarra
+-   fix: account subsections cards by:carlossa
+-   fix: duplicate key by:Jon
+-   fix: order description to vnTable by:alexm
+-   fix: orderCatalogFilter order by:alexm
+-   fix: quasar build warnings (6336_claim_fix_states) by:Javier Segarra
+-   fix: refs #7717 fix OrderList table filters' and summary table style by:Jon
+-   fix: refs #7717 fix basic data form & minor errors by:Jon
+-   fix: refs #7717 fix catalog filter, searchbar redirect and search by:Jon
+-   fix: refs #7717 fix catalog searchbar and worker tests(refs #7323) by:Jon
+-   fix: refs #7717 fix order sections by:Jon
+-   fix: refs #7717 fix volume and lines redirect by:Jon
+-   fix: refs #7717 fixed searchbar filter with rightmenu filters' applied by:Jon
+-   fix: test by:alexm
+-   fix: ticketDescriptorMenu by:Javier Segarra
+-   refs #7355 account fixes by:carlossa
+
 # Version 24.34 - 2024-08-20
 
 ### Added 🆕