From 453e3f92e5ac1fad65e69228a96b348f3bb87d21 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 19 Jun 2024 16:02:43 +0200
Subject: [PATCH 01/63] fix: refs #7197 setInvoiceInCorrecition

---
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 68dc5be4b..f06ee43ac 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { ref, reactive, computed, onBeforeMount } from 'vue';
-import { useRouter, onBeforeRouteLeave } from 'vue-router';
+import { useRouter, onBeforeRouteUpdate } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import axios from 'axios';
@@ -129,10 +129,10 @@ onBeforeMount(async () => {
     totalAmount.value = data.totalDueDay;
 });
 
-onBeforeRouteLeave(async (to, from) => {
+onBeforeRouteUpdate(async (to, from) => {
     invoiceInCorrection.correcting.length = 0;
     invoiceInCorrection.corrected = null;
-    if (to.params.id !== from.params.id) await setInvoiceCorrection(entityId.value);
+    if (to.params.id !== from.params.id) await setInvoiceCorrection(to.params.id);
 });
 
 async function setInvoiceCorrection(id) {
@@ -374,7 +374,7 @@ const createInvoiceInCorrection = async () => {
                 </template>
             </VnLv>
         </template>
-        <template #action="{ entity }">
+        <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
                     size="md"

From 9e078bc07444049b9d1156d6341b968398b67be1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 20 Jun 2024 16:15:10 +0200
Subject: [PATCH 02/63] fix: refs #7197 vat, intrastat, filter and list
 sections

---
 src/components/CrudModel.vue                  | 48 ++++++------
 src/components/common/VnSelect.vue            |  4 +-
 src/i18n/locale/en.yml                        | 19 ++---
 src/i18n/locale/es.yml                        | 18 +----
 src/pages/InvoiceIn/Card/InvoiceInCard.vue    |  9 ++-
 .../InvoiceIn/Card/InvoiceInIntrastat.vue     | 17 ++++-
 src/pages/InvoiceIn/Card/InvoiceInVat.vue     | 22 +++++-
 src/pages/InvoiceIn/InvoiceInFilter.vue       | 48 ++++--------
 src/pages/InvoiceIn/InvoiceInList.vue         | 73 +++++++++++--------
 src/pages/InvoiceIn/InvoiceInSearchbar.vue    | 17 +++++
 src/pages/InvoiceIn/locale/es.yml             |  2 -
 11 files changed, 150 insertions(+), 127 deletions(-)
 create mode 100644 src/pages/InvoiceIn/InvoiceInSearchbar.vue
 delete mode 100644 src/pages/InvoiceIn/locale/es.yml

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index c26a9c4a5..f3280511c 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { computed, ref, watch } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRouter, onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useValidator } from 'src/composables/useValidator';
@@ -67,10 +67,6 @@ const $props = defineProps({
         default: '',
         description: 'It is used for redirect on click "save and continue"',
     },
-    hasSubtoolbar: {
-        type: Boolean,
-        default: true,
-    },
 });
 
 const isLoading = ref(false);
@@ -79,7 +75,6 @@ const originalData = ref();
 const vnPaginateRef = ref();
 const formData = ref();
 const saveButtonRef = ref(null);
-const watchChanges = ref();
 const formUrl = computed(() => $props.url);
 
 const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
@@ -94,7 +89,19 @@ defineExpose({
     saveChanges,
     getChanges,
     formData,
-    vnPaginateRef,
+});
+
+onBeforeRouteLeave((to, from, next) => {
+    if (hasChanges.value)
+        quasar.dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('globals.unsavedPopup.title'),
+                message: t('globals.unsavedPopup.subtitle'),
+                promise: () => next(),
+            },
+        });
+    else next();
 });
 
 async function fetch(data) {
@@ -103,26 +110,19 @@ async function fetch(data) {
         data.map((d) => (d.$index = $index++));
     }
 
-    resetData(data);
+    originalData.value = data && JSON.parse(JSON.stringify(data));
+    formData.value = data && JSON.parse(JSON.stringify(data));
+    watch(formData, () => (hasChanges.value = true), { deep: true });
 
     emit('onFetch', data);
     return data;
 }
 
-function resetData(data) {
-    if (!data) return;
-    originalData.value = JSON.parse(JSON.stringify(data));
-    formData.value = JSON.parse(JSON.stringify(data));
-
-    if (watchChanges.value) watchChanges.value(); //destoy watcher
-    watchChanges.value = watch(formData, () => (hasChanges.value = true), { deep: true });
-}
-
 async function reset() {
     await fetch(originalData.value);
     hasChanges.value = false;
 }
-
+// eslint-disable-next-line vue/no-dupe-keys
 function filter(value, update, filterOptions) {
     update(
         () => {
@@ -284,9 +284,8 @@ function isEmpty(obj) {
     if (obj.length > 0) return false;
 }
 
-async function reload(params) {
-    const data = await vnPaginateRef.value.fetch(params);
-    fetch(data);
+async function reload() {
+    vnPaginateRef.value.fetch();
 }
 
 watch(formUrl, async () => {
@@ -298,11 +297,10 @@ watch(formUrl, async () => {
     <VnPaginate
         :url="url"
         :limit="limit"
+        v-bind="$attrs"
         @on-fetch="fetch"
-        @on-change="resetData"
         :skeleton="false"
         ref="vnPaginateRef"
-        v-bind="$attrs"
     >
         <template #body v-if="formData">
             <slot
@@ -313,8 +311,8 @@ watch(formUrl, async () => {
             ></slot>
         </template>
     </VnPaginate>
-    <SkeletonTable v-if="!formData" :columns="$attrs.columns?.length" />
-    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubtoolbar">
+    <SkeletonTable v-if="!formData" />
+    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
         <QBtnGroup push style="column-gap: 10px">
             <slot name="moreBeforeActions" />
             <QBtn
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 04ccca889..5fc86ce1d 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -170,8 +170,8 @@ watch(modelValue, (newValue) => {
         map-options
         use-input
         @filter="filterHandler"
-        hide-selected
-        fill-input
+        :hide-selected="$attrs['hide-selected'] ?? true"
+        :fill-input="$attrs['fill-input'] ?? true"
         ref="vnSelectRef"
         lazy-rules
         :class="{ required: $attrs.required }"
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 515f8dd80..7ace15cce 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -113,6 +113,9 @@ globals:
     name: Name
     new: New
     comment: Comment
+    unsavedPopup:
+        title: Unsaved changes will be lost
+        subtitle: Are you sure exit without saving?
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -279,8 +282,8 @@ customer:
     extendedList:
         tableVisibleColumns:
             id: Identifier
-            name: Comercial name
-            socialName: Business name
+            name: Name
+            socialName: Social name
             fi: Tax number
             salesPersonFk: Salesperson
             credit: Credit
@@ -992,18 +995,6 @@ route:
             shipped: Preparation date
             viewCmr: View CMR
             downloadCmrs: Download CMRs
-    columnLabels:
-        Id: Id
-        vehicle: Vehicle
-        description: Description
-        isServed: Served
-        worker: Worker
-        date: Date
-        started: Started
-        actions: Actions
-        agency: Agency
-        volume: Volume
-        finished: Finished
 supplier:
     pageTitles:
         suppliers: Suppliers
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 762f641e0..a2f4f508b 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -107,13 +107,15 @@ globals:
         aliasUsers: Usuarios
         subRoles: Subroles
         inheritedRoles: Roles heredados
-        workers: Trabajadores
     created: Fecha creación
     worker: Trabajador
     now: Ahora
     name: Nombre
     new: Nuevo
     comment: Comentario
+    unsavedPopup:
+        title: Los cambios que no haya guardado se perderán
+        subtitle: ¿Seguro que quiere salir sin guardar?
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -278,7 +280,7 @@ customer:
     extendedList:
         tableVisibleColumns:
             id: Identificador
-            name: Nombre Comercial
+            name: Nombre
             socialName: Razón social
             fi: NIF / CIF
             salesPersonFk: Comercial
@@ -978,18 +980,6 @@ route:
             shipped: Fecha preparación
             viewCmr: Ver CMR
             downloadCmrs: Descargar CMRs
-    columnLabels:
-        Id: Id
-        vehicle: Vehículo
-        description: Descripción
-        isServed: Servida
-        worker: Trabajador
-        date: Fecha
-        started: Iniciada
-        actions: Acciones
-        agency: Agencia
-        volume: Volumen
-        finished: Finalizada
 supplier:
     pageTitles:
         suppliers: Proveedores
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index 912713f23..e45c4380e 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -2,6 +2,7 @@
 import VnCard from 'components/common/VnCard.vue';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
 import InvoiceInFilter from '../InvoiceInFilter.vue';
+import InvoiceInSearchbar from '../InvoiceInSearchbar.vue';
 
 const filter = {
     include: [
@@ -30,6 +31,10 @@ const filter = {
         search-data-key="InvoiceInList"
         search-url="InvoiceIns/filter"
         searchbar-label="Search invoice"
-        searchbar-info="You can search by invoice reference"
-    />
+        searchbar-info="Search invoices in by id or supplier fiscal name"
+    >
+        <template #searchbar>
+            <InvoiceInSearchbar />
+        </template>
+    </VnCard>
 </template>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index a7b9110f5..9f39e6e0e 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -73,6 +73,12 @@ const columns = computed(() => [
 
 const getTotal = (data, key) =>
     data.reduce((acc, cur) => acc + +String(cur[key]).replace(',', '.'), 0);
+
+const formatOpt = (row, { model, options }, prop) => {
+    const obj = row[model];
+    const option = options.find(({ id }) => id == obj);
+    return option ? `${obj}:${option[prop]}` : '';
+};
 </script>
 <template>
     <FetchData
@@ -92,7 +98,7 @@ const getTotal = (data, key) =>
             ref="invoiceInFormRef"
             data-key="InvoiceInIntrastats"
             url="InvoiceInIntrastats"
-            :auto-load="!currency"
+            auto-load
             :data-required="{ invoiceInFk: invoiceInId }"
             :filter="filter"
             v-model:selected="rowsSelected"
@@ -124,6 +130,9 @@ const getTotal = (data, key) =>
                                 option-value="id"
                                 option-label="description"
                                 :filter-options="['id', 'description']"
+                                :hide-selected="false"
+                                :fill-input="false"
+                                :display-value="formatOpt(row, col, 'description')"
                             >
                                 <template #option="scope">
                                     <QItem v-bind="scope.itemProps">
@@ -247,7 +256,11 @@ const getTotal = (data, key) =>
     }
 }
 </style>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+:deep(.q-table tr .q-td:nth-child(2) input) {
+    display: none;
+}
+</style>
 <i18n>
     en:
         amount: Amount
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 58f6e0d01..bed28b7ce 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -69,6 +69,7 @@ const columns = computed(() => [
         model: 'taxTypeSageFk',
         optionValue: 'id',
         optionLabel: 'id',
+
         sortable: true,
         tabindex: 3,
         align: 'left',
@@ -162,8 +163,14 @@ async function addExpense() {
     }
 }
 const getTotalTaxableBase = (rows) =>
-    rows.reduce((acc, { taxableBase }) => acc + +taxableBase, 0);
+    rows.reduce((acc, { taxableBase }) => acc + +(taxableBase || 0), 0);
 const getTotalRate = (rows) => rows.reduce((acc, cur) => acc + +taxRate(cur), 0);
+
+const formatOpt = (row, { model, options }, prop) => {
+    const obj = row[model];
+    const option = options.find(({ id }) => id == obj);
+    return option ? `${obj}:${option[prop]}` : '';
+};
 </script>
 <template>
     <FetchData
@@ -254,8 +261,9 @@ const getTotalRate = (rows) => rows.reduce((acc, cur) => acc + +taxRate(cur), 0)
                             :option-value="col.optionValue"
                             :option-label="col.optionLabel"
                             :filter-options="['id', 'vat']"
-                            :autofocus="col.tabIndex == 1"
-                            input-debounce="0"
+                            :hide-selected="false"
+                            :fill-input="false"
+                            :display-value="formatOpt(row, col, 'vat')"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
@@ -280,6 +288,9 @@ const getTotalRate = (rows) => rows.reduce((acc, cur) => acc + +taxRate(cur), 0)
                             :filter-options="['id', 'transaction']"
                             :autofocus="col.tabIndex == 1"
                             input-debounce="0"
+                            :hide-selected="false"
+                            :fill-input="false"
+                            :display-value="formatOpt(row, col, 'transaction')"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
@@ -474,11 +485,16 @@ const getTotalRate = (rows) => rows.reduce((acc, cur) => acc + +taxRate(cur), 0)
         />
     </QPageSticky>
 </template>
+
 <style lang="scss" scoped>
 .bg {
     background-color: var(--vn-light-gray);
 }
 
+:deep(.q-table tr td:nth-child(n + 4):nth-child(-n + 5) input) {
+    display: none;
+}
+
 @media (max-width: $breakpoint-xs) {
     .q-dialog {
         .q-card {
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 57aaeab54..32cd4f027 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -29,11 +29,7 @@ const suppliers = ref([]);
                         v-model="params.supplierRef"
                         is-outlined
                         lazy-rules
-                    >
-                        <template #prepend>
-                            <QIcon name="vn:client" size="sm"></QIcon>
-                        </template>
-                    </VnInput>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -43,11 +39,7 @@ const suppliers = ref([]);
                         v-model="params.fi"
                         is-outlined
                         lazy-rules
-                    >
-                        <template #prepend>
-                            <QIcon name="badge" size="sm"></QIcon>
-                        </template>
-                    </VnInput>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -63,6 +55,7 @@ const suppliers = ref([]);
                         dense
                         outlined
                         rounded
+                        :filter-options="['id', 'name']"
                     >
                     </VnSelect>
                 </QItemSection>
@@ -74,11 +67,7 @@ const suppliers = ref([]);
                         v-model="params.account"
                         is-outlined
                         lazy-rules
-                    >
-                        <template #prepend>
-                            <QIcon name="person" size="sm" />
-                        </template>
-                    </VnInput>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -123,11 +112,7 @@ const suppliers = ref([]);
                             v-model="params.serialNumber"
                             is-outlined
                             lazy-rules
-                        >
-                            <template #prepend>
-                                <QIcon name="badge" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
+                        />
                     </QItemSection>
                 </QItem>
                 <QItem>
@@ -137,11 +122,7 @@ const suppliers = ref([]);
                             v-model="params.serial"
                             is-outlined
                             lazy-rules
-                        >
-                            <template #prepend>
-                                <QIcon name="badge" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
+                        />
                     </QItemSection>
                 </QItem>
                 <QItem>
@@ -151,11 +132,7 @@ const suppliers = ref([]);
                             v-model="params.awbCode"
                             is-outlined
                             lazy-rules
-                        >
-                            <template #prepend>
-                                <QIcon name="badge" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
+                        />
                     </QItemSection>
                 </QItem>
             </QExpansionItem>
@@ -166,7 +143,7 @@ const suppliers = ref([]);
 <i18n>
 en:
     params:
-        search: ID
+        search: Id or supplier name
         supplierRef: Supplier ref.
         supplierFk: Supplier
         fi: Supplier fiscal id
@@ -177,12 +154,15 @@ en:
         dued: Dued
         serialNumber: Serial Number
         serial: Serial
-        account: Account
+        account: Ledger account
         isBooked: is booked
         correctedFk: Rectificatives
+        issued: Issued
+        to: To
+        awbCode: AWB
 es:
     params:
-        search: Contiene
+        search: Id o nombre proveedor
         supplierRef: Ref. proveedor
         supplierFk: Proveedor
         clientFk: Cliente
@@ -193,7 +173,7 @@ es:
         amount: Importe
         issued: Emitida
         isBooked: Conciliada
-        account: Cuenta
+        account: Cuenta contable
         created: Creada
         dued: Vencida
         correctedFk: Rectificativas
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 0e5216314..2bfc2425f 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -1,44 +1,63 @@
 <script setup>
-import { ref, onMounted, onUnmounted } from 'vue';
+import { onMounted, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { downloadFile } from 'src/composables/downloadFile';
 import { toDate, toCurrency } from 'src/filters/index';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import InvoiceInFilter from './InvoiceInFilter.vue';
-import { getUrl } from 'src/composables/getUrl';
 import InvoiceInSummary from './Card/InvoiceInSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import InvoiceInSearchbar from 'src/pages/InvoiceIn/InvoiceInSearchbar.vue';
 
 const stateStore = useStateStore();
-const router = useRouter();
 const { viewSummary } = useSummaryDialog();
-let url = ref();
 const { t } = useI18n();
 
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-    url.value = await getUrl('');
-});
+onMounted(async () => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
-
-function navigate(id) {
-    router.push({ path: `/invoice-in/${id}` });
-}
+const exprBuilder = (param, value) => {
+    let minHour, maxHour;
+    switch (param) {
+        case 'issued':
+            minHour = new Date(value);
+            minHour.setHours(0, 0, 0, 0);
+            maxHour = new Date(value);
+            maxHour.setHours(23, 59, 59, 59);
+            return {
+                'ii.issued': {
+                    between: [minHour, maxHour],
+                },
+            };
+        case 'id':
+        case 'supplierFk':
+        case 'supplierRef':
+        case 'serialNumber':
+        case 'serial':
+        case 'created':
+        case 'isBooked':
+            return { [`ii.${param}`]: value };
+        case 'account':
+        case 'fi':
+            return { [`s.${param}`]: value };
+        case 'awbCode':
+            return { 'awb.code': value };
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { 'ii.id': value }
+                : { 's.name': { like: `%${value}%` } };
+        default:
+            return { [param]: value };
+    }
+};
 </script>
 
 <template>
-    <VnSearchbar
-        data-key="InvoiceInList"
-        :label="t('Search invoice')"
-        :info="t('You can search by invoice reference')"
-    />
+    <InvoiceInSearchbar />
     <RightMenu>
         <template #right-panel>
             <InvoiceInFilter data-key="InvoiceInList" />
@@ -51,13 +70,14 @@ function navigate(id) {
                 url="InvoiceIns/filter"
                 order="issued DESC, id DESC"
                 auto-load
+                :expr-builder="exprBuilder"
             >
                 <template #body="{ rows }">
                     <CardList
                         v-for="row of rows"
                         :key="row.id"
                         :title="row.supplierRef"
-                        @click="navigate(row.id)"
+                        @click="$router.push({ path: `/invoice-in/${row.id}` })"
                         :id="row.id"
                     >
                         <template #list-items>
@@ -102,7 +122,9 @@ function navigate(id) {
                         <template #actions>
                             <QBtn
                                 :label="t('components.smartCard.openCard')"
-                                @click.stop="navigate(row.id)"
+                                @click.stop="
+                                    $router.push({ path: `/invoice-in/${row.id}` })
+                                "
                                 outline
                                 type="reset"
                             />
@@ -115,7 +137,7 @@ function navigate(id) {
                                 class="q-mt-sm"
                             />
                             <QBtn
-                                :label="t('Download')"
+                                :label="t('globals.download')"
                                 class="q-mt-sm"
                                 @click.stop="downloadFile(row.dmsFk)"
                                 type="submit"
@@ -131,10 +153,3 @@ function navigate(id) {
         <QBtn color="primary" icon="add" size="lg" round :href="`/#/invoice-in/create`" />
     </QPageSticky>
 </template>
-
-<i18n>
-es:
-    Search invoice: Buscar factura recibida
-    You can search by invoice reference: Puedes buscar por referencia de la factura
-    Download: Descargar
-</i18n>
diff --git a/src/pages/InvoiceIn/InvoiceInSearchbar.vue b/src/pages/InvoiceIn/InvoiceInSearchbar.vue
new file mode 100644
index 000000000..10703d25b
--- /dev/null
+++ b/src/pages/InvoiceIn/InvoiceInSearchbar.vue
@@ -0,0 +1,17 @@
+<script setup>
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import { useI18n } from 'vue-i18n';
+const { t } = useI18n();
+</script>
+<template>
+    <VnSearchbar
+        data-key="InvoiceInList"
+        :label="t('Search invoice')"
+        :info="t('Search invoices in by id or supplier fiscal name')"
+    />
+</template>
+<i18n>
+es:
+    Search invoice: Buscar factura recibida
+    Search invoices in by id or supplier fiscal name: Buscar facturas recibidas por id o por nombre fiscal del proveedor
+</i18n>
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
deleted file mode 100644
index d7e38d7fa..000000000
--- a/src/pages/InvoiceIn/locale/es.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-Search invoice: Buscar factura recibida
-You can search by invoice reference: Puedes buscar por referencia de la factura

From 0a6717171c7890f510d80e0e8d045ddeefd16ddb Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 20 Jun 2024 16:31:59 +0200
Subject: [PATCH 03/63] fix: refs #7197 reactivity invoiceCorrection

---
 .../InvoiceIn/Card/InvoiceInDescriptor.vue    | 26 +++++--------------
 1 file changed, 6 insertions(+), 20 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index f06ee43ac..b79bf556d 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -136,26 +136,12 @@ onBeforeRouteUpdate(async (to, from) => {
 });
 
 async function setInvoiceCorrection(id) {
-    const [{ data: correctingData }, { data: correctedData }] = await Promise.all([
-        axios.get('InvoiceInCorrections', {
-            params: {
-                filter: {
-                    where: {
-                        correctingFk: id,
-                    },
-                },
-            },
-        }),
-        axios.get('InvoiceInCorrections', {
-            params: {
-                filter: {
-                    where: {
-                        correctedFk: id,
-                    },
-                },
-            },
-        }),
-    ]);
+    const { data: correctingData } = await axios.get('InvoiceInCorrections', {
+        params: { filter: { where: { correctingFk: id } } },
+    });
+    const { data: correctedData } = await axios.get('InvoiceInCorrections', {
+        params: { filter: { where: { correctedFk: id } } },
+    });
 
     if (correctingData[0]) invoiceInCorrection.corrected = correctingData[0].correctedFk;
 

From 11aadddd557da31c53b30d2d9e7dff2033ecdb90 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 24 Jun 2024 17:00:46 +0200
Subject: [PATCH 04/63] refactor: refs #7197 use invoiceInSearchbar &
 queryParams

---
 src/pages/InvoiceIn/Card/InvoiceInCard.vue |  3 --
 src/pages/InvoiceIn/InvoiceInList.vue      | 35 ----------------------
 src/pages/InvoiceIn/InvoiceInSearchbar.vue |  1 +
 3 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index e45c4380e..a95f289b0 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -29,9 +29,6 @@ const filter = {
         :descriptor="InvoiceInDescriptor"
         :filter-panel="InvoiceInFilter"
         search-data-key="InvoiceInList"
-        search-url="InvoiceIns/filter"
-        searchbar-label="Search invoice"
-        searchbar-info="Search invoices in by id or supplier fiscal name"
     >
         <template #searchbar>
             <InvoiceInSearchbar />
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 2bfc2425f..089bc776f 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -20,40 +20,6 @@ const { t } = useI18n();
 
 onMounted(async () => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
-const exprBuilder = (param, value) => {
-    let minHour, maxHour;
-    switch (param) {
-        case 'issued':
-            minHour = new Date(value);
-            minHour.setHours(0, 0, 0, 0);
-            maxHour = new Date(value);
-            maxHour.setHours(23, 59, 59, 59);
-            return {
-                'ii.issued': {
-                    between: [minHour, maxHour],
-                },
-            };
-        case 'id':
-        case 'supplierFk':
-        case 'supplierRef':
-        case 'serialNumber':
-        case 'serial':
-        case 'created':
-        case 'isBooked':
-            return { [`ii.${param}`]: value };
-        case 'account':
-        case 'fi':
-            return { [`s.${param}`]: value };
-        case 'awbCode':
-            return { 'awb.code': value };
-        case 'search':
-            return /^\d+$/.test(value)
-                ? { 'ii.id': value }
-                : { 's.name': { like: `%${value}%` } };
-        default:
-            return { [param]: value };
-    }
-};
 </script>
 
 <template>
@@ -70,7 +36,6 @@ const exprBuilder = (param, value) => {
                 url="InvoiceIns/filter"
                 order="issued DESC, id DESC"
                 auto-load
-                :expr-builder="exprBuilder"
             >
                 <template #body="{ rows }">
                     <CardList
diff --git a/src/pages/InvoiceIn/InvoiceInSearchbar.vue b/src/pages/InvoiceIn/InvoiceInSearchbar.vue
index 10703d25b..e1dc5242c 100644
--- a/src/pages/InvoiceIn/InvoiceInSearchbar.vue
+++ b/src/pages/InvoiceIn/InvoiceInSearchbar.vue
@@ -8,6 +8,7 @@ const { t } = useI18n();
         data-key="InvoiceInList"
         :label="t('Search invoice')"
         :info="t('Search invoices in by id or supplier fiscal name')"
+        custom-route-redirect-name="invoiceInList"
     />
 </template>
 <i18n>

From 9dc9162e8e64bc32dd0fd365561525653c5fa86d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 25 Jun 2024 09:50:44 +0200
Subject: [PATCH 05/63] fix: refs #7197 amount reactivity

---
 src/components/common/VnTitle.vue                | 2 +-
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue | 6 +++++-
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue    | 8 ++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/components/common/VnTitle.vue b/src/components/common/VnTitle.vue
index 29b4059f8..1fbd43972 100644
--- a/src/components/common/VnTitle.vue
+++ b/src/components/common/VnTitle.vue
@@ -7,7 +7,7 @@ defineProps({
 </script>
 <template>
     <div :class="$q.screen.gt.md ? 'q-pb-lg' : 'q-pb-md'">
-        <div class="header-link">
+        <div class="header-link" :style="{ cursor: url ? 'pointer' : 'default' }">
             <a :href="url" :class="url ? 'link' : 'color-vn-text'">
                 {{ text }}
                 <QIcon v-if="url" :name="icon" />
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index b79bf556d..0fd46d514 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -132,7 +132,11 @@ onBeforeMount(async () => {
 onBeforeRouteUpdate(async (to, from) => {
     invoiceInCorrection.correcting.length = 0;
     invoiceInCorrection.corrected = null;
-    if (to.params.id !== from.params.id) await setInvoiceCorrection(to.params.id);
+    if (to.params.id !== from.params.id) {
+        await setInvoiceCorrection(to.params.id);
+        const { data } = await axios.get(`InvoiceIns/${to.params.id}/getTotals`);
+        totalAmount.value = data.totalDueDay;
+    }
 });
 
 async function setInvoiceCorrection(id) {
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 428e7a7a1..8b20b7a92 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -287,10 +287,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
             </QCard>
             <QCard class="vn-one">
                 <QCardSection class="q-pa-none">
-                    <VnTitle
-                        :url="getLink('basic-data')"
-                        :text="t('invoiceIn.pageTitles.basicData')"
-                    />
+                    <VnTitle :text="t('invoiceIn.pageTitles.basicData')" />
                 </QCardSection>
                 <QCardSection class="q-pa-none">
                     <VnLv
@@ -423,6 +420,9 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
 .bg {
     background-color: var(--vn-accent-color);
 }
+.q-chip {
+    color: var(--vn-text-color);
+}
 @media (min-width: $breakpoint-md) {
     .summaryBody {
         .vat {

From 2cb6d21adef7456b22ed097e3fdd7aad0697aeef Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 26 Jun 2024 11:47:14 +0200
Subject: [PATCH 06/63] feat: refs #7197 add correcting filter

---
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue |  3 +++
 src/pages/InvoiceIn/InvoiceInFilter.vue          | 14 ++++++++++++--
 src/pages/InvoiceIn/InvoiceInList.vue            |  4 ++--
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 0fd46d514..fd58b6f89 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -478,6 +478,9 @@ const createInvoiceInCorrection = async () => {
     .q-card {
         max-width: 45em;
     }
+    .q-field:nth-child(1) {
+        padding-bottom: 20px;
+    }
 }
 
 @media (max-width: $breakpoint-xs) {
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 32cd4f027..e1218c446 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -103,6 +103,14 @@ const suppliers = ref([]);
                         toggle-indeterminate
                     />
                 </QItemSection>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.correctingFk')"
+                        v-model="params.correctingFk"
+                        @update:model-value="searchFn()"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
             </QItem>
             <QExpansionItem :label="t('More options')" expand-separator>
                 <QItem>
@@ -156,10 +164,11 @@ en:
         serial: Serial
         account: Ledger account
         isBooked: is booked
-        correctedFk: Rectificatives
+        correctedFk: Rectified
         issued: Issued
         to: To
         awbCode: AWB
+        correctingFk: Rectificative
 es:
     params:
         search: Id o nombre proveedor
@@ -176,7 +185,8 @@ es:
         account: Cuenta contable
         created: Creada
         dued: Vencida
-        correctedFk: Rectificativas
+        correctedFk: Rectificada
+        correctingFk: Rectificativa
     From: Desde
     To: Hasta
     Amount: Importe
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 089bc776f..192d0ccc7 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -39,8 +39,8 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             >
                 <template #body="{ rows }">
                     <CardList
-                        v-for="row of rows"
-                        :key="row.id"
+                        v-for="(row, index) of rows"
+                        :key="index"
                         :title="row.supplierRef"
                         @click="$router.push({ path: `/invoice-in/${row.id}` })"
                         :id="row.id"

From f2b8217883f51eb72bd997c8509481d88ade7534 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 1 Jul 2024 13:50:29 +0200
Subject: [PATCH 07/63] fix: refs #7197 rollback

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

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 76de49e6c..7bdf2ac3a 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -67,6 +67,10 @@ const $props = defineProps({
         default: '',
         description: 'It is used for redirect on click "save and continue"',
     },
+    hasSubtoolbar: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const isLoading = ref(false);
@@ -312,7 +316,7 @@ watch(formUrl, async () => {
         </template>
     </VnPaginate>
     <SkeletonTable v-if="!formData" />
-    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
+    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubtoolbar">
         <QBtnGroup push style="column-gap: 10px">
             <slot name="moreBeforeActions" />
             <QBtn

From f1323ad2c4391b1c3e2eaf96977dc4fe1ec64a25 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 1 Jul 2024 14:20:30 +0200
Subject: [PATCH 08/63] fix: refs #7197 add url InvoiceInSearchbar

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

diff --git a/src/pages/InvoiceIn/InvoiceInSearchbar.vue b/src/pages/InvoiceIn/InvoiceInSearchbar.vue
index e1dc5242c..f2731b005 100644
--- a/src/pages/InvoiceIn/InvoiceInSearchbar.vue
+++ b/src/pages/InvoiceIn/InvoiceInSearchbar.vue
@@ -8,7 +8,7 @@ const { t } = useI18n();
         data-key="InvoiceInList"
         :label="t('Search invoice')"
         :info="t('Search invoices in by id or supplier fiscal name')"
-        custom-route-redirect-name="invoiceInList"
+        url="InvoiceIns/filter"
     />
 </template>
 <i18n>

From 8f11c82185cf8a74cb62488716975e02599192f2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 3 Jul 2024 17:14:28 +0200
Subject: [PATCH 09/63] feat: refs #7197 summary responsive

---
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 31 +++++++++++++++++--
 1 file changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index e26ed2b1e..939fc20aa 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -66,7 +66,7 @@ const vatColumns = ref([
         field: (row) => taxRate(row.taxableBase, row.taxTypeSage?.rate),
         format: (value) => toCurrency(value, currency.value),
         sortable: true,
-        align: 'center',
+        align: 'left',
     },
     {
         name: 'currency',
@@ -339,6 +339,16 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                             </QTh>
                         </QTr>
                     </template>
+                    <template #body-cell-transaction="{ value: transactionCell }">
+                        <QTd :title="transactionCell">
+                            {{ transactionCell }}
+                        </QTd>
+                    </template>
+                    <template #body-cell-vat="{ value: vatCell }">
+                        <QTd :title="vatCell">
+                            {{ vatCell }}
+                        </QTd>
+                    </template>
                     <template #bottom-row>
                         <QTr class="bg">
                             <QTd></QTd>
@@ -347,7 +357,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                             }}</QTd>
                             <QTd></QTd>
                             <QTd></QTd>
-                            <QTd class="text-center">{{
+                            <QTd>{{
                                 toCurrency(getTotalTax(entity.invoiceInTax, currency))
                             }}</QTd>
                             <QTd></QTd>
@@ -420,13 +430,28 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
     </CardSummary>
 </template>
 <style lang="scss" scoped>
+.vat {
+    :deep(td:nth-child(3)),
+    :deep(td:nth-child(4)) {
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+    :deep(td:nth-child(3)) {
+        max-width: 150px;
+    }
+    :deep(td:nth-child(4)) {
+        max-width: 200px;
+    }
+}
+
 .bg {
     background-color: var(--vn-accent-color);
 }
 .q-chip {
     color: var(--vn-text-color);
 }
-@media (min-width: $breakpoint-md) {
+
+@media (min-width: $breakpoint-lg) {
     .summaryBody {
         .vat {
             flex: 65%;

From 239b34eac0d21fa0cc6474e1b1e66acb242dfd73 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 4 Jul 2024 12:20:47 +0200
Subject: [PATCH 10/63] chore: refs #7197 fix test

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

diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js
index 14c09176e..78bc31f56 100644
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@@ -1,7 +1,7 @@
 describe('WagonTypeCreate', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
-        cy.login('customer');
+        cy.login('supplier');
         cy.visit(`/#/entry/my`, {
             onBeforeLoad(win) {
                 cy.stub(win, 'open');

From 35fe28fff13305041a780ddb67df8d342b96d701 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 4 Jul 2024 13:11:04 +0200
Subject: [PATCH 11/63] feat: refs #7197 add supplier activities filter option

---
 src/pages/InvoiceIn/InvoiceInFilter.vue | 30 ++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index e1218c446..5e91ea6dd 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -7,13 +7,19 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnCurrency from 'src/components/common/VnCurrency.vue';
+import FetchData from 'components/FetchData.vue';
 
 const { t } = useI18n();
 defineProps({ dataKey: { type: String, required: true } });
-const suppliers = ref([]);
+const activities = ref([]);
 </script>
 
 <template>
+    <FetchData
+        url="SupplierActivities"
+        auto-load
+        @on-fetch="(data) => (activities = data)"
+    />
     <VnFilterPanel :data-key="dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -51,13 +57,11 @@ const suppliers = ref([]);
                         :label="t('params.supplierFk')"
                         option-value="id"
                         option-label="nickname"
-                        :options="suppliers"
                         dense
                         outlined
                         rounded
                         :filter-options="['id', 'name']"
-                    >
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -94,7 +98,21 @@ const suppliers = ref([]);
                     />
                 </QItemSection>
             </QItem>
-            <QItem class="q-mb-md">
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        :label="t('params.supplierActivityFk')"
+                        v-model="params.supplierActivityFk"
+                        dense
+                        outlined
+                        rounded
+                        option-value="code"
+                        option-label="name"
+                        :options="activities"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem c>
                 <QItemSection>
                     <QCheckbox
                         :label="t('params.isBooked')"
@@ -169,6 +187,7 @@ en:
         to: To
         awbCode: AWB
         correctingFk: Rectificative
+        supplierActivityFk: Supplier activity
 es:
     params:
         search: Id o nombre proveedor
@@ -187,6 +206,7 @@ es:
         dued: Vencida
         correctedFk: Rectificada
         correctingFk: Rectificativa
+        supplierActivityFk: Actividad proveedor
     From: Desde
     To: Hasta
     Amount: Importe

From 4d6e2e277401d04e02e9344f407593dfd6d3509a Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 4 Jul 2024 13:12:06 +0200
Subject: [PATCH 12/63] chore: refs #7197 drop useless attr

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

diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index 5e91ea6dd..52ea55204 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -112,7 +112,7 @@ const activities = ref([]);
                     />
                 </QItemSection>
             </QItem>
-            <QItem c>
+            <QItem>
                 <QItemSection>
                     <QCheckbox
                         :label="t('params.isBooked')"

From 8957141222e68840b12c32011b275d745062a56f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 4 Jul 2024 13:56:16 +0200
Subject: [PATCH 13/63] fix: refs #7197 responsive summary layout

---
 src/css/app.scss                              |  5 ++++
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 29 +++++--------------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index 27ed65534..3789b000e 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -151,6 +151,11 @@ select:-webkit-autofill {
     background-color: var(--vn-section-color);
 }
 
+.q-table td[shrink] {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    max-width: 80px;
+}
 .tr-header {
     color: var(--vn-label-color);
 }
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 939fc20aa..2f30537d1 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -30,6 +30,7 @@ const vatColumns = ref([
         field: (row) => row.expenseFk,
         sortable: true,
         align: 'left',
+        classes: 'expand',
     },
     {
         name: 'landed',
@@ -339,14 +340,14 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                             </QTh>
                         </QTr>
                     </template>
-                    <template #body-cell-transaction="{ value: transactionCell }">
-                        <QTd :title="transactionCell">
-                            {{ transactionCell }}
+                    <template #body-cell-vat="{ value: vatCell }">
+                        <QTd :title="vatCell" shrink>
+                            {{ vatCell }}
                         </QTd>
                     </template>
-                    <template #body-cell-vat="{ value: vatCell }">
-                        <QTd :title="vatCell">
-                            {{ vatCell }}
+                    <template #body-cell-transaction="{ value: transactionCell }">
+                        <QTd :title="transactionCell" shrink>
+                            {{ transactionCell }}
                         </QTd>
                     </template>
                     <template #bottom-row>
@@ -430,20 +431,6 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
     </CardSummary>
 </template>
 <style lang="scss" scoped>
-.vat {
-    :deep(td:nth-child(3)),
-    :deep(td:nth-child(4)) {
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-    :deep(td:nth-child(3)) {
-        max-width: 150px;
-    }
-    :deep(td:nth-child(4)) {
-        max-width: 200px;
-    }
-}
-
 .bg {
     background-color: var(--vn-accent-color);
 }
@@ -451,7 +438,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
     color: var(--vn-text-color);
 }
 
-@media (min-width: $breakpoint-lg) {
+@media (min-width: $breakpoint-md) {
     .summaryBody {
         .vat {
             flex: 65%;

From cc203022d2a40843b6b2e5aa0359e34afb0e29ed Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 4 Jul 2024 17:31:40 +0200
Subject: [PATCH 14/63] chore: refs #7197 fix unit tests

---
 src/css/app.scss      | 1 +
 test/vitest/helper.js | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/css/app.scss b/src/css/app.scss
index 3789b000e..17597634a 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -156,6 +156,7 @@ select:-webkit-autofill {
     overflow: hidden;
     max-width: 80px;
 }
+
 .tr-header {
     color: var(--vn-label-color);
 }
diff --git a/test/vitest/helper.js b/test/vitest/helper.js
index d6721d817..686e36fe5 100644
--- a/test/vitest/helper.js
+++ b/test/vitest/helper.js
@@ -6,6 +6,7 @@ import { i18n } from 'src/boot/i18n';
 import { Notify, Dialog } from 'quasar';
 import axios from 'axios';
 import * as useValidator from 'src/composables/useValidator';
+import { onBeforeRouteLeave } from 'vue-router';
 
 installQuasarPlugin({
     plugins: {
@@ -38,6 +39,7 @@ vi.mock('vue-router', () => ({
         meta: { moduleName: 'mockName' },
         path: 'mockSection/list',
     }),
+    onBeforeRouteLeave: () => {},
 }));
 
 vi.mock('axios');

From 6fd49691d6bc4404b3c408c1d1429b1f88393b75 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 4 Jul 2024 17:32:50 +0200
Subject: [PATCH 15/63] chore: refs #7197 remove unused import

---
 test/vitest/helper.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/vitest/helper.js b/test/vitest/helper.js
index 686e36fe5..e201535ec 100644
--- a/test/vitest/helper.js
+++ b/test/vitest/helper.js
@@ -6,7 +6,6 @@ import { i18n } from 'src/boot/i18n';
 import { Notify, Dialog } from 'quasar';
 import axios from 'axios';
 import * as useValidator from 'src/composables/useValidator';
-import { onBeforeRouteLeave } from 'vue-router';
 
 installQuasarPlugin({
     plugins: {

From 9e448963059c0d19f9b218ea2ad30c80989106a5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 5 Jul 2024 15:41:53 +0200
Subject: [PATCH 16/63] chore: refs #7197 fix tests

---
 .../InvoiceIn/Card/InvoiceInIntrastat.vue     |  2 +-
 .../invoiceIn/invoiceInCorrective.spec.js     |  7 +++++-
 .../invoiceIn/invoiceInIntrastat.spec.js      | 22 +++++++++++--------
 .../invoiceIn/invoiceInVat.spec.js            |  4 +---
 test/cypress/support/commands.js              |  9 +++++---
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 9f39e6e0e..3e4d7d615 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -72,7 +72,7 @@ const columns = computed(() => [
 ]);
 
 const getTotal = (data, key) =>
-    data.reduce((acc, cur) => acc + +String(cur[key]).replace(',', '.'), 0);
+    data.reduce((acc, cur) => acc + +String(cur[key] || 0).replace(',', '.'), 0);
 
 const formatOpt = (row, { model, options }, prop) => {
     const obj = row[model];
diff --git a/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js b/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
index 7863d6bfa..6a8c847b9 100644
--- a/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
@@ -8,12 +8,17 @@ describe('InvoiceInCorrective', () => {
     it('should create a correcting invoice', () => {
         cy.viewport(1280, 720);
         cy.login('developer');
-        cy.visit(`/#/invoice-in/1/summary?limit=10`);
+        cy.visit(`/#/invoice-in/1/summary`);
+        cy.intercept('POST', '/api/InvoiceIns/corrective').as('corrective');
 
         cy.openActionsDescriptor();
 
         cy.get(createRectificative).click();
         cy.get(saveDialog).click();
+        cy.wait('@corrective').then((interception) => {
+            const correctingId = interception.response.body;
+            cy.url().should('include', `/invoice-in/${correctingId}/summary`);
+        });
         cy.get(rectificativeSection).click();
         cy.get('tbody > tr:visible').should('have.length', 1);
     });
diff --git a/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js b/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js
index c87fd4315..a297a60f4 100644
--- a/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInIntrastat.spec.js
@@ -11,25 +11,29 @@ describe('InvoiceInIntrastat', () => {
 
     it('should edit the first line', () => {
         cy.selectOption(firstLineCode, 'Plantas vivas: Esqueje/injerto, Vid');
-
         cy.get(inputBtns).eq(1).click();
-
         cy.saveCard();
-        cy.visit(`/#/invoice-in/1/intrastat`);
-
-        cy.getValue(firstLineCode).should('equal', 'Plantas vivas: Esqueje/injerto, Vid');
+        cy.get(`${firstLineCode} span`).should(
+            'have.text',
+            '6021010:Plantas vivas: Esqueje/injerto, Vid'
+        );
     });
 
     it('should add a new row', () => {
-        const rowData = [false, 'Plantas vivas: Esqueje/injerto, Vid', 30, 10, 5, 'FR'];
-
         cy.addRow();
-        cy.fillRow(thirdRow, rowData);
+        cy.fillRow(thirdRow, [
+            false,
+            'Plantas vivas: Esqueje/injerto, Vid',
+            30,
+            10,
+            5,
+            'FR',
+        ]);
         cy.saveCard();
         cy.get('.q-notification__message').should('have.text', 'Data saved');
     });
 
     it('should remove the first line', () => {
-        cy.removeRow(2);
+        cy.removeRow(1);
     });
 });
diff --git a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
index 63e99eac1..932aca96d 100644
--- a/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInVat.spec.js
@@ -16,9 +16,7 @@ describe('InvoiceInVat', () => {
     it('should edit the sage iva', () => {
         cy.selectOption(firstLineVat, 'H.P. IVA 21% CEE');
         cy.saveCard();
-        cy.visit(`/#/invoice-in/1/vat`);
-
-        cy.getValue(firstLineVat).should('equal', '8');
+        cy.get(`${firstLineVat} span`).should('have.text', '8:H.P. IVA 21% CEE');
     });
 
     it('should add a new row', () => {
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 38a23f71c..fbb07daf6 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -191,11 +191,14 @@ Cypress.Commands.add('validateRow', (rowSelector, expectedValues) => {
 });
 
 Cypress.Commands.add('removeRow', (rowIndex) => {
+    const trEls = 'tbody > tr:visible';
     let rowsBefore;
-    cy.get('tbody > tr:visible')
+    cy.get('tbody > tr')
         .its('length')
         .then((length) => {
-            cy.get('.q-checkbox').eq(rowIndex).click();
+            cy.get(`${trEls} .q-checkbox`)
+                .eq(rowIndex - 1)
+                .click();
             cy.removeCard();
             cy.get('.q-dialog button').eq(2).click();
             rowsBefore = length;
@@ -204,7 +207,7 @@ Cypress.Commands.add('removeRow', (rowIndex) => {
             // Check the existence of tbody before performing the second assertion.
             cy.get('tbody').then(($tbody) => {
                 if ($tbody.length > 0)
-                    cy.get('tbody > tr:visible').should('have.length', rowsBefore - 1);
+                    cy.get('tbody > tr').should('have.length', rowsBefore - 1);
             });
         });
 });

From 3dd2745dde75d1c179b3d6e9f663a0f363321b91 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 5 Jul 2024 15:56:57 +0200
Subject: [PATCH 17/63] fix: refs #7197 rollback crudModel

---
 src/components/CrudModel.vue | 39 +++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index bd32972da..9fc249380 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -10,7 +10,6 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import SkeletonTable from 'components/ui/SkeletonTable.vue';
 import { tMobile } from 'src/composables/tMobile';
-import VnSubToolbar from './ui/VnSubToolbar.vue';
 
 const { push } = useRouter();
 const quasar = useQuasar();
@@ -68,7 +67,7 @@ const $props = defineProps({
         default: '',
         description: 'It is used for redirect on click "save and continue"',
     },
-    hasSubToolbar: {
+    hasSubtoolbar: {
         type: Boolean,
         default: true,
     },
@@ -80,6 +79,7 @@ const originalData = ref();
 const vnPaginateRef = ref();
 const formData = ref();
 const saveButtonRef = ref(null);
+const watchChanges = ref();
 const formUrl = computed(() => $props.url);
 
 const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
@@ -94,6 +94,7 @@ defineExpose({
     saveChanges,
     getChanges,
     formData,
+    vnPaginateRef,
 });
 
 onBeforeRouteLeave((to, from, next) => {
@@ -115,19 +116,26 @@ async function fetch(data) {
         data.map((d) => (d.$index = $index++));
     }
 
-    originalData.value = data && JSON.parse(JSON.stringify(data));
-    formData.value = data && JSON.parse(JSON.stringify(data));
-    watch(formData, () => (hasChanges.value = true), { deep: true });
+    resetData(data);
 
     emit('onFetch', data);
     return data;
 }
 
+function resetData(data) {
+    if (!data) return;
+    originalData.value = JSON.parse(JSON.stringify(data));
+    formData.value = JSON.parse(JSON.stringify(data));
+
+    if (watchChanges.value) watchChanges.value(); //destoy watcher
+    watchChanges.value = watch(formData, () => (hasChanges.value = true), { deep: true });
+}
+
 async function reset() {
     await fetch(originalData.value);
     hasChanges.value = false;
 }
-// eslint-disable-next-line vue/no-dupe-keys
+
 function filter(value, update, filterOptions) {
     update(
         () => {
@@ -153,7 +161,7 @@ async function onSubmit() {
     await saveChanges($props.saveFn ? formData.value : null);
 }
 
-async function onSubmitAndGo() {
+async function onSumbitAndGo() {
     await onSubmit();
     push({ path: $props.goTo });
 }
@@ -289,8 +297,9 @@ function isEmpty(obj) {
     if (obj.length > 0) return false;
 }
 
-async function reload() {
-    vnPaginateRef.value.fetch();
+async function reload(params) {
+    const data = await vnPaginateRef.value.fetch(params);
+    fetch(data);
 }
 
 watch(formUrl, async () => {
@@ -302,10 +311,11 @@ watch(formUrl, async () => {
     <VnPaginate
         :url="url"
         :limit="limit"
-        v-bind="$attrs"
         @on-fetch="fetch"
+        @on-change="resetData"
         :skeleton="false"
         ref="vnPaginateRef"
+        v-bind="$attrs"
     >
         <template #body v-if="formData">
             <slot
@@ -316,11 +326,8 @@ watch(formUrl, async () => {
             ></slot>
         </template>
     </VnPaginate>
-    <SkeletonTable
-        v-if="!formData && $attrs.autoLoad"
-        :columns="$attrs.columns?.length"
-    />
-    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
+    <SkeletonTable v-if="!formData" :columns="$attrs.columns?.length" />
+    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubtoolbar">
         <QBtnGroup push style="column-gap: 10px">
             <slot name="moreBeforeActions" />
             <QBtn
@@ -345,7 +352,7 @@ watch(formUrl, async () => {
             />
             <QBtnDropdown
                 v-if="$props.goTo && $props.defaultSave"
-                @click="onSubmitAndGo"
+                @click="onSumbitAndGo"
                 :label="tMobile('globals.saveAndContinue')"
                 :title="t('globals.saveAndContinue')"
                 :disable="!hasChanges"

From 904fbae251b48e6ad673dbb38704de08b4170aaf Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 5 Jul 2024 15:58:08 +0200
Subject: [PATCH 18/63] fix: refs #7197 rollback crudModel

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

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 9fc249380..4f90159be 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -67,7 +67,7 @@ const $props = defineProps({
         default: '',
         description: 'It is used for redirect on click "save and continue"',
     },
-    hasSubtoolbar: {
+    hasSubToolbar: {
         type: Boolean,
         default: true,
     },

From 6de7696fd13cc3897a0d8782a7ede0cae3559b05 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 5 Jul 2024 16:00:37 +0200
Subject: [PATCH 19/63] fix: refs #7197 rollback crudModel

---
 src/components/CrudModel.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 4f90159be..9c8d6472d 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -161,7 +161,7 @@ async function onSubmit() {
     await saveChanges($props.saveFn ? formData.value : null);
 }
 
-async function onSumbitAndGo() {
+async function onSubmitAndGo() {
     await onSubmit();
     push({ path: $props.goTo });
 }
@@ -326,8 +326,11 @@ watch(formUrl, async () => {
             ></slot>
         </template>
     </VnPaginate>
-    <SkeletonTable v-if="!formData" :columns="$attrs.columns?.length" />
-    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubtoolbar">
+    <SkeletonTable
+        v-if="!formData && $attrs.autoLoad"
+        :columns="$attrs.columns?.length"
+    />
+    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
         <QBtnGroup push style="column-gap: 10px">
             <slot name="moreBeforeActions" />
             <QBtn
@@ -352,7 +355,7 @@ watch(formUrl, async () => {
             />
             <QBtnDropdown
                 v-if="$props.goTo && $props.defaultSave"
-                @click="onSumbitAndGo"
+                @click="onSubmitAndGo"
                 :label="tMobile('globals.saveAndContinue')"
                 :title="t('globals.saveAndContinue')"
                 :disable="!hasChanges"

From a0ccb239b1f8a4a3e5ccdb475dabbfb87afc7e21 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 5 Jul 2024 16:25:49 +0200
Subject: [PATCH 20/63] chore: refs #7197 improve form filling in Cypress tests

---
 test/cypress/support/commands.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index fbb07daf6..f6ab723a7 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -101,6 +101,7 @@ Cypress.Commands.add('fillInForm', (obj, form = '.q-form > .q-card') => {
                     case 'select':
                         cy.wrap(el).type(val);
                         cy.get('.q-menu .q-item').contains(val).click();
+                        cy.get('body').click();
                         break;
                     case 'date':
                         cy.wrap(el).click();

From 4b709caf42c5cfa3b1a3ba844959149fa93004aa Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 5 Jul 2024 16:32:49 +0200
Subject: [PATCH 21/63] chore: refs #7197 idrop useless class

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

diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 2f30537d1..5973913b2 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -30,7 +30,6 @@ const vatColumns = ref([
         field: (row) => row.expenseFk,
         sortable: true,
         align: 'left',
-        classes: 'expand',
     },
     {
         name: 'landed',

From 028ae0b9acfa63ae74e843fb33c7939b3af2c4d1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 5 Jul 2024 16:44:17 +0200
Subject: [PATCH 22/63] chore: refs #7197 drop space

---
 src/pages/InvoiceIn/Card/InvoiceInVat.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index bed28b7ce..63a84b855 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -69,7 +69,6 @@ const columns = computed(() => [
         model: 'taxTypeSageFk',
         optionValue: 'id',
         optionLabel: 'id',
-
         sortable: true,
         tabindex: 3,
         align: 'left',

From ae5ec1328b5fdf9087d9900b8df2c2ff3d357b2c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 24 Jul 2024 19:55:13 +0200
Subject: [PATCH 23/63] hotFix: myEntries

---
 src/pages/Entry/MyEntries.vue | 47 ++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 45990235d..bd9c620a4 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -65,7 +65,6 @@ const columns = computed(() => [
     {
         align: 'right',
         name: 'tableActions',
-        computed,
         actions: [
             {
                 title: t('printBuys'),
@@ -87,35 +86,31 @@ const printBuys = (rowId) => {
 </script>
 <template>
     <VnSearchbar
-        data-key="EntryList"
+        data-key="myEntriesList"
         url="Entries/filter"
         :label="t('Search entries')"
         :info="t('You can search by entry reference')"
     />
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnTable
-                ref="myEntriesRef"
-                data-key="myEntriesList"
-                url="Entries/filter"
-                :columns="columns"
-                default-mode="card"
-                auto-load
-                :right-search="true"
-            >
-                <template #moreFilterPanel="{ params }">
-                    <VnInput
-                        :label="t('globals.daysOnward')"
-                        v-model="params.days"
-                        class="q-px-xs row"
-                        dense
-                        filled
-                        outlined
-                    ></VnInput>
-                </template>
-            </VnTable>
-        </div>
-    </QPage>
+    <VnTable
+        ref="myEntriesRef"
+        data-key="myEntriesList"
+        url="Entries/filter"
+        :columns="columns"
+        default-mode="card"
+        :right-search="true"
+        auto-load
+    >
+        <template #moreFilterPanel="{ params }">
+            <VnInput
+                :label="t('globals.daysOnward')"
+                v-model="params.days"
+                class="q-px-xs row"
+                dense
+                filled
+                outlined
+            ></VnInput>
+        </template>
+    </VnTable>
 </template>
 
 <i18n>

From 3023d83739d061a54bdfd0f98e2b2c8da0b7ea8d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 24 Jul 2024 20:00:02 +0200
Subject: [PATCH 24/63] hotFix: myEntries

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

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index bd9c620a4..640529a91 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -1,22 +1,16 @@
 <script setup>
-import { computed, onMounted } from 'vue';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters/index';
 import { useQuasar } from 'quasar';
 import EntryBuysTableDialog from './EntryBuysTableDialog.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
-const stateStore = useStateStore();
 const { t } = useI18n();
 const quasar = useQuasar();
 
-onMounted(async () => {
-    stateStore.rightDrawer = true;
-});
-
 const columns = computed(() => [
     {
         align: 'left',

From 64a62ca20875e4fe6f37ebcdf0284720cb410b57 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 24 Jul 2024 20:10:18 +0200
Subject: [PATCH 25/63] hotFix: try to fix myEntries

---
 src/pages/Entry/MyEntries.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 640529a91..29bebe440 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { toDate } from 'src/filters/index';
 import { useQuasar } from 'quasar';
-import EntryBuysTableDialog from './EntryBuysTableDialog.vue';
+// import EntryBuysTableDialog from './EntryBuysTableDialog.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
@@ -69,14 +69,14 @@ const columns = computed(() => [
     },
 ]);
 
-const printBuys = (rowId) => {
-    quasar.dialog({
-        component: EntryBuysTableDialog,
-        componentProps: {
-            id: rowId,
-        },
-    });
-};
+// const printBuys = (rowId) => {
+//     quasar.dialog({
+//         component: EntryBuysTableDialog,
+//         componentProps: {
+//             id: rowId,
+//         },
+//     });
+// };
 </script>
 <template>
     <VnSearchbar

From 3d6ba060c259790a7fd41cb4f998fe284fc19722 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 24 Jul 2024 20:10:50 +0200
Subject: [PATCH 26/63] hotFix: try to fix myEntries

---
 src/pages/Entry/MyEntries.vue | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 29bebe440..ce3ca029e 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -56,17 +56,17 @@ const columns = computed(() => [
         cardVisible: true,
         create: false,
     },
-    {
-        align: 'right',
-        name: 'tableActions',
-        actions: [
-            {
-                title: t('printBuys'),
-                icon: 'print',
-                action: (row) => printBuys(row.id),
-            },
-        ],
-    },
+    // {
+    //     align: 'right',
+    //     name: 'tableActions',
+    //     actions: [
+    //         {
+    //             title: t('printBuys'),
+    //             icon: 'print',
+    //             // action: (row) => printBuys(row.id),
+    //         },
+    //     ],
+    // },
 ]);
 
 // const printBuys = (rowId) => {

From 68c4c93f9fad5c588de3d2e8f84e5834c919f742 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 24 Jul 2024 20:14:45 +0200
Subject: [PATCH 27/63] hotFix: try to fix myEntries

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

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index ce3ca029e..6b5d9410f 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -91,10 +91,9 @@ const columns = computed(() => [
         url="Entries/filter"
         :columns="columns"
         default-mode="card"
-        :right-search="true"
         auto-load
     >
-        <template #moreFilterPanel="{ params }">
+        <!-- <template #moreFilterPanel="{ params }">
             <VnInput
                 :label="t('globals.daysOnward')"
                 v-model="params.days"
@@ -103,7 +102,7 @@ const columns = computed(() => [
                 filled
                 outlined
             ></VnInput>
-        </template>
+        </template> -->
     </VnTable>
 </template>
 

From 369736f362b774fef8fb85fb5889140b9923f20a Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 24 Jul 2024 20:17:23 +0200
Subject: [PATCH 28/63] hotFix: try to fix myEntries

---
 src/pages/Entry/MyEntries.vue | 42 +++++++++++++++++------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 6b5d9410f..b7bb951c9 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -35,27 +35,27 @@ const columns = computed(() => [
         },
         format: ({ shipped }) => toDate(shipped),
     },
-    {
-        align: 'left',
-        label: t('landed'),
-        name: 'landed',
-        isTitle: false,
-        create: true,
-        cardVisible: false,
-        component: 'date',
-        columnField: {
-            component: null,
-        },
-        format: ({ landed }) => toDate(landed),
-    },
-    {
-        align: 'left',
-        label: t('globals.wareHouseIn'),
-        name: 'warehouseInName',
-        isTitle: false,
-        cardVisible: true,
-        create: false,
-    },
+    // {
+    //     align: 'left',
+    //     label: t('landed'),
+    //     name: 'landed',
+    //     isTitle: false,
+    //     create: true,
+    //     cardVisible: false,
+    //     component: 'date',
+    //     columnField: {
+    //         component: null,
+    //     },
+    //     format: ({ landed }) => toDate(landed),
+    // },
+    // {
+    //     align: 'left',
+    //     label: t('globals.wareHouseIn'),
+    //     name: 'warehouseInName',
+    //     isTitle: false,
+    //     cardVisible: true,
+    //     create: false,
+    // },
     // {
     //     align: 'right',
     //     name: 'tableActions',

From 29299970f44fabdabc2d969f3fe397cc14baf3e9 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 24 Jul 2024 20:19:55 +0200
Subject: [PATCH 29/63] hotFix: try to fix myEntries

---
 src/pages/Entry/MyEntries.vue | 76 +++++++++++++++++------------------
 1 file changed, 37 insertions(+), 39 deletions(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index b7bb951c9..9750c3326 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -10,52 +10,51 @@ import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
-
 const columns = computed(() => [
-    {
-        align: 'left',
-        name: 'id',
-        label: t('customer.extendedList.tableVisibleColumns.id'),
-        chip: {
-            condition: () => true,
-        },
-        isId: true,
-        isTitle: false,
-    },
-    {
-        align: 'left',
-        label: t('shipped'),
-        name: 'shipped',
-        isTitle: false,
-        create: true,
-        cardVisible: true,
-        component: 'date',
-        columnField: {
-            component: null,
-        },
-        format: ({ shipped }) => toDate(shipped),
-    },
     // {
     //     align: 'left',
-    //     label: t('landed'),
-    //     name: 'landed',
+    //     name: 'id',
+    //     label: t('customer.extendedList.tableVisibleColumns.id'),
+    //     chip: {
+    //         condition: () => true,
+    //     },
+    //     isId: true,
+    //     isTitle: false,
+    // },
+    // {
+    //     align: 'left',
+    //     label: t('shipped'),
+    //     name: 'shipped',
     //     isTitle: false,
     //     create: true,
-    //     cardVisible: false,
+    //     cardVisible: true,
     //     component: 'date',
     //     columnField: {
     //         component: null,
     //     },
-    //     format: ({ landed }) => toDate(landed),
-    // },
-    // {
-    //     align: 'left',
-    //     label: t('globals.wareHouseIn'),
-    //     name: 'warehouseInName',
-    //     isTitle: false,
-    //     cardVisible: true,
-    //     create: false,
+    //     format: ({ shipped }) => toDate(shipped),
     // },
+    {
+        align: 'left',
+        label: t('landed'),
+        name: 'landed',
+        isTitle: false,
+        create: true,
+        cardVisible: false,
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: ({ landed }) => toDate(landed),
+    },
+    {
+        align: 'left',
+        label: t('globals.wareHouseIn'),
+        name: 'warehouseInName',
+        isTitle: false,
+        cardVisible: true,
+        create: false,
+    },
     // {
     //     align: 'right',
     //     name: 'tableActions',
@@ -79,14 +78,13 @@ const columns = computed(() => [
 // };
 </script>
 <template>
-    <VnSearchbar
+    <!-- <VnSearchbar
         data-key="myEntriesList"
         url="Entries/filter"
         :label="t('Search entries')"
         :info="t('You can search by entry reference')"
-    />
+    /> -->
     <VnTable
-        ref="myEntriesRef"
         data-key="myEntriesList"
         url="Entries/filter"
         :columns="columns"

From f88ec2a2ae934333f3b0c980ddf37703717d148b Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 24 Jul 2024 20:22:31 +0200
Subject: [PATCH 30/63] hotFix: try to fix myEntries

---
 src/pages/Entry/MyEntries.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 9750c3326..d432c3272 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -78,12 +78,12 @@ const columns = computed(() => [
 // };
 </script>
 <template>
-    <!-- <VnSearchbar
+    <VnSearchbar
         data-key="myEntriesList"
         url="Entries/filter"
         :label="t('Search entries')"
         :info="t('You can search by entry reference')"
-    /> -->
+    />
     <VnTable
         data-key="myEntriesList"
         url="Entries/filter"

From c904f7f88bd5a39c42592440d5f1211331785deb Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 24 Jul 2024 20:25:46 +0200
Subject: [PATCH 31/63] hotFix: try to fix myEntries

---
 src/pages/Entry/MyEntries.vue | 68 ++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 37 deletions(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index d432c3272..4db1ff690 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { toDate } from 'src/filters/index';
 import { useQuasar } from 'quasar';
-// import EntryBuysTableDialog from './EntryBuysTableDialog.vue';
+import EntryBuysTableDialog from './EntryBuysTableDialog.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
@@ -21,25 +21,21 @@ const columns = computed(() => [
     //     isId: true,
     //     isTitle: false,
     // },
-    // {
-    //     align: 'left',
-    //     label: t('shipped'),
-    //     name: 'shipped',
-    //     isTitle: false,
-    //     create: true,
-    //     cardVisible: true,
-    //     component: 'date',
-    //     columnField: {
-    //         component: null,
-    //     },
-    //     format: ({ shipped }) => toDate(shipped),
-    // },
+    {
+        align: 'left',
+        label: t('shipped'),
+        name: 'shipped',
+        cardVisible: true,
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: ({ shipped }) => toDate(shipped),
+    },
     {
         align: 'left',
         label: t('landed'),
         name: 'landed',
-        isTitle: false,
-        create: true,
         cardVisible: false,
         component: 'date',
         columnField: {
@@ -51,31 +47,29 @@ const columns = computed(() => [
         align: 'left',
         label: t('globals.wareHouseIn'),
         name: 'warehouseInName',
-        isTitle: false,
         cardVisible: true,
-        create: false,
     },
-    // {
-    //     align: 'right',
-    //     name: 'tableActions',
-    //     actions: [
-    //         {
-    //             title: t('printBuys'),
-    //             icon: 'print',
-    //             // action: (row) => printBuys(row.id),
-    //         },
-    //     ],
-    // },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('printBuys'),
+                icon: 'print',
+                action: (row) => printBuys(row.id),
+            },
+        ],
+    },
 ]);
 
-// const printBuys = (rowId) => {
-//     quasar.dialog({
-//         component: EntryBuysTableDialog,
-//         componentProps: {
-//             id: rowId,
-//         },
-//     });
-// };
+const printBuys = (rowId) => {
+    quasar.dialog({
+        component: EntryBuysTableDialog,
+        componentProps: {
+            id: rowId,
+        },
+    });
+};
 </script>
 <template>
     <VnSearchbar

From c926b047e2a6b6055f81a13874b7ad690cd8f008 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 24 Jul 2024 20:29:52 +0200
Subject: [PATCH 32/63] hotFix: try to fix myEntries

---
 src/pages/Entry/MyEntries.vue | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 4db1ff690..38c855b8e 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -19,18 +19,17 @@ const columns = computed(() => [
     //         condition: () => true,
     //     },
     //     isId: true,
-    //     isTitle: false,
     // },
     {
         align: 'left',
         label: t('shipped'),
         name: 'shipped',
-        cardVisible: true,
         component: 'date',
         columnField: {
             component: null,
         },
         format: ({ shipped }) => toDate(shipped),
+        cardVisible: true,
     },
     {
         align: 'left',
@@ -49,6 +48,12 @@ const columns = computed(() => [
         name: 'warehouseInName',
         cardVisible: true,
     },
+    {
+        align: 'left',
+        label: t('globals.daysOnward'),
+        name: 'days',
+        visible: false,
+    },
     {
         align: 'right',
         name: 'tableActions',
@@ -84,18 +89,7 @@ const printBuys = (rowId) => {
         :columns="columns"
         default-mode="card"
         auto-load
-    >
-        <!-- <template #moreFilterPanel="{ params }">
-            <VnInput
-                :label="t('globals.daysOnward')"
-                v-model="params.days"
-                class="q-px-xs row"
-                dense
-                filled
-                outlined
-            ></VnInput>
-        </template> -->
-    </VnTable>
+    />
 </template>
 
 <i18n>

From e3204e0ce38ba026af7303b25f7ac306493c84b2 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 24 Jul 2024 20:34:09 +0200
Subject: [PATCH 33/63] hotFix: try to fix myEntries

---
 src/pages/Entry/MyEntries.vue | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 38c855b8e..c51ba3771 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -6,20 +6,19 @@ import { toDate } from 'src/filters/index';
 import { useQuasar } from 'quasar';
 import EntryBuysTableDialog from './EntryBuysTableDialog.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
 const columns = computed(() => [
-    // {
-    //     align: 'left',
-    //     name: 'id',
-    //     label: t('customer.extendedList.tableVisibleColumns.id'),
-    //     chip: {
-    //         condition: () => true,
-    //     },
-    //     isId: true,
-    // },
+    {
+        align: 'left',
+        name: 'id',
+        label: t('customer.extendedList.tableVisibleColumns.id'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+    },
     {
         align: 'left',
         label: t('shipped'),
@@ -34,7 +33,7 @@ const columns = computed(() => [
     {
         align: 'left',
         label: t('landed'),
-        name: 'landed',
+        name: 'from',
         cardVisible: false,
         component: 'date',
         columnField: {

From 38de6867b721f40869ecb1b4cb528cc9bee8be80 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 24 Jul 2024 20:38:25 +0200
Subject: [PATCH 34/63] hotFix: try to fix myEntries

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

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index c51ba3771..8eced2c92 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -14,10 +14,7 @@ const columns = computed(() => [
         align: 'left',
         name: 'id',
         label: t('customer.extendedList.tableVisibleColumns.id'),
-        chip: {
-            condition: () => true,
-        },
-        isId: true,
+        isTitle: true,
     },
     {
         align: 'left',

From 80f34edb66a01b2bf63ebd1c0150c6efbcab87f2 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 24 Jul 2024 20:41:34 +0200
Subject: [PATCH 35/63] hotFix: try to fix myEntries

---
 src/pages/Entry/MyEntries.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 8eced2c92..07db3f859 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -13,8 +13,6 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'id',
-        label: t('customer.extendedList.tableVisibleColumns.id'),
-        isTitle: true,
     },
     {
         align: 'left',

From f18bc80c0ba00615aeacc2f8920563bf2c389643 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 24 Jul 2024 20:44:55 +0200
Subject: [PATCH 36/63] hotFix: try to fix myEntries

---
 src/pages/Entry/MyEntries.vue | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 07db3f859..aac5f6006 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -13,6 +13,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'id',
+        label: t('customer.extendedList.tableVisibleColumns.id'),
     },
     {
         align: 'left',
@@ -77,13 +78,7 @@ const printBuys = (rowId) => {
         :label="t('Search entries')"
         :info="t('You can search by entry reference')"
     />
-    <VnTable
-        data-key="myEntriesList"
-        url="Entries/filter"
-        :columns="columns"
-        default-mode="card"
-        auto-load
-    />
+    <VnTable data-key="myEntriesList" url="Entries/filter" :columns="columns" />
 </template>
 
 <i18n>

From 3dd6bf880293f1cb7334506154c0f573e956028c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 24 Jul 2024 20:48:05 +0200
Subject: [PATCH 37/63] hotFix: try to fix myEntries

---
 src/pages/Entry/MyEntries.vue | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index aac5f6006..20d24771b 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -14,14 +14,14 @@ const columns = computed(() => [
         align: 'left',
         name: 'id',
         label: t('customer.extendedList.tableVisibleColumns.id'),
+        columnFilter: false,
     },
     {
         align: 'left',
         label: t('shipped'),
         name: 'shipped',
-        component: 'date',
-        columnField: {
-            component: null,
+        columnFilter: {
+            component: 'date',
         },
         format: ({ shipped }) => toDate(shipped),
         cardVisible: true,
@@ -31,9 +31,8 @@ const columns = computed(() => [
         label: t('landed'),
         name: 'from',
         cardVisible: false,
-        component: 'date',
-        columnField: {
-            component: null,
+        columnFilter: {
+            component: 'date',
         },
         format: ({ landed }) => toDate(landed),
     },

From f0be377951b0c1eeb7e30b4ea2593f1a498651a8 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 24 Jul 2024 20:52:14 +0200
Subject: [PATCH 38/63] hotFix: try to fix myEntries

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

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 20d24771b..e100ed565 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -77,7 +77,7 @@ const printBuys = (rowId) => {
         :label="t('Search entries')"
         :info="t('You can search by entry reference')"
     />
-    <VnTable data-key="myEntriesList" url="Entries/filter" :columns="columns" />
+    <VnTable data-key="myEntriesList" url="Entries/filter" :columns="columns" auto-load />
 </template>
 
 <i18n>

From 687262e78c05a688a88967497dce6ce16ace52b5 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 25 Jul 2024 09:50:30 +0200
Subject: [PATCH 39/63] hotFix: try to fix myEntries

---
 src/components/VnTable/VnTable.vue | 5 -----
 src/pages/Entry/MyEntries.vue      | 1 -
 2 files changed, 6 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 686f56135..dead8a933 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -307,11 +307,6 @@ defineExpose({
                         :params="params"
                         :columns="splittedColumns.columns"
                     />
-                    <slot
-                        name="moreFilterPanel"
-                        :params="params"
-                        :columns="splittedColumns.columns"
-                    />
                 </template>
             </VnFilterPanel>
         </QScrollArea>
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index e100ed565..5035a8851 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -14,7 +14,6 @@ const columns = computed(() => [
         align: 'left',
         name: 'id',
         label: t('customer.extendedList.tableVisibleColumns.id'),
-        columnFilter: false,
     },
     {
         align: 'left',

From 454c229f1356a712d8dff70e57a28b68261e83e3 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 25 Jul 2024 09:53:59 +0200
Subject: [PATCH 40/63] hotFix: try to fix myEntries

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

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 5035a8851..e100ed565 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -14,6 +14,7 @@ const columns = computed(() => [
         align: 'left',
         name: 'id',
         label: t('customer.extendedList.tableVisibleColumns.id'),
+        columnFilter: false,
     },
     {
         align: 'left',

From aef83b7e9a1b2d7c3a12f83ad9e56aed516c6246 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 25 Jul 2024 12:35:47 +0200
Subject: [PATCH 41/63] feat: modify myentries filters

---
 src/pages/Entry/MyEntries.vue | 65 +++++++++++++++++++++++++++++------
 src/pages/Entry/locale/en.yml |  2 ++
 src/pages/Entry/locale/es.yml |  2 ++
 3 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index e100ed565..24d224fda 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -17,30 +17,68 @@ const columns = computed(() => [
         columnFilter: false,
     },
     {
+        visible: false,
+        align: 'right',
+        label: t('shipped'),
+        name: 'shipped',
+        cardVisible: false,
+        columnFilter: {
+            name: 'fromShipped',
+            label: t('fromShipped'),
+            component: 'date',
+        },
+        format: ({ shipped }) => toDate(shipped),
+    },
+    {
+        visible: false,
         align: 'left',
         label: t('shipped'),
         name: 'shipped',
         columnFilter: {
+            name: 'toShipped',
+            label: t('toShipped'),
             component: 'date',
         },
         format: ({ shipped }) => toDate(shipped),
         cardVisible: true,
     },
     {
-        align: 'left',
-        label: t('landed'),
-        name: 'from',
+        align: 'right',
+        label: t('shipped'),
+        name: 'shipped',
         cardVisible: false,
-        columnFilter: {
-            component: 'date',
-        },
-        format: ({ landed }) => toDate(landed),
+        columnFilter: false,
+        format: ({ shipped }) => toDate(shipped),
     },
     {
-        align: 'left',
+        align: 'right',
+        label: t('landed'),
+        name: 'landed',
+        cardVisible: false,
+        columnFilter: false,
+        format: ({ landed }) => toDate(landed),
+    },
+
+    {
+        align: 'right',
         label: t('globals.wareHouseIn'),
-        name: 'warehouseInName',
+        name: 'warehouseInFk',
+        format: (row) => row.warehouseInName,
         cardVisible: true,
+        columnField: {
+            component: null,
+        },
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'warehouses',
+                fields: ['id', 'name'],
+                optionLabel: 'name',
+                optionValue: 'id',
+            },
+            alias: 't',
+            inWhere: true,
+        },
     },
     {
         align: 'left',
@@ -77,7 +115,14 @@ const printBuys = (rowId) => {
         :label="t('Search entries')"
         :info="t('You can search by entry reference')"
     />
-    <VnTable data-key="myEntriesList" url="Entries/filter" :columns="columns" auto-load />
+    <VnTable
+        data-key="myEntriesList"
+        url="Entries/filter"
+        :columns="columns"
+        default-mode="table"
+        order="shipped DESC"
+        auto-load
+    />
 </template>
 
 <i18n>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 677c3c055..df78b17c9 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -8,4 +8,6 @@ entryFilter:
         reference: Reference
 landed: Landed
 shipped: Shipped
+fromShipped: Shipped(from)
+toShipped: Shipped(to)
 printBuys: Print buys
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 10b77c2ee..4308722fb 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -12,4 +12,6 @@ entryFilter:
 
 landed: F. llegada
 shipped: F. salida
+fromShipped: F. salida(desde)
+toShipped: F. salida(hasta)
 Print buys: Imprimir etiquetas

From 60708f4a6c0524b7bcb541f8fc66c3101671eda3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 25 Jul 2024 12:36:04 +0200
Subject: [PATCH 42/63] feat: improve qFormMixin in production environment

---
 src/boot/qformMixin.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js
index 0bf1f9795..54edfb60b 100644
--- a/src/boot/qformMixin.js
+++ b/src/boot/qformMixin.js
@@ -4,9 +4,11 @@ const filterAvailableInput = (element) => {
     return element.classList.contains('q-field__native') && !element.disabled;
 };
 const filterAvailableText = (element) => {
+    const parentComponent = element.__vueParentComponent;
+    if (!parentComponent) return element.attributes.component.nodeValue !== 'input';
     return (
-        element.__vueParentComponent.type.name === 'QInput' &&
-        element.__vueParentComponent?.attrs?.class !== 'vn-input-date'
+        parentComponent?.type.name === 'QInput' &&
+        parentComponent?.attrs?.class !== 'vn-input-date'
     );
 };
 

From ebbe6ef3b1e059feb784ae661b40634dc0085669 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 25 Jul 2024 12:36:16 +0200
Subject: [PATCH 43/63] feat: add customfilter label

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

diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index 285e2338e..b30cb6af4 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -45,7 +45,7 @@ const defaultAttrs = {
 };
 
 const forceAttrs = {
-    label: $props.showTitle ? '' : $props.column.label,
+    label: $props.showTitle ? '' : columnFilter.value?.label ?? $props.column.label,
 };
 
 const selectComponent = {

From 6bba14cac901c460d29bc69390974992c90c9a15 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 25 Jul 2024 14:31:31 +0200
Subject: [PATCH 44/63] test: e2e fixed

---
 src/components/VnTable/VnVisibleColumn.vue             |  2 +-
 src/components/common/TableVisibleColumns.vue          |  2 +-
 src/pages/Entry/MyEntries.vue                          |  2 +-
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue       | 10 ++++++++--
 src/pages/Travel/Card/TravelDescriptorMenuItems.vue    |  2 +-
 test/cypress/integration/entry/myEntry.spec.js         |  1 -
 .../integration/invoiceIn/invoiceInCorrective.spec.js  |  2 +-
 test/cypress/integration/route/routeList.spec.js       |  2 +-
 8 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/components/VnTable/VnVisibleColumn.vue b/src/components/VnTable/VnVisibleColumn.vue
index e3bb52637..6d9fd2c33 100644
--- a/src/components/VnTable/VnVisibleColumn.vue
+++ b/src/components/VnTable/VnVisibleColumn.vue
@@ -81,7 +81,7 @@ async function fetchViewConfigData() {
             return;
         }
     } catch (err) {
-        console.err('Error fetching config view data', err);
+        console.error('Error fetching config view data', err);
     }
 }
 
diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index a4e4afafe..9a6c70ef0 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -84,7 +84,7 @@ const fetchViewConfigData = async () => {
             setUserConfigViewData(defaultColumns);
         }
     } catch (err) {
-        console.err('Error fetching config view data', err);
+        console.error('Error fetching config view data', err);
     }
 };
 
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 24d224fda..b09ccf298 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -119,7 +119,7 @@ const printBuys = (rowId) => {
         data-key="myEntriesList"
         url="Entries/filter"
         :columns="columns"
-        default-mode="table"
+        default-mode="card"
         order="shipped DESC"
         auto-load
     />
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 68dc5be4b..0d279de06 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -207,8 +207,14 @@ async function cloneInvoice() {
 
 const isAdministrative = () => hasAny(['administrative']);
 
-const isAgricultural = () =>
-    invoiceIn.value?.supplier?.sageWithholdingFk === config.value[0]?.sageWithholdingFk;
+const isAgricultural = () => {
+    console.error(config);
+    if (!config.value) return false;
+    return (
+        invoiceIn.value?.supplier?.sageFarmerWithholdingFk ===
+        config?.value[0]?.sageWithholdingFk
+    );
+};
 
 function showPdfInvoice() {
     if (isAgricultural()) openReport(`InvoiceIns/${entityId.value}/invoice-in-pdf`);
diff --git a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
index 1bb80ff01..bd2561211 100644
--- a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
+++ b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
@@ -38,7 +38,7 @@ const cloneTravelWithEntries = async () => {
         notify('globals.dataSaved', 'positive');
         router.push({ name: 'TravelBasicData', params: { id: data.id } });
     } catch (err) {
-        console.err('Error cloning travel with entries');
+        console.error('Error cloning travel with entries');
     }
 };
 
diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js
index 8edd3a11c..dca74dec2 100644
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@@ -7,7 +7,6 @@ describe('EntryMy when is supplier', () => {
                 cy.stub(win, 'open');
             },
         });
-        cy.waitForElement('.q-page', 6000);
     });
 
     it('should open buyLabel when is supplier', () => {
diff --git a/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js b/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
index efe5550c3..5bf9a89e5 100644
--- a/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
@@ -1,7 +1,7 @@
 /// <reference types="cypress" />
 
 describe('InvoiceInCorrective', () => {
-    const createRectificative = '.q-menu > .q-list > :nth-child(4) > .q-item__section';
+    const createRectificative = '.q-menu > .q-list > :nth-child(6) > .q-item__section';
     const rectificativeSection = '.q-drawer-container .q-list > a:nth-child(6)';
     const saveDialog = '.q-card > .q-card__actions > .q-btn--standard ';
 
diff --git a/test/cypress/integration/route/routeList.spec.js b/test/cypress/integration/route/routeList.spec.js
index f28bc984d..afc0fc395 100644
--- a/test/cypress/integration/route/routeList.spec.js
+++ b/test/cypress/integration/route/routeList.spec.js
@@ -26,6 +26,6 @@ describe('Route', () => {
         cy.get(getRowColumn(1, 4) + getVnSelect).type('{downArrow}{enter}');
         cy.get(getRowColumn(1, 5) + getVnSelect).type('{downArrow}{enter}');
         cy.get('button[title="Save"]').click();
-        cy.get('.q-notification__message').should('have.text', 'Data created');
+        cy.get('.q-notification__message').should('have.text', 'Data saved');
     });
 });

From 1a9cdee8386ba401c2a93d4af86f2567db708dfd Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 25 Jul 2024 15:12:15 +0200
Subject: [PATCH 45/63] fix: remove columnFilter

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

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index b09ccf298..4329ff8f3 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -15,6 +15,7 @@ const columns = computed(() => [
         name: 'id',
         label: t('customer.extendedList.tableVisibleColumns.id'),
         columnFilter: false,
+        isTitle: true,
     },
     {
         visible: false,
@@ -65,9 +66,6 @@ const columns = computed(() => [
         name: 'warehouseInFk',
         format: (row) => row.warehouseInName,
         cardVisible: true,
-        columnField: {
-            component: null,
-        },
         columnFilter: {
             component: 'select',
             attrs: {

From a27ac46f9f4a382ed9a2cc1803bb2d88882df8e4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Jul 2024 06:21:39 +0200
Subject: [PATCH 46/63] fix: disable firstInput.focus

---
 src/boot/qformMixin.js | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js
index 54edfb60b..85d0c7c10 100644
--- a/src/boot/qformMixin.js
+++ b/src/boot/qformMixin.js
@@ -3,28 +3,29 @@ import { getCurrentInstance } from 'vue';
 const filterAvailableInput = (element) => {
     return element.classList.contains('q-field__native') && !element.disabled;
 };
-const filterAvailableText = (element) => {
-    const parentComponent = element.__vueParentComponent;
-    if (!parentComponent) return element.attributes.component.nodeValue !== 'input';
-    return (
-        parentComponent?.type.name === 'QInput' &&
-        parentComponent?.attrs?.class !== 'vn-input-date'
-    );
-};
+// const filterAvailableText = (element) => {
+// const parentComponent = element.__vueParentComponent;
+// if (!parentComponent)
+// return element.attributes.component.nodeValue !== 'input';
+// return (
+//     parentComponent?.type.name === 'QInput' &&
+//     parentComponent?.attrs?.class !== 'vn-input-date'
+// );
+// };
 
 export default {
     mounted: function () {
         const vm = getCurrentInstance();
         if (vm.type.name === 'QForm') {
             if (!['searchbarForm', 'filterPanelForm'].includes(this.$el?.id)) {
-                // AUTOFOCUS
-                const elementsArray = Array.from(this.$el.elements);
-                const availableInputs = elementsArray.filter(filterAvailableInput);
-                const firstInputElement = availableInputs.find(filterAvailableText);
+                // TODO: AUTOFOCUS IS NOT FOCUSING
+                // const elementsArray = Array.from(this.$el.elements);
+                // const availableInputs = elementsArray.filter(filterAvailableInput);
+                // const firstInputElement = availableInputs.find(filterAvailableText);
 
-                if (firstInputElement) {
-                    firstInputElement.focus();
-                }
+                // if (firstInputElement) {
+                //     firstInputElement.focus();
+                // }
                 const that = this;
                 this.$el.addEventListener('keyup', function (evt) {
                     if (evt.key === 'Enter') {

From 662ffeac0a0fd5871582c1d504ce7a25103c4eca Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 26 Jul 2024 07:44:46 +0200
Subject: [PATCH 47/63] fix: minor changes

---
 src/boot/qformMixin.js        | 20 --------------------
 src/pages/Entry/MyEntries.vue |  3 ---
 2 files changed, 23 deletions(-)

diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js
index 85d0c7c10..fc7852369 100644
--- a/src/boot/qformMixin.js
+++ b/src/boot/qformMixin.js
@@ -1,31 +1,11 @@
 import { getCurrentInstance } from 'vue';
 
-const filterAvailableInput = (element) => {
-    return element.classList.contains('q-field__native') && !element.disabled;
-};
-// const filterAvailableText = (element) => {
-// const parentComponent = element.__vueParentComponent;
-// if (!parentComponent)
-// return element.attributes.component.nodeValue !== 'input';
-// return (
-//     parentComponent?.type.name === 'QInput' &&
-//     parentComponent?.attrs?.class !== 'vn-input-date'
-// );
-// };
-
 export default {
     mounted: function () {
         const vm = getCurrentInstance();
         if (vm.type.name === 'QForm') {
             if (!['searchbarForm', 'filterPanelForm'].includes(this.$el?.id)) {
                 // TODO: AUTOFOCUS IS NOT FOCUSING
-                // const elementsArray = Array.from(this.$el.elements);
-                // const availableInputs = elementsArray.filter(filterAvailableInput);
-                // const firstInputElement = availableInputs.find(filterAvailableText);
-
-                // if (firstInputElement) {
-                //     firstInputElement.focus();
-                // }
                 const that = this;
                 this.$el.addEventListener('keyup', function (evt) {
                     if (evt.key === 'Enter') {
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 4329ff8f3..e6974a04b 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -22,7 +22,6 @@ const columns = computed(() => [
         align: 'right',
         label: t('shipped'),
         name: 'shipped',
-        cardVisible: false,
         columnFilter: {
             name: 'fromShipped',
             label: t('fromShipped'),
@@ -47,7 +46,6 @@ const columns = computed(() => [
         align: 'right',
         label: t('shipped'),
         name: 'shipped',
-        cardVisible: false,
         columnFilter: false,
         format: ({ shipped }) => toDate(shipped),
     },
@@ -55,7 +53,6 @@ const columns = computed(() => [
         align: 'right',
         label: t('landed'),
         name: 'landed',
-        cardVisible: false,
         columnFilter: false,
         format: ({ landed }) => toDate(landed),
     },

From eae2144e1de1053373cc2dff98c62e03cee0bd3f Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 26 Jul 2024 09:41:47 +0200
Subject: [PATCH 48/63] feat: refs #7401 add menu options

---
 src/pages/Route/Card/RouteDescriptorMenu.vue | 62 +++++++++++++++++---
 src/pages/Route/Card/RouteForm.vue           |  8 +--
 src/pages/Route/Cmr/CmrList.vue              |  2 +-
 3 files changed, 60 insertions(+), 12 deletions(-)

diff --git a/src/pages/Route/Card/RouteDescriptorMenu.vue b/src/pages/Route/Card/RouteDescriptorMenu.vue
index b661d1cd7..7150eb027 100644
--- a/src/pages/Route/Card/RouteDescriptorMenu.vue
+++ b/src/pages/Route/Card/RouteDescriptorMenu.vue
@@ -3,6 +3,7 @@ import axios from 'axios';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
+import { useSession } from 'src/composables/useSession';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 
 const props = defineProps({
@@ -11,10 +12,20 @@ const props = defineProps({
         required: true,
     },
 });
-
 const router = useRouter();
 const quasar = useQuasar();
 const { t } = useI18n();
+const routeId = props.route.id;
+
+async function openRouteReport() {
+    const url = new URL(window.location).origin;
+    const { getTokenMultimedia } = useSession();
+    const token = getTokenMultimedia();
+    window.open(
+        `${url}/api/Routes/${routeId}/driver-route-pdf?access_token=${token}`,
+        '_blank'
+    );
+}
 
 function confirmRemove() {
     quasar
@@ -29,20 +40,51 @@ function confirmRemove() {
         .onOk(async () => await router.push({ name: 'RouteList' }));
 }
 
+async function sendMail() {
+    const params = {
+        id: routeId,
+        recipient: props?.route?.worker?.user?.emailUser?.email,
+    };
+    console.log('params: ', params);
+    await axios.post(`Routes/${routeId}/driver-route-email`, params);
+}
+
+async function actualizeVolume() {
+    const params = { isOk: true };
+    await axios.post(`Routes/${routeId}/updateVolume`, params);
+    quasar.notify({
+        message: t('globals.dataUpdated'),
+        type: 'positive',
+    });
+}
+
 async function remove() {
-    if (!props.route.id) {
-        return;
-    }
-    await axios.delete(`Routes/${props.route.id}`);
+    await axios.delete(`Routes/${routeId}`);
     quasar.notify({
         message: t('globals.dataDeleted'),
         type: 'positive',
     });
 }
-
-//  TODO: Add reports
 </script>
 <template>
+    <QItem @click="openRouteReport" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="description" />
+        </QItemSection>
+        <QItemSection>{{ t('seeReport') }}</QItemSection>
+    </QItem>
+    <QItem @click="sendMail" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="outgoing_mail" />
+        </QItemSection>
+        <QItemSection>{{ t('sendMail') }}</QItemSection>
+    </QItem>
+    <QItem @click="actualizeVolume" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="package_2" />
+        </QItemSection>
+        <QItemSection>{{ t('actualizeVolume') }}</QItemSection>
+    </QItem>
     <QItem @click="confirmRemove" v-ripple clickable>
         <QItemSection avatar>
             <QIcon name="delete" />
@@ -56,8 +98,14 @@ en:
     confirmDeletion: Confirm deletion
     confirmDeletionMessage: Are you sure you want to delete this route?
     deleteRoute: Delete route
+    seeReport: See route report
+    sendMail: Send route report
+    actualizeVolume: Actualize volume
 es:
     confirmDeletion: Confirmar eliminación,
     confirmDeletionMessage: Seguro que quieres eliminar esta ruta?
     deleteRoute: Eliminar ruta
+    seeReport: Ver informe de ruta
+    sendMail: Enviar informe de ruta
+    actualizeVolume: Actualizar volumen
 </i18n>
diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index a1bae8b02..615e424dc 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -155,7 +155,7 @@ const onSave = (data, response) => {
                     :input-debounce="0"
                 />
             </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('Agency')"
                     v-model="data.agencyModeFk"
@@ -170,7 +170,7 @@ const onSave = (data, response) => {
                 <VnInputDate v-model="data.created" :label="t('Created')" />
             </VnRow>
             <template v-if="!isNew">
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <VnInput v-model="data.kmStart" :label="t('Km Start')" clearable />
                     <QInput
                         v-model.number="data.kmEnd"
@@ -184,7 +184,7 @@ const onSave = (data, response) => {
                         type="number"
                     />
                 </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
+                <VnRow>
                     <VnInputTime
                         v-model="data.started"
                         :label="t('Hour started')"
@@ -205,7 +205,7 @@ const onSave = (data, response) => {
                     </div>
                 </VnRow>
             </template>
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnInput
                     v-model="data.description"
                     :label="t('Description')"
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 42d0b1c20..ede271960 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -3,7 +3,7 @@ import { onBeforeMount, onMounted, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { Notify } from 'quasar';
 import { useSession } from 'src/composables/useSession';
-import { toDate, toDateHourMin } from 'filters/index';
+import { toDateHourMin } from 'filters/index';
 import { useStateStore } from 'src/stores/useStateStore';
 
 import axios from 'axios';

From ed60793381640d61f2253f1de22141cf830145f7 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 26 Jul 2024 09:42:53 +0200
Subject: [PATCH 49/63] fix: refs #7401 remove console.log

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

diff --git a/src/pages/Route/Card/RouteDescriptorMenu.vue b/src/pages/Route/Card/RouteDescriptorMenu.vue
index 7150eb027..6092bcd95 100644
--- a/src/pages/Route/Card/RouteDescriptorMenu.vue
+++ b/src/pages/Route/Card/RouteDescriptorMenu.vue
@@ -45,7 +45,6 @@ async function sendMail() {
         id: routeId,
         recipient: props?.route?.worker?.user?.emailUser?.email,
     };
-    console.log('params: ', params);
     await axios.post(`Routes/${routeId}/driver-route-email`, params);
 }
 

From 2d8eecca1cf556cb35006a6bb38b90883fe25aaf Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 26 Jul 2024 09:46:00 +0200
Subject: [PATCH 50/63] fix: refs #7401 fix routeForm

---
 src/pages/Route/Card/RouteForm.vue | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 615e424dc..db7dede1e 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -120,7 +120,7 @@ const onSave = (data, response) => {
         @on-data-saved="onSave"
     >
         <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('Worker')"
                     v-model="data.workerFk"
@@ -205,15 +205,13 @@ const onSave = (data, response) => {
                     </div>
                 </VnRow>
             </template>
-            <VnRow>
-                <VnInput
-                    v-model="data.description"
-                    :label="t('Description')"
-                    type="textarea"
-                    :rows="3"
-                    clearable
-                />
-            </VnRow>
+            <VnInput
+                v-model="data.description"
+                :label="t('Description')"
+                type="textarea"
+                :rows="3"
+                clearable
+            />
         </template>
     </FormModel>
 </template>

From d575c3cdaeddba84fc69899f8fbd85375a640076 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 26 Jul 2024 11:25:44 +0200
Subject: [PATCH 51/63] refs #6898 filters

---
 src/pages/Supplier/Card/SupplierBasicData.vue | 2 +-
 src/pages/Supplier/SupplierList.vue           | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 10d6f8f68..4da375487 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -17,7 +17,7 @@ const workersOptions = ref([]);
 <template>
     <FetchData
         url="Workers/search"
-        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC', limit: 30 }"
+        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC' }"
         @on-fetch="(data) => (workersOptions = data)"
         auto-load
     />
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index 763fab812..4aec08141 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -80,11 +80,6 @@ const columns = computed(() => [
 
 <template>
     <VnSearchbar data-key="SuppliersList" :limit="20" :label="t('Search suppliers')" />
-    <RightMenu>
-        <template #right-panel>
-            <SupplierListFilter data-key="SuppliersList" />
-        </template>
-    </RightMenu>
     <VnTable
         ref="tableRef"
         data-key="SuppliersList"
@@ -100,8 +95,6 @@ const columns = computed(() => [
         order="id ASC"
         :columns="columns"
         auto-load
-        :right-search="false"
-        :use-model="true"
     />
 </template>
 

From 1ad15869e84995119780ef0fff7ed8fd8112e9f5 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 26 Jul 2024 11:45:13 +0200
Subject: [PATCH 52/63] refs #6898 filters select

---
 src/pages/Supplier/Card/SupplierBasicData.vue | 9 +--------
 src/pages/Supplier/SupplierList.vue           | 2 --
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 4da375487..c39a69286 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -2,8 +2,6 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
-import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
@@ -15,12 +13,6 @@ const { t } = useI18n();
 const workersOptions = ref([]);
 </script>
 <template>
-    <FetchData
-        url="Workers/search"
-        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC' }"
-        @on-fetch="(data) => (workersOptions = data)"
-        auto-load
-    />
     <FormModel
         :url="`Suppliers/${route.params.id}`"
         :url-update="`Suppliers/${route.params.id}`"
@@ -44,6 +36,7 @@ const workersOptions = ref([]);
                     option-label="name"
                     hide-selected
                     map-options
+                    url="Workers/search"
                     :rules="validate('supplier.workerFk')"
                 >
                     <template #append>
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index 4aec08141..5d9942536 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -3,8 +3,6 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import RightMenu from 'components/common/RightMenu.vue';
-import SupplierListFilter from './SupplierListFilter.vue';
 
 const { t } = useI18n();
 const tableRef = ref();

From f4c0288ca086e2fbeb23954cf164fb0d276073d1 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 26 Jul 2024 12:01:46 +0200
Subject: [PATCH 53/63] refs #6898 filters sortby

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

diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index c39a69286..a2792a26c 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -37,6 +37,7 @@ const workersOptions = ref([]);
                     hide-selected
                     map-options
                     url="Workers/search"
+                    sortby="nickname ASC"
                     :rules="validate('supplier.workerFk')"
                 >
                     <template #append>

From 21b642a7c5331d8a89d4d735211f2a71906dc74b Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 26 Jul 2024 12:15:57 +0200
Subject: [PATCH 54/63] typo

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

diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index a2792a26c..f8f99ef9a 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -37,7 +37,7 @@ const workersOptions = ref([]);
                     hide-selected
                     map-options
                     url="Workers/search"
-                    sortby="nickname ASC"
+                    sort-by="nickname ASC"
                     :rules="validate('supplier.workerFk')"
                 >
                     <template #append>

From 86ab1613022d828df6c410c057da50c0bc9d4de5 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 26 Jul 2024 12:37:53 +0200
Subject: [PATCH 55/63] fix: refs #6769 Fixes item diary

---
 src/components/RegularizeStockForm.vue |  7 +++---
 src/css/app.scss                       | 23 -----------------
 src/pages/Item/Card/ItemDiary.vue      | 34 ++++++++++++++++++++------
 3 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/src/components/RegularizeStockForm.vue b/src/components/RegularizeStockForm.vue
index 4f97033b3..4c23bd660 100644
--- a/src/components/RegularizeStockForm.vue
+++ b/src/components/RegularizeStockForm.vue
@@ -15,7 +15,7 @@ const props = defineProps({
         default: null,
     },
     warehouseFk: {
-        type: Boolean,
+        type: Number,
         default: null,
     },
 });
@@ -23,7 +23,7 @@ const props = defineProps({
 const { t } = useI18n();
 
 const regularizeFormData = reactive({
-    itemFk: props.itemFk,
+    itemFk: Number(props.itemFk),
     warehouseFk: props.warehouseFk,
     quantity: null,
 });
@@ -53,6 +53,7 @@ const onDataSaved = (data) => {
                 <QInput
                     :label="t('Type the visible quantity')"
                     v-model.number="data.quantity"
+                    type="number"
                     autofocus
                 />
             </VnRow>
@@ -60,7 +61,7 @@ const onDataSaved = (data) => {
                 <div class="col">
                     <VnSelect
                         :label="t('Warehouse')"
-                        v-model="data.warehouseFk"
+                        v-model.number="data.warehouseFk"
                         :options="warehousesOptions"
                         option-value="id"
                         option-label="name"
diff --git a/src/css/app.scss b/src/css/app.scss
index 504718ff5..654a8f1f8 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -209,29 +209,6 @@ input::-webkit-inner-spin-button {
     max-width: 100%;
 }
 
-/* ===== Scrollbar CSS ===== /
-/ Firefox */
-
-* {
-    scrollbar-width: auto;
-    scrollbar-color: var(--vn-label-color) transparent;
-}
-
-/* Chrome, Edge, and Safari */
-*::-webkit-scrollbar {
-    width: 10px;
-    height: 10px;
-}
-
-*::-webkit-scrollbar-thumb {
-    background-color: var(--vn-label-color);
-    border-radius: 10px;
-}
-
-*::-webkit-scrollbar-track {
-    background: transparent;
-}
-
 .q-table {
     thead,
     tbody {
diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index 4c0959153..32b306883 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, computed, onUnmounted, reactive, ref } from 'vue';
+import { onMounted, computed, onUnmounted, reactive, ref, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -113,18 +113,36 @@ const getBadgeAttrs = (_date) => {
     return attrs;
 };
 
+const scrollToToday = async () => {
+    await nextTick();
+    const today = new Date();
+    today.setHours(0, 0, 0, 0);
+    const todayCell = document.querySelector(`td[data-date="${today.toISOString()}"]`);
+    if (todayCell) {
+        todayCell.scrollIntoView({ behavior: 'smooth', block: 'center' });
+    }
+};
+
+const formatDateForAttribute = (dateValue) => {
+    if (dateValue instanceof Date) return date.formatDate(dateValue, 'YYYY-MM-DD');
+    return dateValue;
+};
+
 const originTypeMap = {
     entry: {
         descriptor: EntryDescriptorProxy,
         icon: 'vn:entry',
+        color: 'green',
     },
     ticket: {
         descriptor: TicketDescriptorProxy,
         icon: 'vn:ticket',
+        color: 'red',
     },
     order: {
         descriptor: OrderDescriptorProxy,
         icon: 'vn:basket',
+        color: 'yellow',
     },
 };
 
@@ -143,6 +161,7 @@ onMounted(async () => {
     else if (user.value) warehouseFk.value = user.value.warehouseFk;
     itemsBalanceFilter.where.warehouseFk = warehouseFk.value;
     await fetchItemBalances();
+    await scrollToToday();
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
@@ -215,7 +234,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </QTd>
             </template>
             <template #body-cell-date="{ row }">
-                <QTd @click.stop>
+                <QTd @click.stop :data-date="formatDateForAttribute(row.shipped)">
                     <QBadge
                         v-bind="getBadgeAttrs(row.shipped)"
                         class="q-ma-none"
@@ -237,12 +256,13 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     >
                         {{ row.originId }}
                     </component>
+                    <QIcon
+                        :name="originTypeMap[row.originType]?.icon"
+                        class="fill-icon q-mr-sm"
+                        size="sm"
+                        :color="originTypeMap[row.originType]?.color"
+                    />
                     <span class="link">
-                        <QIcon
-                            :name="originTypeMap[row.originType]?.icon"
-                            class="fill-icon q-mr-sm"
-                            size="xs"
-                        />
                         {{ row.originId }}
                     </span>
                 </QTd>

From d4ff3ab993ff9007ef4662007207fd91312facc9 Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Fri, 26 Jul 2024 12:55:36 +0200
Subject: [PATCH 56/63] fix: refs #7039 supplierSummary

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

diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 43b8964ff..822586b47 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -152,7 +152,7 @@ function getUrl(section) {
                 />
                 <VnLv
                     :label="t('supplier.summary.country')"
-                    :value="supplier.country?.country"
+                    :value="supplier.country?.name"
                     dash
                 />
             </QCard>

From 48e133ffc78102843ef582e8e6d8414b701ac9f3 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 26 Jul 2024 13:00:55 +0200
Subject: [PATCH 57/63] fix: refs #6769 Fix worker images

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

diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 951c8511e..17b9b7b23 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -145,7 +145,7 @@ const refetch = async () => await cardDescriptorRef.value.getData();
             </QItem>
         </template>
         <template #before>
-            <VnImg :id="entityId" collection="user" size="160x160" class="photo">
+            <VnImg :id="entityId" collection="user" size="520x520" class="photo">
                 <template #error>
                     <div
                         class="absolute-full picture text-center q-pa-md flex flex-center"

From 621de118900e3730a9a0f147a0461cc1d26dfd07 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 26 Jul 2024 13:14:45 +0200
Subject: [PATCH 58/63] fix: refs #6769 Requested changes

---
 src/css/app.scss                  | 25 +++++++++++++++++++++++++
 src/pages/Item/Card/ItemDiary.vue |  2 +-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index 654a8f1f8..9e1537472 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -209,6 +209,31 @@ input::-webkit-inner-spin-button {
     max-width: 100%;
 }
 
+.q-table__container {
+    /* ===== Scrollbar CSS ===== /
+    / Firefox */
+
+    * {
+        scrollbar-width: auto;
+        scrollbar-color: var(--vn-label-color) transparent;
+    }
+
+    /* Chrome, Edge, and Safari */
+    *::-webkit-scrollbar {
+        width: 10px;
+        height: 10px;
+    }
+
+    *::-webkit-scrollbar-thumb {
+        background-color: var(--vn-label-color);
+        border-radius: 10px;
+    }
+
+    *::-webkit-scrollbar-track {
+        background: transparent;
+    }
+}
+
 .q-table {
     thead,
     tbody {
diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index 32b306883..bd60745cd 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -115,7 +115,7 @@ const getBadgeAttrs = (_date) => {
 
 const scrollToToday = async () => {
     await nextTick();
-    const today = new Date();
+    const today = Date.vnNew();
     today.setHours(0, 0, 0, 0);
     const todayCell = document.querySelector(`td[data-date="${today.toISOString()}"]`);
     if (todayCell) {

From f079ba402287810ff130d2f9e3e50a8a14eb43c1 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 26 Jul 2024 14:51:22 +0200
Subject: [PATCH 59/63] hotFix: twoFactor add required import

---
 src/pages/Login/TwoFactor.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Login/TwoFactor.vue b/src/pages/Login/TwoFactor.vue
index b3a139149..8ba1a1f7d 100644
--- a/src/pages/Login/TwoFactor.vue
+++ b/src/pages/Login/TwoFactor.vue
@@ -7,6 +7,7 @@ import axios from 'axios';
 
 import { useSession } from 'src/composables/useSession';
 import { useLogin } from 'src/composables/useLogin';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const quasar = useQuasar();
 const session = useSession();

From 979b3b2a6c9a527c296fa186b98700a3935fa222 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 29 Jul 2024 08:46:47 +0200
Subject: [PATCH 60/63] fix: refs #7197 drop character

---
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 8c14e874b..da24e50fa 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -438,7 +438,7 @@ const createInvoiceInCorrection = async () => {
                             readonly
                         />
                         <VnSelect
-                            :label="`${useCapitalize(t('globals.class'))}*`"
+                            :label="`${useCapitalize(t('globals.class'))}`"
                             v-model="correctionFormData.invoiceClass"
                             :options="siiTypeInvoiceOuts"
                             option-value="id"
@@ -448,7 +448,7 @@ const createInvoiceInCorrection = async () => {
                     </QItemSection>
                     <QItemSection>
                         <VnSelect
-                            :label="`${useCapitalize(t('globals.type'))}*`"
+                            :label="`${useCapitalize(t('globals.type'))}`"
                             v-model="correctionFormData.invoiceType"
                             :options="cplusRectificationTypes"
                             option-value="id"
@@ -456,7 +456,7 @@ const createInvoiceInCorrection = async () => {
                             :required="true"
                         />
                         <VnSelect
-                            :label="`${useCapitalize(t('globals.reason'))}*`"
+                            :label="`${useCapitalize(t('globals.reason'))}`"
                             v-model="correctionFormData.invoiceReason"
                             :options="invoiceCorrectionTypes"
                             option-value="id"

From a7af5d43a26ea1b73f3cf907241533b12f441d89 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 29 Jul 2024 10:10:34 +0200
Subject: [PATCH 61/63] fix: refs #6891 worker tests

---
 test/cypress/integration/worker/workerList.spec.js   | 4 +---
 test/cypress/integration/worker/workerLocker.spec.js | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/test/cypress/integration/worker/workerList.spec.js b/test/cypress/integration/worker/workerList.spec.js
index 29df01f3b..de57c9638 100644
--- a/test/cypress/integration/worker/workerList.spec.js
+++ b/test/cypress/integration/worker/workerList.spec.js
@@ -6,8 +6,6 @@ describe('WorkerList', () => {
     });
 
     it('should open the worker summary', () => {
-        cy.get('.bg-header > :nth-child(2) > .full-width > :nth-child(1) >').type(
-            'jessica jones{enter}'
-        );
+        cy.get('.q-drawer .q-form input[aria-label="Name"]').type('jessica jones{enter}');
     });
 });
diff --git a/test/cypress/integration/worker/workerLocker.spec.js b/test/cypress/integration/worker/workerLocker.spec.js
index ef2f88300..9a4a19c7a 100644
--- a/test/cypress/integration/worker/workerLocker.spec.js
+++ b/test/cypress/integration/worker/workerLocker.spec.js
@@ -2,7 +2,7 @@ describe('WorkerLocker', () => {
     const workerId = 1109;
     const lockerCode = '2F';
     const input = '.q-card input';
-    const firstOpt = '[role="listbox"] .q-item:nth-child(1)';
+    const thirdOpt = '[role="listbox"] .q-item:nth-child(3)';
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('productionBoss');
@@ -11,8 +11,8 @@ describe('WorkerLocker', () => {
 
     it('should allocates a locker', () => {
         cy.get(input).click();
-        cy.get(input).type(lockerCode);
-        cy.get(firstOpt).click();
+        cy.waitForElement('[role="listbox"]');
+        cy.get(thirdOpt).click();
         cy.saveCard();
         cy.get(input).invoke('val').should('eq', lockerCode);
     });

From 839af6d50c1a680a082d125182bb34fba4f0e696 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 29 Jul 2024 13:41:44 +0200
Subject: [PATCH 62/63] fix: refs #6989 show entity name & default time from
 config table

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

diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index bd60745cd..6fc7ab4fb 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -17,6 +17,7 @@ import { toDateFormat } from 'src/filters/date.js';
 import { dashIfEmpty } from 'src/filters';
 import { date } from 'quasar';
 import { useState } from 'src/composables/useState';
+import axios from 'axios';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -33,6 +34,7 @@ const itemsBalanceFilter = reactive({
 const itemBalances = ref([]);
 const warehouseFk = ref(null);
 const _showWhatsBeforeInventory = ref(false);
+const inventoriedDate = ref(null);
 
 const columns = computed(() => [
     {
@@ -98,7 +100,7 @@ const showWhatsBeforeInventory = computed({
     set: (val) => {
         _showWhatsBeforeInventory.value = val;
         if (!val) itemsBalanceFilter.where.date = null;
-        else itemsBalanceFilter.where.date = new Date();
+        else itemsBalanceFilter.where.date = inventoriedDate.value ?? new Date();
     },
 });
 
@@ -160,6 +162,8 @@ onMounted(async () => {
     if (route.query.warehouseFk) warehouseFk.value = route.query.warehouseFk;
     else if (user.value) warehouseFk.value = user.value.warehouseFk;
     itemsBalanceFilter.where.warehouseFk = warehouseFk.value;
+    const { data } = await axios.get('Configs/findOne');
+    inventoriedDate.value = data.inventoried;
     await fetchItemBalances();
     await scrollToToday();
 });
@@ -284,7 +288,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         >
                             {{ row.entityId }}
                         </component>
-                        <span class="link">
+                        <span :class="{ link: row.entityId }">
                             {{ dashIfEmpty(row.entityName) }}
                         </span>
                     </QBadge>

From b16f00b2e96bcc17da129eefe4c40e76a86220ad Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 30 Jul 2024 08:38:14 +0200
Subject: [PATCH 63/63] build: init version 2434

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

diff --git a/package.json b/package.json
index 0a66ddb4f..0590a1526 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.32.0",
+    "version": "24.34.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",