From 196d8dde208c08eed63c694f5b8994564f8d7c41 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 22 Feb 2024 11:05:40 -0300
Subject: [PATCH 01/37] Change isRaid icon

---
 src/pages/Entry/Card/EntryDescriptor.vue | 2 +-
 src/pages/Entry/EntryList.vue            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 6680bdc46..6d166c431 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -136,7 +136,7 @@ const showEntryReport = () => {
                 >
                     <QTooltip>{{ t('Inventory entry') }}</QTooltip>
                 </QIcon>
-                <QIcon v-if="entity.isRaid" name="vn:web" color="primary" size="xs">
+                <QIcon v-if="entity.isRaid" name="vn:net" color="primary" size="xs">
                     <QTooltip>{{ t('Virtual entry') }}</QTooltip>
                 </QIcon>
             </QCardActions>
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index e8eff584b..6f146e21a 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -74,7 +74,7 @@ onMounted(async () => {
                             </QIcon>
                             <QIcon
                                 v-if="row.isRaid"
-                                name="vn:web"
+                                name="vn:net"
                                 color="primary"
                                 size="xs"
                             >

From 26570343605ad679fc5fcf606c7381b80f9d9c04 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 22 Feb 2024 15:07:11 -0300
Subject: [PATCH 02/37] Corrections

---
 src/pages/Entry/Card/EntryBuys.vue       | 24 +++++++++++++++++++-----
 src/pages/Entry/Card/EntryDescriptor.vue | 10 +++++++---
 src/pages/Entry/EntryLatestBuys.vue      |  4 ++--
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 679afff1b..64793eb70 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -43,7 +43,7 @@ const tableColumnComponents = computed(() => ({
     item: {
         component: QBtn,
         props: {
-            color: 'blue',
+            color: 'primary',
             flat: true,
         },
         event: () => ({}),
@@ -54,6 +54,7 @@ const tableColumnComponents = computed(() => ({
             type: 'number',
             min: 0,
             class: 'input-number',
+            dense: true,
         },
         event: getInputEvents,
     },
@@ -67,6 +68,7 @@ const tableColumnComponents = computed(() => ({
             'use-input': true,
             'hide-selected': true,
             options: packagingsOptions.value,
+            dense: true,
         },
         event: getInputEvents,
     },
@@ -76,6 +78,7 @@ const tableColumnComponents = computed(() => ({
             type: 'number',
             min: 0,
             class: 'input-number',
+            dense: true,
         },
         event: getInputEvents,
     },
@@ -84,6 +87,7 @@ const tableColumnComponents = computed(() => ({
         props: {
             type: 'number',
             min: 0,
+            dense: true,
         },
         event: getInputEvents,
     },
@@ -92,6 +96,7 @@ const tableColumnComponents = computed(() => ({
         props: {
             type: 'number',
             min: 0,
+            dense: true,
         },
         event: getInputEvents,
     },
@@ -100,6 +105,7 @@ const tableColumnComponents = computed(() => ({
         props: {
             type: 'number',
             min: 0,
+            dense: true,
         },
         event: getInputEvents,
     },
@@ -108,6 +114,7 @@ const tableColumnComponents = computed(() => ({
         props: {
             type: 'number',
             min: 0,
+            dense: true,
         },
         event: getInputEvents,
     },
@@ -116,6 +123,7 @@ const tableColumnComponents = computed(() => ({
         props: {
             type: 'number',
             min: 0,
+            dense: true,
         },
         event: getInputEvents,
     },
@@ -124,6 +132,7 @@ const tableColumnComponents = computed(() => ({
         props: {
             type: 'number',
             min: 0,
+            dense: true,
         },
         event: getInputEvents,
     },
@@ -320,17 +329,21 @@ const showLockIcon = (groupingMode, mode) => {
                 :columns="entriesTableColumns"
                 selection="multiple"
                 row-key="id"
-                hide-bottom
                 class="full-width q-mt-md"
                 :grid="$q.screen.lt.md"
                 v-model:selected="rowsSelected"
+                :no-results-label="t('No results')"
             >
                 <template #body="props">
                     <QTr>
                         <QTd>
                             <QCheckbox v-model="props.selected" />
                         </QTd>
-                        <QTd v-for="col in props.cols" :key="col.name">
+                        <QTd
+                            v-for="col in props.cols"
+                            :key="col.name"
+                            style="max-width: 100px"
+                        >
                             <component
                                 :is="tableColumnComponents[col.name].component"
                                 v-bind="tableColumnComponents[col.name].props"
@@ -353,7 +366,7 @@ const showLockIcon = (groupingMode, mode) => {
                                             showLockIcon(props.row.groupingMode, col.name)
                                         "
                                         @click="toggleGroupingMode(props.row, col.name)"
-                                        class="cursor-pointer"
+                                        class="cursor-pointer test"
                                         size="sm"
                                         flat
                                         dense
@@ -397,7 +410,7 @@ const showLockIcon = (groupingMode, mode) => {
                     </QTr>
                     <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->
                     <QTr v-if="props.rowIndex !== rows.length - 1" class="separation-row">
-                        <QTd colspan="12" style="height: 24px" />
+                        <QTd colspan="12" style="height: 16px" />
                     </QTr>
                 </template>
                 <template #item="props">
@@ -464,4 +477,5 @@ es:
     Confirm deletion: Confirmar eliminación
     Are you sure you want to delete this buy?: Seguro que quieres eliminar esta compra?
     Are you sure you want to delete this buys?: Seguro que quieres eliminar estas compras?
+    No results: Sin resultados
 </i18n>
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 6d166c431..d1df63c3b 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -7,6 +7,7 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 
+import { useState } from 'src/composables/useState';
 import { toDate } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
 
@@ -25,6 +26,7 @@ const $props = defineProps({
 const route = useRoute();
 const { t } = useI18n();
 const { openReport } = usePrintService();
+const state = useState();
 
 const entryFilter = {
     include: [
@@ -71,6 +73,8 @@ const data = ref(useCardDescription());
 const setData = (entity) =>
     (data.value = useCardDescription(entity.supplier.nickname, entity.id));
 
+const currentEntry = computed(() => state.get('entry'));
+
 const getEntryRedirectionFilter = (entry) => {
     let entryTravel = entry && entry.travel;
 
@@ -126,17 +130,17 @@ const showEntryReport = () => {
                 :value="entity.travel?.warehouseOut?.name"
             />
         </template>
-        <template #icons="{ entity }">
+        <template v-if="currentEntry" #icons>
             <QCardActions class="q-gutter-x-md">
                 <QIcon
-                    v-if="entity.isExcludedFromAvailable"
+                    v-if="currentEntry.isExcludedFromAvailable"
                     name="vn:inventory"
                     color="primary"
                     size="xs"
                 >
                     <QTooltip>{{ t('Inventory entry') }}</QTooltip>
                 </QIcon>
-                <QIcon v-if="entity.isRaid" name="vn:net" color="primary" size="xs">
+                <QIcon v-if="currentEntry.isRaid" name="vn:net" color="primary" size="xs">
                     <QTooltip>{{ t('Virtual entry') }}</QTooltip>
                 </QIcon>
             </QCardActions>
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index f4a423f3b..6b2cb47ab 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -288,7 +288,7 @@ onMounted(async () => {
             </template>
             <template #body-cell-itemFk="{ row }">
                 <QTd @click.stop>
-                    <QBtn flat color="blue">
+                    <QBtn flat color="primary">
                         {{ row.itemFk }}
                     </QBtn>
                 </QTd>
@@ -300,7 +300,7 @@ onMounted(async () => {
             </template>
             <template #body-cell-entryFk="{ row }">
                 <QTd @click.stop>
-                    <QBtn flat color="blue">
+                    <QBtn flat color="primary">
                         <EntryDescriptorProxy :id="row.entryFk" />
                         {{ row.entryFk }}
                     </QBtn>

From 1546077a9201e85bcbbb16db6b42e60073f7b3f9 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 22 Feb 2024 15:39:55 -0300
Subject: [PATCH 03/37] Remove auto-load from SupplierList

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

diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index e8668fa08..138d353fb 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -42,7 +42,7 @@ const redirectToCreateView = () => {
             </QScrollArea>
         </QDrawer>
         <div class="vn-card-list">
-            <VnPaginate data-key="SuppliersList" url="Suppliers/filter" auto-load>
+            <VnPaginate data-key="SuppliersList" url="Suppliers/filter">
                 <template #body="{ rows }">
                     <CardList
                         v-for="row of rows"

From 67eb8e82b607d77726eba7afcf7cfe10558f0997 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 23 Feb 2024 08:17:22 -0300
Subject: [PATCH 04/37] WIP

---
 src/pages/Supplier/Card/SupplierSummary.vue | 40 +++++++++++++++------
 1 file changed, 30 insertions(+), 10 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index d734e21a5..442e03f9f 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -52,9 +52,13 @@ const isAdministrative = computed(() => {
         @on-fetch="(data) => setData(data)"
     >
         <template #header-left>
-            <a v-if="isAdministrative" class="header link" :href="supplierUrl">
+            <router-link
+                v-if="isAdministrative"
+                class="header link"
+                :to="{ name: 'SupplierSummary', params: { id: entityId } }"
+            >
                 <QIcon name="open_in_new" color="white" size="sm" />
-            </a>
+            </router-link>
         </template>
         <template #header>
             <span>{{ supplier.name }} - {{ supplier.id }}</span>
@@ -62,10 +66,14 @@ const isAdministrative = computed(() => {
 
         <template #body>
             <QCard class="vn-one">
-                <a v-if="isAdministrative" class="header link" :href="supplierUrl">
+                <router-link
+                    v-if="isAdministrative"
+                    class="header link"
+                    :to="{ name: 'SupplierBasicData', params: { id: entityId } }"
+                >
                     {{ t('globals.summary.basicData') }}
                     <QIcon name="open_in_new" color="primary" />
-                </a>
+                </router-link>
                 <span v-else> {{ t('globals.summary.basicData') }}</span>
                 <VnLv label="Id" :value="supplier.id" />
                 <VnLv label="Alias" :value="supplier.nickname" />
@@ -105,10 +113,14 @@ const isAdministrative = computed(() => {
                 </VnLv>
             </QCard>
             <QCard class="vn-one">
-                <a v-if="isAdministrative" class="header link" :href="supplierUrl">
+                <router-link
+                    v-if="isAdministrative"
+                    class="header link"
+                    :to="{ name: 'SupplierBillingData', params: { id: entityId } }"
+                >
                     {{ t('supplier.summary.billingData') }}
                     <QIcon name="open_in_new" color="primary" />
-                </a>
+                </router-link>
                 <span v-else> {{ t('supplier.summary.billingData') }}</span>
                 <VnLv
                     :label="t('supplier.summary.payMethod')"
@@ -124,10 +136,14 @@ const isAdministrative = computed(() => {
                 <VnLv :label="t('supplier.summary.account')" :value="supplier.account" />
             </QCard>
             <QCard class="vn-one">
-                <a v-if="isAdministrative" class="header link" :href="supplierUrl">
+                <router-link
+                    v-if="isAdministrative"
+                    class="header link"
+                    :to="{ name: 'SupplierFiscalData', params: { id: entityId } }"
+                >
                     {{ t('supplier.summary.fiscalData') }}
                     <QIcon name="open_in_new" color="primary" />
-                </a>
+                </router-link>
                 <span v-else> {{ t('supplier.summary.fiscalData') }}</span>
                 <VnLv
                     :label="t('supplier.summary.sageTaxType')"
@@ -155,10 +171,14 @@ const isAdministrative = computed(() => {
                 />
             </QCard>
             <QCard class="vn-one">
-                <a v-if="isAdministrative" class="header link" :href="supplierUrl">
+                <router-link
+                    v-if="isAdministrative"
+                    class="header link"
+                    :to="{ name: 'SupplierFiscalData', params: { id: entityId } }"
+                >
                     {{ t('supplier.summary.fiscalAddress') }}
                     <QIcon name="open_in_new" color="primary" />
-                </a>
+                </router-link>
                 <span v-else> {{ t('supplier.summary.fiscalAddress') }}</span>
                 <VnLv :label="t('supplier.summary.socialName')" :value="supplier.name" />
                 <VnLv :label="t('supplier.summary.taxNumber')" :value="supplier.nif" />

From e2d29f08b4d28e3ee635f3e2c87314c853f352bb Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 23 Feb 2024 08:35:56 -0300
Subject: [PATCH 05/37] remove unnused class

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

diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 64793eb70..a65e7e1c9 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -366,7 +366,7 @@ const showLockIcon = (groupingMode, mode) => {
                                             showLockIcon(props.row.groupingMode, col.name)
                                         "
                                         @click="toggleGroupingMode(props.row, col.name)"
-                                        class="cursor-pointer test"
+                                        class="cursor-pointer"
                                         size="sm"
                                         flat
                                         dense
@@ -392,8 +392,8 @@ const showLockIcon = (groupingMode, mode) => {
                             <span>{{ props.row.item.itemType.code }}</span>
                         </QTd>
                         <QTd>
-                            <span>{{ props.row.item.id }}</span>
-                        </QTd>
+                            <span>{{ props.row.item.id }}</span> </QTd
+                        >'
                         <QTd>
                             <span>{{ props.row.item.size }}</span>
                         </QTd>

From ed2a7c5ee688e6b2338275167b9959374f320000 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 23 Feb 2024 08:58:32 -0300
Subject: [PATCH 06/37] Add fill to lock icon

---
 src/pages/Entry/Card/EntryBuys.vue | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index a65e7e1c9..a96edb1db 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -285,7 +285,7 @@ const toggleGroupingMode = async (buy, mode) => {
     }
 };
 
-const showLockIcon = (groupingMode, mode) => {
+const lockIconType = (groupingMode, mode) => {
     if (mode === 'packing') {
         return groupingMode === 2 ? 'lock' : 'lock_open';
     } else {
@@ -363,7 +363,7 @@ const showLockIcon = (groupingMode, mode) => {
                                 >
                                     <QBtn
                                         :icon="
-                                            showLockIcon(props.row.groupingMode, col.name)
+                                            lockIconType(props.row.groupingMode, col.name)
                                         "
                                         @click="toggleGroupingMode(props.row, col.name)"
                                         class="cursor-pointer"
@@ -372,6 +372,16 @@ const showLockIcon = (groupingMode, mode) => {
                                         dense
                                         unelevated
                                         push
+                                        :style="{
+                                            'font-variation-settings': `'FILL' ${
+                                                lockIconType(
+                                                    props.row.groupingMode,
+                                                    col.name
+                                                ) === 'lock'
+                                                    ? 1
+                                                    : 0
+                                            }`,
+                                        }"
                                     />
                                 </template>
                                 <template

From 46e5503a7919d4c316d96d4da39c173efd186085 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 23 Feb 2024 10:43:30 -0300
Subject: [PATCH 07/37] save descriptor data in state

---
 src/components/ui/CardDescriptor.vue     | 4 ++++
 src/pages/Entry/Card/EntryDescriptor.vue | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 241937a4e..1c6b260c8 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useState } from 'src/composables/useState';
 
 const $props = defineProps({
     url: {
@@ -35,6 +36,8 @@ const $props = defineProps({
         default: null,
     },
 });
+
+const state = useState();
 const slots = useSlots();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -64,6 +67,7 @@ async function getData() {
     isLoading.value = true;
     try {
         const { data } = await arrayData.fetch({ append: false, updateRouter: false });
+        state.set($props.dataKey, data);
         emit('onFetch', data);
     } finally {
         isLoading.value = false;
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index d1df63c3b..bb7a20dd0 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -109,7 +109,7 @@ const showEntryReport = () => {
         :title="data.title"
         :subtitle="data.subtitle"
         @on-fetch="setData"
-        data-key="entryData"
+        data-key="entry"
     >
         <template #menu="{ entity }">
             <QItem v-ripple clickable @click="showEntryReport(entity)">

From 913bc7d87074467d112c43c62d5a88eeec10724c Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 23 Feb 2024 11:50:38 -0300
Subject: [PATCH 08/37] Refetch descriptor data when exit EntryBasicData view

---
 src/pages/Entry/Card/EntryDescriptor.vue | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index bb7a20dd0..13f24b93c 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, watch } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -27,6 +27,7 @@ const route = useRoute();
 const { t } = useI18n();
 const { openReport } = usePrintService();
 const state = useState();
+const entryDescriptorRef = ref(null);
 
 const entryFilter = {
     include: [
@@ -96,13 +97,27 @@ const getEntryRedirectionFilter = (entry) => {
     });
 };
 
+const refetchEntryDescriptorData = async () => {
+    await entryDescriptorRef.value.getData();
+};
+
+watch(
+    () => route.name,
+    async (_, from) => {
+        if (from === 'EntryBasicData') await refetchEntryDescriptorData();
+    }
+);
+
 const showEntryReport = () => {
     openReport(`Entries/${route.params.id}/entry-order-pdf`);
 };
+
+watch;
 </script>
 
 <template>
     <CardDescriptor
+        ref="entryDescriptorRef"
         module="Entry"
         :url="`Entries/${entityId}`"
         :filter="entryFilter"
@@ -130,7 +145,7 @@ const showEntryReport = () => {
                 :value="entity.travel?.warehouseOut?.name"
             />
         </template>
-        <template v-if="currentEntry" #icons>
+        <template #icons>
             <QCardActions class="q-gutter-x-md">
                 <QIcon
                     v-if="currentEntry.isExcludedFromAvailable"

From 6605eea044d9de9b2a93159f91245ad1e38be928 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 23 Feb 2024 11:52:39 -0300
Subject: [PATCH 09/37] remove character added by accident

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

diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index a96edb1db..168e56f14 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -402,8 +402,8 @@ const lockIconType = (groupingMode, mode) => {
                             <span>{{ props.row.item.itemType.code }}</span>
                         </QTd>
                         <QTd>
-                            <span>{{ props.row.item.id }}</span> </QTd
-                        >'
+                            <span>{{ props.row.item.id }}</span>
+                        </QTd>
                         <QTd>
                             <span>{{ props.row.item.size }}</span>
                         </QTd>

From 3e04c86000318a6e17060c0ee2b9f495e4e109e2 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 23 Feb 2024 11:53:59 -0300
Subject: [PATCH 10/37] reduce EntrySummary distance between table rows

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

diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 3861e0321..f4bb36ef3 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -338,7 +338,7 @@ const fetchEntryBuys = async () => {
                             v-if="rowIndex !== entryBuys.length - 1"
                             class="separation-row"
                         >
-                            <QTd colspan="10" style="height: 24px" />
+                            <QTd colspan="10" style="height: 16px" />
                         </QTr>
                     </template>
                 </QTable>

From 4d2dacff6fa4ebacdf89e2136dbed044628c8d77 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 23 Feb 2024 20:36:26 -0300
Subject: [PATCH 11/37] add no results label

---
 src/pages/Entry/Card/EntryBuys.vue    | 3 +--
 src/pages/Entry/Card/EntrySummary.vue | 5 +++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 168e56f14..c6647de50 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -332,7 +332,7 @@ const lockIconType = (groupingMode, mode) => {
                 class="full-width q-mt-md"
                 :grid="$q.screen.lt.md"
                 v-model:selected="rowsSelected"
-                :no-results-label="t('No results')"
+                :no-data-label="t('globals.noResults')"
             >
                 <template #body="props">
                     <QTr>
@@ -487,5 +487,4 @@ es:
     Confirm deletion: Confirmar eliminación
     Are you sure you want to delete this buy?: Seguro que quieres eliminar esta compra?
     Are you sure you want to delete this buys?: Seguro que quieres eliminar estas compras?
-    No results: Sin resultados
 </i18n>
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index f4bb36ef3..e6842a3f9 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -289,9 +289,9 @@ const fetchEntryBuys = async () => {
                 <QTable
                     :rows="entryBuys"
                     :columns="entriesTableColumns"
-                    hide-bottom
                     row-key="index"
                     class="full-width q-mt-md"
+                    :no-data-label="t('globals.noResults')"
                 >
                     <template #body="{ cols, row, rowIndex }">
                         <QTr no-hover>
@@ -355,5 +355,6 @@ const fetchEntryBuys = async () => {
 
 <i18n>
 es:
-    Travel data: 'Datos envío'
+    Travel data: Datos envío
+
 </i18n>

From ac5d83b8cccc52e54c92dbebad026741052b6ae8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 23 Feb 2024 21:23:42 -0300
Subject: [PATCH 12/37] Several changes

---
 src/pages/Supplier/Card/SupplierAccounts.vue   |  2 +-
 src/pages/Supplier/Card/SupplierContacts.vue   | 12 +++++++++++-
 src/pages/Supplier/Card/SupplierDescriptor.vue |  1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 302e03217..39bcca63c 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -114,7 +114,7 @@ onMounted(() => {
                             :label="t('worker.create.bankEntity')"
                             v-model="row.bankEntityFk"
                             :options="bankEntitiesOptions"
-                            option-label="name"
+                            option-label="bic"
                             option-value="id"
                             hide-selected
                         >
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index d69b74a4c..571b57f00 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -11,6 +11,15 @@ const route = useRoute();
 const { t } = useI18n();
 const supplierContactRef = ref(null);
 
+const insertRow = () => {
+    supplierContactRef.value.insert();
+    setTimeout(() => {
+        const inputs = document.querySelectorAll('[input-name-focusable]');
+        const lastInput = inputs[inputs.length - 1];
+        if (lastInput) lastInput.focus();
+    }, 5);
+};
+
 onMounted(() => {
     if (supplierContactRef.value) supplierContactRef.value.reload();
 });
@@ -38,6 +47,7 @@ onMounted(() => {
                     <VnRow class="row q-gutter-md">
                         <div class="col">
                             <VnInput
+                                input-name-focusable
                                 :label="t('supplier.contacts.name')"
                                 v-model="row.name"
                             />
@@ -92,7 +102,7 @@ onMounted(() => {
                         size="sm"
                         class="cursor-pointer"
                         color="primary"
-                        @click="supplierContactRef.insert()"
+                        @click="insertRow()"
                     >
                         <QTooltip>
                             {{ t('Add contact') }}
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 83bad87d2..eabb95554 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -167,6 +167,7 @@ const getEntryQueryParams = (supplier) => {
                     <QTooltip>{{ t('All entries with current supplier') }}</QTooltip>
                 </QBtn>
                 <QBtn
+                    v-if="entity.client?.fi"
                     :to="{
                         name: 'CustomerCard',
                         params: { id: entity.client?.id },

From 90bfba02909a198a89e25e8cabeb8f87751bc78e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 26 Feb 2024 08:45:02 -0300
Subject: [PATCH 13/37] Create global variable for table separation row

---
 src/css/app.scss                      |  5 +++++
 src/pages/Entry/Card/EntryBuys.vue    |  5 +----
 src/pages/Entry/Card/EntrySummary.vue | 13 ++-----------
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index 4fec9db08..9a25d63e2 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -75,6 +75,11 @@ body.body--dark {
     background-color: var(--vn-light-gray);
 }
 
+.vn-table-separation-row {
+    height: 16px !important;
+    background-color: var(--vn-gray) !important;
+}
+
 /* Estilo para el asterisco en campos requeridos */
 .q-field.required .q-field__label:after {
     content: ' *';
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index c6647de50..06d1fcb4c 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -420,7 +420,7 @@ const lockIconType = (groupingMode, mode) => {
                     </QTr>
                     <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->
                     <QTr v-if="props.rowIndex !== rows.length - 1" class="separation-row">
-                        <QTd colspan="12" style="height: 16px" />
+                        <QTd colspan="12" class="vn-table-separation-row" />
                     </QTr>
                 </template>
                 <template #item="props">
@@ -471,9 +471,6 @@ const lockIconType = (groupingMode, mode) => {
 </template>
 
 <style lang="scss" scoped>
-.separation-row {
-    background-color: var(--vn-gray) !important;
-}
 .grid-style-transition {
     transition: transform 0.28s, background-color 0.28s;
 }
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index e6842a3f9..e2828a1ce 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -334,11 +334,8 @@ const fetchEntryBuys = async () => {
                             </QTd>
                         </QTr>
                         <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->
-                        <QTr
-                            v-if="rowIndex !== entryBuys.length - 1"
-                            class="separation-row"
-                        >
-                            <QTd colspan="10" style="height: 16px" />
+                        <QTr v-if="rowIndex !== entryBuys.length - 1">
+                            <QTd colspan="10" class="vn-table-separation-row" />
                         </QTr>
                     </template>
                 </QTable>
@@ -347,12 +344,6 @@ const fetchEntryBuys = async () => {
     </CardSummary>
 </template>
 
-<style lang="scss" scoped>
-.separation-row {
-    background-color: var(--vn-gray) !important;
-}
-</style>
-
 <i18n>
 es:
     Travel data: Datos envío

From 740eedbe44f9bb0d8095efb4fe89371040543807 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 26 Feb 2024 09:54:59 -0300
Subject: [PATCH 14/37] Improve reactivity of card descriptor

---
 src/components/FormModel.vue             | 11 ++++++++++-
 src/pages/Entry/Card/EntryBasicData.vue  |  1 +
 src/pages/Entry/Card/EntryDescriptor.vue | 11 -----------
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 9fd16088c..00703d516 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -59,6 +59,10 @@ const $props = defineProps({
         type: Function,
         default: null,
     },
+    clearStoreOnUnmount: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const emit = defineEmits(['onFetch', 'onDataSaved']);
@@ -91,7 +95,12 @@ onMounted(async () => {
 });
 
 onUnmounted(() => {
-    state.unset($props.model);
+    // Restauramos los datos originales en el store si se realizaron cambios en el formulario pero no se guardaron, evitando modificaciones erróneas.
+    if (hasChanges.value) {
+        state.set($props.model, originalData.value);
+        return;
+    }
+    if ($props.clearStoreDataOnUnmount) state.unset($props.model);
 });
 
 const isLoading = ref(false);
diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index a98a1227f..4a8cf154a 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -61,6 +61,7 @@ const onFilterTravelSelected = (formData, id) => {
         :url-update="`Entries/${route.params.id}`"
         model="entry"
         auto-load
+        :clear-store-on-unmount="false"
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 13f24b93c..656f8d5fd 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -97,17 +97,6 @@ const getEntryRedirectionFilter = (entry) => {
     });
 };
 
-const refetchEntryDescriptorData = async () => {
-    await entryDescriptorRef.value.getData();
-};
-
-watch(
-    () => route.name,
-    async (_, from) => {
-        if (from === 'EntryBasicData') await refetchEntryDescriptorData();
-    }
-);
-
 const showEntryReport = () => {
     openReport(`Entries/${route.params.id}/entry-order-pdf`);
 };

From 84a0be0a5c787448d1c34f459bbae4fc166fe977 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 26 Feb 2024 10:52:24 -0300
Subject: [PATCH 15/37] Add new card to entry summary and fix links
 redirections

---
 src/pages/Entry/Card/EntrySummary.vue | 38 ++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index e2828a1ce..d8e98e141 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -148,9 +148,13 @@ const fetchEntryBuys = async () => {
         @on-fetch="(data) => setEntryData(data)"
     >
         <template #header-left>
-            <a class="header link" :href="entryUrl">
+            <router-link
+                :to="{ name: 'EntrySummary', params: { id: entityId } }"
+                class="header link"
+                :href="entryUrl"
+            >
                 <QIcon name="open_in_new" color="white" size="sm" />
-            </a>
+            </router-link>
         </template>
         <template #header>
             <span>{{ entry.id }} - {{ entry.supplier.nickname }}</span>
@@ -158,10 +162,13 @@ const fetchEntryBuys = async () => {
 
         <template #body>
             <QCard class="vn-one">
-                <a class="header link" :href="entryUrl">
+                <router-link
+                    :to="{ name: 'EntryBasicData', params: { id: entityId } }"
+                    class="header link"
+                >
                     {{ t('globals.summary.basicData') }}
                     <QIcon name="open_in_new" color="primary" />
-                </a>
+                </router-link>
                 <VnRow>
                     <div class="col">
                         <VnLv
@@ -193,6 +200,17 @@ const fetchEntryBuys = async () => {
                             :value="entry.invoiceNumber"
                         />
                     </div>
+                </VnRow>
+            </QCard>
+            <QCard class="vn-one">
+                <router-link
+                    :to="{ name: 'EntryBasicData', params: { id: entityId } }"
+                    class="header link"
+                >
+                    {{ t('globals.summary.basicData') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </router-link>
+                <VnRow>
                     <div class="col">
                         <VnLv
                             :label="t('entry.summary.ordered')"
@@ -218,15 +236,17 @@ const fetchEntryBuys = async () => {
                         <VnLv
                             :label="t('entry.summary.excludedFromAvailable')"
                             :value="entry.isExcludedFromAvailable"
-                        />
-                    </div>
-                </VnRow>
+                        /></div
+                ></VnRow>
             </QCard>
             <QCard class="vn-one">
-                <a class="header link" :href="entryUrl">
+                <router-link
+                    :to="{ name: 'TravelSummary', params: { id: entry.travel.id } }"
+                    class="header link"
+                >
                     {{ t('Travel data') }}
                     <QIcon name="open_in_new" color="primary" />
-                </a>
+                </router-link>
                 <VnRow>
                     <div class="col">
                         <VnLv :label="t('entry.summary.travelReference')">

From e372c04d35303802a08bb67d893ae8c2b27c4804 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 26 Feb 2024 11:28:03 -0300
Subject: [PATCH 16/37] change variable name

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

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 00703d516..50cdf9ee3 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -100,7 +100,7 @@ onUnmounted(() => {
         state.set($props.model, originalData.value);
         return;
     }
-    if ($props.clearStoreDataOnUnmount) state.unset($props.model);
+    if ($props.clearStoreOnUnmount) state.unset($props.model);
 });
 
 const isLoading = ref(false);

From f048a1c820bf71410f446156b56b0e46e86c7989 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 26 Feb 2024 13:22:25 -0300
Subject: [PATCH 17/37] Add reactivity to supplier descriptor icons

---
 src/components/FormModel.vue                    | 11 ++++++++++-
 src/components/ui/CardDescriptor.vue            |  4 ++++
 src/pages/Supplier/Card/SupplierBasicData.vue   |  1 +
 src/pages/Supplier/Card/SupplierBillingData.vue |  1 +
 src/pages/Supplier/Card/SupplierDescriptor.vue  | 14 +++++++++-----
 src/pages/Supplier/Card/SupplierFiscalData.vue  |  1 +
 6 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 9fd16088c..50cdf9ee3 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -59,6 +59,10 @@ const $props = defineProps({
         type: Function,
         default: null,
     },
+    clearStoreOnUnmount: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const emit = defineEmits(['onFetch', 'onDataSaved']);
@@ -91,7 +95,12 @@ onMounted(async () => {
 });
 
 onUnmounted(() => {
-    state.unset($props.model);
+    // Restauramos los datos originales en el store si se realizaron cambios en el formulario pero no se guardaron, evitando modificaciones erróneas.
+    if (hasChanges.value) {
+        state.set($props.model, originalData.value);
+        return;
+    }
+    if ($props.clearStoreOnUnmount) state.unset($props.model);
 });
 
 const isLoading = ref(false);
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 345c8d088..92f95fd2c 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useState } from 'src/composables/useState';
 
 const $props = defineProps({
     url: {
@@ -35,6 +36,8 @@ const $props = defineProps({
         default: null,
     },
 });
+
+const state = useState();
 const slots = useSlots();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -64,6 +67,7 @@ async function getData() {
     isLoading.value = true;
     try {
         const { data } = await arrayData.fetch({ append: false, updateRouter: false });
+        state.set($props.dataKey, data);
         emit('onFetch', data);
     } finally {
         isLoading.value = false;
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index bc50deb9b..01741dd77 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -26,6 +26,7 @@ const workersOptions = ref([]);
         :url-update="`Suppliers/${route.params.id}`"
         model="supplier"
         auto-load
+        :clear-store-on-unmount="false"
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
index bf5ccb115..26b6e5461 100644
--- a/src/pages/Supplier/Card/SupplierBillingData.vue
+++ b/src/pages/Supplier/Card/SupplierBillingData.vue
@@ -33,6 +33,7 @@ const formatPayDems = (data) => {
         :url-update="`Suppliers/${route.params.id}`"
         model="supplier"
         auto-load
+        :clear-store-on-unmount="false"
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index eabb95554..3228151cb 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -9,6 +9,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import { toDateString } from 'src/filters';
 import useCardDescription from 'src/composables/useCardDescription';
 import { getUrl } from 'src/composables/getUrl';
+import { useState } from 'src/composables/useState';
 
 const $props = defineProps({
     id: {
@@ -21,6 +22,7 @@ const $props = defineProps({
 const route = useRoute();
 const { t } = useI18n();
 const url = ref();
+const state = useState();
 
 const filter = {
     fields: [
@@ -71,6 +73,8 @@ const setData = (entity) => {
     data.value = useCardDescription(entity.ref, entity.id);
 };
 
+const currentSupplier = computed(() => state.get('supplier'));
+
 const getEntryQueryParams = (supplier) => {
     if (!supplier) return null;
 
@@ -101,7 +105,7 @@ const getEntryQueryParams = (supplier) => {
         :subtitle="data.subtitle"
         :filter="filter"
         @on-fetch="setData"
-        data-key="Supplier"
+        data-key="supplier"
     >
         <template #header-extra-action>
             <QBtn
@@ -133,10 +137,10 @@ const getEntryQueryParams = (supplier) => {
             <VnLv :label="t('supplier.summary.payDay')" :value="entity.payDay" />
             <VnLv :label="t('supplier.summary.account')" :value="entity.account" />
         </template>
-        <template #icons="{ entity }">
-            <QCardActions class="q-gutter-x-md">
+        <template #icons>
+            <QCardActions v-if="currentSupplier" class="q-gutter-x-md">
                 <QIcon
-                    v-if="!entity.isActive"
+                    v-if="!currentSupplier.isActive"
                     name="vn:disabled"
                     color="primary"
                     size="xs"
@@ -144,7 +148,7 @@ const getEntryQueryParams = (supplier) => {
                     <QTooltip>{{ t('Inactive supplier') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!entity.isSerious"
+                    v-if="!currentSupplier.isSerious"
                     name="vn:supplierfalse"
                     color="primary"
                     size="xs"
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index b26582065..806dac0fe 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -53,6 +53,7 @@ function handleLocation(data, location) {
         :url-update="`Suppliers/${route.params.id}/updateFiscalData`"
         model="supplier"
         auto-load
+        :clear-store-on-unmount="false"
     >
         <template #form="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">

From 59dc1a4e3867a6b722f236113141c7e874aed5f7 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 27 Feb 2024 08:17:55 -0300
Subject: [PATCH 18/37] Entry summary icon redirection condition

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

diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index d8e98e141..b47469e3c 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -149,6 +149,7 @@ const fetchEntryBuys = async () => {
     >
         <template #header-left>
             <router-link
+                v-if="route.name !== 'EntrySummary'"
                 :to="{ name: 'EntrySummary', params: { id: entityId } }"
                 class="header link"
                 :href="entryUrl"

From e7e34ef21ae40edbe93137bcecc820c379eed887 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 27 Feb 2024 13:03:31 -0300
Subject: [PATCH 19/37] Hide Go to summary icon when is in supplier summary
 view

---
 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 442e03f9f..306057ff2 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -53,7 +53,7 @@ const isAdministrative = computed(() => {
     >
         <template #header-left>
             <router-link
-                v-if="isAdministrative"
+                v-if="isAdministrative && route.name !== 'SupplierSummary'"
                 class="header link"
                 :to="{ name: 'SupplierSummary', params: { id: entityId } }"
             >

From d863248177777a618ac4d1723e9e5cbe68546cb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Segarra=20Mart=C3=ADnez?= <jsegarra@verdnatura.es>
Date: Wed, 28 Feb 2024 06:38:25 +0100
Subject: [PATCH 20/37] refs #6940 fix: use onMounted

---
 src/pages/Route/Cmr/CmrList.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index dc5602c1c..ac3d36ac5 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { Notify } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
@@ -89,6 +89,8 @@ function downloadPdfs() {
     // prettier-ignore
     return window.open(`${getApiUrl()}/api/Routes/downloadCmrsZip?ids=${cmrs.join(',')}&access_token=${token}`);
 }
+
+onMounted(()=>{if(!stateStore.isRightDrawerShown())stateStore.toggleRightDrawer()})
 </script>
 <template>
     <div class="column items-center">

From 02934037e770054180221a8b544939e60ccd25e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Segarra=20Mart=C3=ADnez?= <jsegarra@verdnatura.es>
Date: Wed, 28 Feb 2024 06:38:59 +0100
Subject: [PATCH 21/37] refs #6940 fix: show button in Navbar

---
 src/pages/Route/Cmr/CmrList.vue | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index ac3d36ac5..eb1901ab8 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { Notify } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
@@ -89,10 +89,26 @@ function downloadPdfs() {
     // prettier-ignore
     return window.open(`${getApiUrl()}/api/Routes/downloadCmrsZip?ids=${cmrs.join(',')}&access_token=${token}`);
 }
-
-onMounted(()=>{if(!stateStore.isRightDrawerShown())stateStore.toggleRightDrawer()})
 </script>
 <template>
+      <template v-if="stateStore.isHeaderMounted()">
+
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
     <div class="column items-center">
         <div class="list">
             <VnPaginate

From f1961f07d103e78310aadfea9b2ece6bfb6bdb7a Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 28 Feb 2024 08:54:53 -0300
Subject: [PATCH 22/37] CardSummary changes

---
 src/components/ui/CardSummary.vue           | 26 ++++++++++++++++++---
 src/pages/Supplier/Card/SupplierSummary.vue | 10 +-------
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index cb2c97746..a950ec139 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -1,11 +1,10 @@
 <script setup>
 import { onMounted, ref, watch } from 'vue';
+import { useRoute } from 'vue-router';
 import axios from 'axios';
 import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 
-onMounted(() => fetch());
-
 const entity = ref();
 const props = defineProps({
     url: {
@@ -16,14 +15,25 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    summaryRouteName: {
+        type: String,
+        default: null,
+    },
 });
 const emit = defineEmits(['onFetch']);
+const route = useRoute();
+const isSummary = ref();
 
 defineExpose({
     entity,
     fetch,
 });
 
+onMounted(() => {
+    isSummary.value = String(route.path).endsWith('/summary');
+    fetch();
+});
+
 async function fetch() {
     const params = {};
 
@@ -48,7 +58,17 @@ watch(props, async () => {
             <template v-if="entity">
                 <div class="summaryHeader bg-primary q-pa-md text-weight-bolder">
                     <slot name="header-left">
-                        <span></span>
+                        <router-link
+                            v-if="!isSummary"
+                            class="header link"
+                            :to="{
+                                name: summaryRouteName,
+                                params: { id: entity.id },
+                            }"
+                        >
+                            <QIcon name="open_in_new" color="white" size="sm" />
+                        </router-link>
+                        <span v-else></span>
                     </slot>
                     <slot name="header" :entity="entity">
                         <VnLv :label="`${entity.id} -`" :value="entity.name" />
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 306057ff2..898872ef5 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -49,17 +49,9 @@ const isAdministrative = computed(() => {
     <CardSummary
         ref="summaryRef"
         :url="`Suppliers/${entityId}/getSummary`"
+        summary-route-name="SupplierSummary"
         @on-fetch="(data) => setData(data)"
     >
-        <template #header-left>
-            <router-link
-                v-if="isAdministrative && route.name !== 'SupplierSummary'"
-                class="header link"
-                :to="{ name: 'SupplierSummary', params: { id: entityId } }"
-            >
-                <QIcon name="open_in_new" color="white" size="sm" />
-            </router-link>
-        </template>
         <template #header>
             <span>{{ supplier.name }} - {{ supplier.id }}</span>
         </template>

From 9e86036f409d0657e007f5585c11b273e79e9968 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 28 Feb 2024 09:53:15 -0300
Subject: [PATCH 23/37] Change new address tooltip

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

diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
index c6b08075f..735b50625 100644
--- a/src/pages/Supplier/Card/SupplierAddresses.vue
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -83,8 +83,13 @@ const redirectToUpdateView = (addressData) => {
         <QPageSticky :offset="[20, 20]">
             <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
             <QTooltip>
-                {{ t('supplier.list.newSupplier') }}
+                {{ t('New address') }}
             </QTooltip>
         </QPageSticky>
     </QPage>
 </template>
+
+<i18n>
+es:
+    New address: Nueva dirección
+</i18n>

From fe5e448cf093e58d8c8916a12d03f8139e85460a Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 28 Feb 2024 10:13:49 -0300
Subject: [PATCH 24/37] Change show summary icon condition

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

diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index a950ec139..1f89dceda 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -59,7 +59,7 @@ watch(props, async () => {
                 <div class="summaryHeader bg-primary q-pa-md text-weight-bolder">
                     <slot name="header-left">
                         <router-link
-                            v-if="!isSummary"
+                            v-if="!isSummary && summaryRouteName"
                             class="header link"
                             :to="{
                                 name: summaryRouteName,

From b0d43edbce47bca5a3bc361ea4dfb8db7eb98ac6 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 28 Feb 2024 12:02:38 -0300
Subject: [PATCH 25/37] Route summary link logic improvement

---
 src/components/ui/CardSummary.vue               | 10 +++++-----
 src/pages/Claim/Card/ClaimSummary.vue           |  1 +
 src/pages/Entry/Card/EntrySummary.vue           |  6 ------
 src/pages/InvoiceOut/Card/InvoiceOutSummary.vue |  6 +++++-
 src/pages/Route/Card/RouteSummary.vue           | 11 +++++------
 src/pages/Supplier/Card/SupplierSummary.vue     |  1 -
 src/pages/Travel/Card/TravelSummary.vue         | 10 ----------
 src/router/modules/Supplier.js                  |  1 +
 src/router/modules/claim.js                     |  1 +
 src/router/modules/customer.js                  |  1 +
 src/router/modules/entry.js                     |  1 +
 src/router/modules/invoiceIn.js                 |  1 +
 src/router/modules/invoiceOut.js                |  1 +
 src/router/modules/order.js                     |  1 +
 src/router/modules/route.js                     |  1 +
 src/router/modules/shelving.js                  | 13 ++++++-------
 src/router/modules/ticket.js                    |  1 +
 src/router/modules/travel.js                    |  1 +
 src/router/modules/wagon.js                     |  1 +
 src/router/modules/worker.js                    |  1 +
 20 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index 1f89dceda..7799eee72 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -15,8 +15,8 @@ const props = defineProps({
         type: Object,
         default: null,
     },
-    summaryRouteName: {
-        type: String,
+    entityId: {
+        type: Number,
         default: null,
     },
 });
@@ -59,11 +59,11 @@ watch(props, async () => {
                 <div class="summaryHeader bg-primary q-pa-md text-weight-bolder">
                     <slot name="header-left">
                         <router-link
-                            v-if="!isSummary && summaryRouteName"
+                            v-if="!isSummary && route.meta.moduleName"
                             class="header link"
                             :to="{
-                                name: summaryRouteName,
-                                params: { id: entity.id },
+                                name: `${route.meta.moduleName}Summary`,
+                                params: { id: entityId || entity.id },
                             }"
                         >
                             <QIcon name="open_in_new" color="white" size="sm" />
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index b93cbbd81..cc66a8434 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -172,6 +172,7 @@ function openDialog(dmsId) {
     <CardSummary
         ref="summary"
         :url="`Claims/${entityId}/getSummary`"
+        :entity-id="entityId"
         @on-fetch="getClaimDms"
     >
         <template #header="{ entity: { claim } }">
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 3861e0321..7ac25a777 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -147,15 +147,9 @@ const fetchEntryBuys = async () => {
         :url="`Entries/${entityId}/getEntry`"
         @on-fetch="(data) => setEntryData(data)"
     >
-        <template #header-left>
-            <a class="header link" :href="entryUrl">
-                <QIcon name="open_in_new" color="white" size="sm" />
-            </a>
-        </template>
         <template #header>
             <span>{{ entry.id }} - {{ entry.supplier.nickname }}</span>
         </template>
-
         <template #body>
             <QCard class="vn-one">
                 <a class="header link" :href="entryUrl">
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index 5a56a3957..b80bf979d 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -95,7 +95,11 @@ const ticketsColumns = ref([
 </script>
 
 <template>
-    <CardSummary ref="summary" :url="`InvoiceOuts/${entityId}/summary`">
+    <CardSummary
+        ref="summary"
+        :url="`InvoiceOuts/${entityId}/summary`"
+        :entity-id="entityId"
+    >
         <template #header="{ entity: { invoiceOut } }">
             <div>{{ invoiceOut.ref }} - {{ invoiceOut.client?.socialName }}</div>
         </template>
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index df4495d3a..9801f3d28 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -132,12 +132,11 @@ const openBuscaman = async (route, ticket) => {
 
 <template>
     <div class="q-pa-md">
-        <CardSummary ref="summary" :url="`Routes/${entityId}/summary`">
-            <template #header-left>
-                <RouterLink :to="{ name: `RouteSummary`, params: { id: entityId } }">
-                    <QIcon name="open_in_new" color="white" size="sm" />
-                </RouterLink>
-            </template>
+        <CardSummary
+            ref="summary"
+            :url="`Routes/${entityId}/summary`"
+            :entity-id="entityId"
+        >
             <template #header="{ entity }">
                 <span>{{ `${entity?.route.id} - ${entity?.route?.description}` }}</span>
             </template>
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 898872ef5..417c2ac0d 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -49,7 +49,6 @@ const isAdministrative = computed(() => {
     <CardSummary
         ref="summaryRef"
         :url="`Suppliers/${entityId}/getSummary`"
-        summary-route-name="SupplierSummary"
         @on-fetch="(data) => setData(data)"
     >
         <template #header>
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 2ed6a0487..b17fb0c22 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -236,19 +236,9 @@ async function setTravelData(travelData) {
         :url="`Travels/${entityId}/getTravel`"
         @on-fetch="(data) => setTravelData(data)"
     >
-        <template #header-left>
-            <router-link
-                class="header link"
-                :to="{ name: 'TravelSummary', params: { id: entityId } }"
-            >
-                <QIcon name="open_in_new" color="white" size="sm" />
-                <QTooltip>{{ t('travel.pageTitles.summary') }}</QTooltip>
-            </router-link>
-        </template>
         <template #header>
             <span>{{ travel.ref }} - {{ travel.id }}</span>
         </template>
-
         <template #header-right>
             <QBtn color="white" dense flat icon="more_vert" round size="md">
                 <QTooltip>
diff --git a/src/router/modules/Supplier.js b/src/router/modules/Supplier.js
index d341ddc25..379a2c2c2 100644
--- a/src/router/modules/Supplier.js
+++ b/src/router/modules/Supplier.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'suppliers',
         icon: 'vn:supplier',
+        moduleName: 'Supplier',
     },
     component: RouterView,
     redirect: { name: 'SupplierMain' },
diff --git a/src/router/modules/claim.js b/src/router/modules/claim.js
index 1dfd75cff..3ab4f4cbf 100644
--- a/src/router/modules/claim.js
+++ b/src/router/modules/claim.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'claims',
         icon: 'vn:claims',
+        moduleName: 'Claim',
     },
     component: RouterView,
     redirect: { name: 'ClaimMain' },
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 716b0fa6c..75188bd32 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'customers',
         icon: 'vn:client',
+        moduleName: 'Customer',
     },
     component: RouterView,
     redirect: { name: 'CustomerMain' },
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 2f6c8cb4c..50a651af5 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'entries',
         icon: 'vn:entry',
+        moduleName: 'Entry',
     },
     component: RouterView,
     redirect: { name: 'EntryMain' },
diff --git a/src/router/modules/invoiceIn.js b/src/router/modules/invoiceIn.js
index 01ed37036..869a3555a 100644
--- a/src/router/modules/invoiceIn.js
+++ b/src/router/modules/invoiceIn.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'invoiceIns',
         icon: 'vn:invoice-in',
+        moduleName: 'InvoiceIn',
     },
     component: RouterView,
     redirect: { name: 'InvoiceInMain' },
diff --git a/src/router/modules/invoiceOut.js b/src/router/modules/invoiceOut.js
index 084cf6ac3..386e04ed8 100644
--- a/src/router/modules/invoiceOut.js
+++ b/src/router/modules/invoiceOut.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'invoiceOuts',
         icon: 'vn:invoice-out',
+        moduleName: 'InvoiceOut',
     },
     component: RouterView,
     redirect: { name: 'InvoiceOutMain' },
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
index 4599394cd..16d73281b 100644
--- a/src/router/modules/order.js
+++ b/src/router/modules/order.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'order',
         icon: 'vn:basket',
+        moduleName: 'Order',
     },
     component: RouterView,
     redirect: { name: 'OrderMain' },
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 614345913..fad991fc6 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'routes',
         icon: 'vn:delivery',
+        moduleName: 'Route',
     },
     component: RouterView,
     redirect: { name: 'RouteMain' },
diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index 494f286c3..d32c7d9f3 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -1,17 +1,18 @@
-import {RouterView} from "vue-router";
+import { RouterView } from 'vue-router';
 
 export default {
     path: '/shelving',
     name: 'Shelving',
     meta: {
         title: 'shelving',
-        icon: 'vn:inventory'
+        icon: 'vn:inventory',
+        moduleName: 'Shelving',
     },
     component: RouterView,
     redirect: { name: 'ShelvingMain' },
     menus: {
         main: ['ShelvingList'],
-        card: ['ShelvingBasicData', 'ShelvingLog']
+        card: ['ShelvingBasicData', 'ShelvingLog'],
     },
     children: [
         {
@@ -51,8 +52,7 @@ export default {
                     meta: {
                         title: 'summary',
                     },
-                    component: () =>
-                        import('pages/Shelving/Card/ShelvingSummary.vue'),
+                    component: () => import('pages/Shelving/Card/ShelvingSummary.vue'),
                 },
                 {
                     name: 'ShelvingBasicData',
@@ -75,6 +75,5 @@ export default {
                 },
             ],
         },
-    ]
+    ],
 };
-
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 73c441b4d..d6b714154 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'tickets',
         icon: 'vn:ticket',
+        moduleName: 'Ticket',
     },
     component: RouterView,
     redirect: { name: 'TicketMain' },
diff --git a/src/router/modules/travel.js b/src/router/modules/travel.js
index 792b393e4..2f1e2150e 100644
--- a/src/router/modules/travel.js
+++ b/src/router/modules/travel.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'travel',
         icon: 'local_airport',
+        moduleName: 'Travel',
     },
     component: RouterView,
     redirect: { name: 'TravelMain' },
diff --git a/src/router/modules/wagon.js b/src/router/modules/wagon.js
index 238e482dd..6f9a4c819 100644
--- a/src/router/modules/wagon.js
+++ b/src/router/modules/wagon.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'wagons',
         icon: 'vn:trolley',
+        moduleName: 'Wagon',
     },
     component: RouterView,
     redirect: { name: 'WagonMain' },
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 27a6f19a9..171e346c6 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'workers',
         icon: 'vn:worker',
+        moduleName: 'Worker',
     },
     component: RouterView,
     redirect: { name: 'WorkerMain' },

From ff94d7e43d61a34f81fba0a67fd356d43f89ce8b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 4 Mar 2024 09:47:47 -0300
Subject: [PATCH 26/37] supplier account changes

---
 src/components/CreateBankEntityForm.vue      |  6 +++---
 src/components/FormModelPopup.vue            |  6 +++---
 src/pages/Supplier/Card/SupplierAccounts.vue | 13 ++++++++++---
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 106dbec3a..0ad35490e 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -32,8 +32,8 @@ const countriesFilter = {
 
 const countriesOptions = ref([]);
 
-const onDataSaved = (data) => {
-    emit('onDataSaved', data);
+const onDataSaved = (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
 };
 </script>
 
@@ -50,7 +50,7 @@ const onDataSaved = (data) => {
         :title="t('title')"
         :subtitle="t('subtitle')"
         :form-initial-data="bankEntityFormData"
-        @on-data-saved="onDataSaved($event)"
+        @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index 04322a3c8..cc22c77db 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -42,8 +42,8 @@ const { t } = useI18n();
 const closeButton = ref(null);
 const isLoading = ref(false);
 
-const onDataSaved = (dataSaved) => {
-    emit('onDataSaved', dataSaved);
+const onDataSaved = (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
     closeForm();
 };
 
@@ -59,7 +59,7 @@ const closeForm = () => {
         :default-actions="false"
         :url-create="urlCreate"
         :model="model"
-        @on-data-saved="onDataSaved($event)"
+        @on-data-saved="onDataSaved"
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 39bcca63c..41df6adb9 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -18,13 +18,16 @@ const quasar = useQuasar();
 const { notify } = useNotify();
 const route = useRoute();
 const { t } = useI18n();
+
+const bankEntitiesRef = ref(null);
 const supplier = ref(null);
 const supplierAccountRef = ref(null);
 const wireTransferFk = ref(null);
 const bankEntitiesOptions = ref([]);
 
-const onBankEntityCreated = (data) => {
-    bankEntitiesOptions.value.push(data);
+const onBankEntityCreated = async (dataSaved, rowData) => {
+    await bankEntitiesRef.value.fetch();
+    rowData.bankEntityFk = dataSaved.id;
 };
 
 const onChangesSaved = () => {
@@ -63,6 +66,7 @@ onMounted(() => {
 </script>
 <template>
     <FetchData
+        ref="bankEntitiesRef"
         url="BankEntities"
         @on-fetch="(data) => (bankEntitiesOptions = data)"
         auto-load
@@ -120,7 +124,10 @@ onMounted(() => {
                         >
                             <template #form>
                                 <CreateBankEntityForm
-                                    @on-data-saved="onBankEntityCreated($event)"
+                                    @on-data-saved="
+                                        (_, requestResponse) =>
+                                            onBankEntityCreated(requestResponse, row)
+                                    "
                                     :show-entity-field="false"
                                 />
                             </template>

From 9f1abf5cdec933b5f5029be0f82a3a41b15c4af9 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 4 Mar 2024 10:12:55 -0300
Subject: [PATCH 27/37] Use next tick

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

diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index 571b57f00..3abe5a9cc 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted } from 'vue';
+import { ref, onMounted, nextTick } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -13,11 +13,11 @@ const supplierContactRef = ref(null);
 
 const insertRow = () => {
     supplierContactRef.value.insert();
-    setTimeout(() => {
+    nextTick(() => {
         const inputs = document.querySelectorAll('[input-name-focusable]');
         const lastInput = inputs[inputs.length - 1];
         if (lastInput) lastInput.focus();
-    }, 5);
+    });
 };
 
 onMounted(() => {

From 052123ad0e6259d6e08b53bbc82352a1eae78e1b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 5 Mar 2024 09:58:54 -0300
Subject: [PATCH 28/37] Change currentSupplier variable name

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

diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 3228151cb..fc806f588 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -73,7 +73,7 @@ const setData = (entity) => {
     data.value = useCardDescription(entity.ref, entity.id);
 };
 
-const currentSupplier = computed(() => state.get('supplier'));
+const supplier = computed(() => state.get('supplier'));
 
 const getEntryQueryParams = (supplier) => {
     if (!supplier) return null;
@@ -138,9 +138,9 @@ const getEntryQueryParams = (supplier) => {
             <VnLv :label="t('supplier.summary.account')" :value="entity.account" />
         </template>
         <template #icons>
-            <QCardActions v-if="currentSupplier" class="q-gutter-x-md">
+            <QCardActions v-if="supplier" class="q-gutter-x-md">
                 <QIcon
-                    v-if="!currentSupplier.isActive"
+                    v-if="!supplier.isActive"
                     name="vn:disabled"
                     color="primary"
                     size="xs"
@@ -148,7 +148,7 @@ const getEntryQueryParams = (supplier) => {
                     <QTooltip>{{ t('Inactive supplier') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!currentSupplier.isSerious"
+                    v-if="!supplier.isSerious"
                     name="vn:supplierfalse"
                     color="primary"
                     size="xs"

From 912d54ea557d4c08ee582336bc413f6a26c61784 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 5 Mar 2024 11:03:07 -0300
Subject: [PATCH 29/37] new bank entity add focus to bic input on mounted

---
 src/components/CreateBankEntityForm.vue | 11 ++++++++---
 src/components/common/VnInput.vue       | 12 ++++++++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 0ad35490e..2d098beb0 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { reactive, ref, onMounted, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnInput from 'src/components/common/VnInput.vue';
 
@@ -16,9 +16,8 @@ const props = defineProps({
 });
 
 const emit = defineEmits(['onDataSaved']);
-
 const { t } = useI18n();
-
+const bicInputRef = ref(null);
 const bankEntityFormData = reactive({
     name: null,
     bic: null,
@@ -35,6 +34,11 @@ const countriesOptions = ref([]);
 const onDataSaved = (formData, requestResponse) => {
     emit('onDataSaved', formData, requestResponse);
 };
+
+onMounted(async () => {
+    await nextTick();
+    bicInputRef.value.focus();
+});
 </script>
 
 <template>
@@ -64,6 +68,7 @@ const onDataSaved = (formData, requestResponse) => {
                 </div>
                 <div class="col">
                     <VnInput
+                        ref="bicInputRef"
                         :label="t('swift')"
                         v-model="data.bic"
                         :required="true"
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 8a01e0bee..ec836f2cd 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 const emit = defineEmits(['update:modelValue', 'update:options', 'keyup.enter']);
@@ -17,7 +17,7 @@ const $props = defineProps({
 
 const { t } = useI18n();
 const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
-
+const vnInputRef = ref(null);
 const value = computed({
     get() {
         return $props.modelValue;
@@ -40,6 +40,14 @@ const styleAttrs = computed(() => {
 const onEnterPress = () => {
     emit('keyup.enter');
 };
+
+const focus = () => {
+    vnInputRef.value.focus();
+};
+
+defineExpose({
+    focus,
+});
 </script>
 
 <template>

From 800b626c99b87bc8b67cc4d7ec461f1802bd4bb8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 6 Mar 2024 08:21:26 -0300
Subject: [PATCH 30/37] fire searchbar search on icon click

---
 src/components/ui/VnSearchbar.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 99710408d..d8155c21a 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -81,8 +81,9 @@ onMounted(() => {
 });
 
 async function search() {
-    const staticParams = Object.entries(store.userParams)
-        .filter(([key, value]) => value && (props.staticParams || []).includes(key));
+    const staticParams = Object.entries(store.userParams).filter(
+        ([key, value]) => value && (props.staticParams || []).includes(key)
+    );
     await arrayData.applyFilter({
         params: {
             ...Object.fromEntries(staticParams),
@@ -117,7 +118,12 @@ async function search() {
             autofocus
         >
             <template #prepend>
-                <QIcon name="search" v-if="!quasar.platform.is.mobile" />
+                <QIcon
+                    v-if="!quasar.platform.is.mobile"
+                    class="cursor-pointer"
+                    name="search"
+                    @click="search"
+                />
             </template>
             <template #append>
                 <QIcon

From fe8e4a834274ab1b85ba105c65605dddfdf3a8e8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 6 Mar 2024 09:52:43 -0300
Subject: [PATCH 31/37] add VnSelectDialog refill to action icon

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

diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 355a25109..bca014a19 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -59,6 +59,9 @@ const toggleForm = () => {
                 :name="actionIcon"
                 :size="actionIcon === 'add' ? 'xs' : 'sm'"
                 :class="['default-icon', { '--add-icon': actionIcon === 'add' }]"
+                :style="{
+                    'font-variation-settings': `'FILL' ${1}`,
+                }"
             >
                 <QTooltip v-if="tooltip">{{ tooltip }}</QTooltip>
             </QIcon>

From 319295f2c2d8e1eca264da56375b0cc025d13d3d Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 11 Mar 2024 16:53:33 -0300
Subject: [PATCH 32/37] Workers PDA

---
 src/i18n/en/index.js                |   7 ++
 src/i18n/es/index.js                |   7 ++
 src/pages/Worker/Card/WorkerPda.vue | 141 ++++++++++++++++++++++++++++
 src/router/modules/worker.js        |  11 ++-
 4 files changed, 165 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Worker/Card/WorkerPda.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 94d552be3..116cd9d01 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -833,6 +833,7 @@ export default {
             notifications: 'Notifications',
             workerCreate: 'New worker',
             department: 'Department',
+            pda: 'PDA',
         },
         list: {
             name: 'Name',
@@ -874,6 +875,12 @@ export default {
             subscribed: 'Subscribed to the notification',
             unsubscribed: 'Unsubscribed from the notification',
         },
+        pda: {
+            newPDA: 'New PDA',
+            model: 'Model',
+            serialNumber: 'Serial number',
+            removePDA: 'Deallocate PDA',
+        },
         create: {
             name: 'Name',
             lastName: 'Last name',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index bcd780f5b..728b99702 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -833,6 +833,7 @@ export default {
             notifications: 'Notificaciones',
             workerCreate: 'Nuevo trabajador',
             department: 'Departamentos',
+            pda: 'PDA',
         },
         list: {
             name: 'Nombre',
@@ -874,6 +875,12 @@ export default {
             subscribed: 'Se ha suscrito a la notificación',
             unsubscribed: 'Se ha dado de baja de la notificación',
         },
+        pda: {
+            newPDA: 'Nueva PDA',
+            model: 'Modelo',
+            serialNumber: 'Número de serie',
+            removePDA: 'Desasignar PDA',
+        },
         create: {
             name: 'Nombre',
             lastName: 'Apellido',
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
new file mode 100644
index 000000000..e01c80838
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -0,0 +1,141 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { onMounted, ref, computed } from 'vue';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+import { useRole } from 'src/composables/useRole';
+
+const route = useRoute();
+const { t } = useI18n();
+const { notify } = useNotify();
+const { hasAny } = useRole();
+
+const fetchCurrentDeviceRef = ref(null);
+const deviceProductionsFilter = {
+    fields: ['id', 'serialNumber', 'modelFk'],
+    where: { stateFk: 'idle' },
+    order: 'id',
+};
+const deviceProductionsOptions = ref([]);
+const newPDA = ref({});
+const currentPDA = ref(null);
+
+const isAllowedToEdit = computed(() => hasAny(['hr', 'productionAssi']));
+
+const setCurrentPDA = (data) => {
+    currentPDA.value = data;
+    currentPDA.value.description = `ID: ${currentPDA.value.deviceProductionFk} ${t(
+        'worker.pda.model'
+    )}: ${currentPDA.value.deviceProduction.modelFk} ${t('worker.pda.serialNumber')}: ${
+        currentPDA.value.deviceProduction.serialNumber
+    }`;
+};
+
+const deallocatePDA = async (data) => {
+    try {
+        await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
+            pda: currentPDA.value.deviceProductionFk,
+        });
+        data.pda = null;
+        currentPDA.value = null;
+        await fetchCurrentDeviceRef.value.fetch();
+        notify(t('PDA deallocated'), 'positive');
+    } catch (err) {
+        console.error('Error deallocating PDA');
+    }
+};
+
+onMounted(async () => await fetchCurrentDeviceRef.value.fetch());
+</script>
+
+<template>
+    <FetchData
+        url="DeviceProductions"
+        :filter="deviceProductionsFilter"
+        auto-load
+        @on-fetch="(data) => (deviceProductionsOptions = data)"
+    />
+    <FetchData
+        ref="fetchCurrentDeviceRef"
+        url="DeviceProductionUsers"
+        :filter="{
+            where: { userFk: route.params.id },
+            include: { relation: 'deviceProduction' },
+        }"
+        auto-load
+        @on-fetch="(data) => setCurrentPDA(data[0])"
+    />
+    <QPage class="column items-center q-pa-md">
+        <FormModel
+            url="DeviceProductionUsers"
+            :url-create="`Workers/${route.params.id}/allocatePDA`"
+            model="DeviceProductionUser"
+            :form-initial-data="newPDA"
+            auto-load
+            @on-data-saved="(_, data) => setCurrentPDA(data)"
+        >
+            <template #form="{ data }">
+                <QField
+                    v-if="currentPDA && currentPDA.description"
+                    :label="t('worker.pda.newPDA')"
+                    :model-value="currentPDA.description"
+                    :editable="false"
+                    class="full-width"
+                >
+                    <template #control>
+                        <div tabindex="0">
+                            {{ currentPDA.description }}
+                        </div>
+                    </template>
+                    <template v-if="isAllowedToEdit" #append>
+                        <QIcon
+                            name="delete"
+                            size="sm"
+                            class="cursor-pointer"
+                            color="primary"
+                            @click="deallocatePDA(data)"
+                        >
+                            <QTooltip>
+                                {{ t('worker.pda.removePDA') }}
+                            </QTooltip>
+                        </QIcon>
+                    </template>
+                </QField>
+
+                <VnSelectFilter
+                    v-else
+                    :label="t('worker.pda.newPDA')"
+                    v-model="data.pda"
+                    :options="deviceProductionsOptions"
+                    option-label="serialNumber"
+                    option-value="id"
+                    hide-selected
+                    :disable="!isAllowedToEdit"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>ID: {{ scope.opt?.id }}</QItemLabel>
+                                <QItemLabel caption>
+                                    {{ scope.opt?.modelFk }},
+                                    {{ scope.opt?.serialNumber }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelectFilter>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    PDA deallocated: PDA desasignada
+</i18n>
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 27a6f19a9..57a879536 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -11,7 +11,7 @@ export default {
     redirect: { name: 'WorkerMain' },
     menus: {
         main: ['WorkerList', 'WorkerDepartment'],
-        card: ['WorkerNotificationsManager'],
+        card: ['WorkerNotificationsManager', 'WorkerPda'],
         departmentCard: ['BasicData'],
     },
     children: [
@@ -75,6 +75,15 @@ export default {
                     component: () =>
                         import('src/pages/Worker/Card/WorkerNotificationsManager.vue'),
                 },
+                {
+                    name: 'WorkerPda',
+                    path: 'pda',
+                    meta: {
+                        title: 'pda',
+                        icon: 'phone_android',
+                    },
+                    component: () => import('src/pages/Worker/Card/WorkerPda.vue'),
+                },
             ],
         },
     ],

From 029fc043dea983806eb97b4b041303983070aeed Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 12 Mar 2024 08:08:20 -0300
Subject: [PATCH 33/37] Change title translation

---
 src/i18n/es/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 728b99702..b8ec8dc6b 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -876,7 +876,7 @@ export default {
             unsubscribed: 'Se ha dado de baja de la notificación',
         },
         pda: {
-            newPDA: 'Nueva PDA',
+            newPDA: 'PDA Actual',
             model: 'Modelo',
             serialNumber: 'Número de serie',
             removePDA: 'Desasignar PDA',

From dad2711311e4ef05747501cf8c83b9662d899cb6 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 12 Mar 2024 08:13:27 -0300
Subject: [PATCH 34/37] fix translation

---
 src/i18n/en/index.js                | 1 +
 src/i18n/es/index.js                | 3 ++-
 src/pages/Worker/Card/WorkerPda.vue | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 116cd9d01..ece6d516a 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -877,6 +877,7 @@ export default {
         },
         pda: {
             newPDA: 'New PDA',
+            currentPDA: 'Current PDA',
             model: 'Model',
             serialNumber: 'Serial number',
             removePDA: 'Deallocate PDA',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index b8ec8dc6b..be16e3671 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -876,7 +876,8 @@ export default {
             unsubscribed: 'Se ha dado de baja de la notificación',
         },
         pda: {
-            newPDA: 'PDA Actual',
+            newPDA: 'Nueva PDA',
+            currentPDA: 'PDA Actual',
             model: 'Modelo',
             serialNumber: 'Número de serie',
             removePDA: 'Desasignar PDA',
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index e01c80838..a487f2495 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -83,7 +83,7 @@ onMounted(async () => await fetchCurrentDeviceRef.value.fetch());
             <template #form="{ data }">
                 <QField
                     v-if="currentPDA && currentPDA.description"
-                    :label="t('worker.pda.newPDA')"
+                    :label="t('worker.pda.currentPDA')"
                     :model-value="currentPDA.description"
                     :editable="false"
                     class="full-width"

From 632049c13b967f7e36188f6f2c1b47332ad3ba66 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 12 Mar 2024 11:31:32 -0300
Subject: [PATCH 35/37] Assign button change

---
 src/components/FormModel.vue        | 39 +++++++++++++++++++----------
 src/i18n/en/index.js                |  1 +
 src/i18n/es/index.js                |  2 ++
 src/pages/Worker/Card/WorkerPda.vue |  4 +--
 4 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 9f5ae319c..61de5d9f5 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -10,6 +10,7 @@ import { useValidator } from 'src/composables/useValidator';
 import useNotify from 'src/composables/useNotify.js';
 import SkeletonForm from 'components/ui/SkeletonForm.vue';
 import VnConfirm from './ui/VnConfirm.vue';
+import { tMobile } from 'src/composables/tMobile';
 
 const quasar = useQuasar();
 const state = useState();
@@ -43,6 +44,10 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    defaultButtons: {
+        type: Object,
+        default: () => {},
+    },
     autoLoad: {
         type: Boolean,
         default: false,
@@ -119,7 +124,19 @@ const hasChanges = ref(!$props.observeFormChanges);
 const originalData = ref({ ...$props.formInitialData });
 const formData = computed(() => state.get($props.model));
 const formUrl = computed(() => $props.url);
-
+const defaultButtons = computed(() => ({
+    save: {
+        color: 'primary',
+        icon: 'restart_alt',
+        label: 'globals.save',
+    },
+    reset: {
+        color: 'primary',
+        icon: 'save',
+        label: 'globals.reset',
+    },
+    ...$props.defaultButtons,
+}));
 const startFormWatcher = () => {
     watch(
         () => formData.value,
@@ -131,10 +148,6 @@ const startFormWatcher = () => {
     );
 };
 
-function tMobile(...args) {
-    if (!quasar.platform.is.mobile) return t(...args);
-}
-
 async function fetch() {
     const { data } = await axios.get($props.url, {
         params: { filter: JSON.stringify($props.filter) },
@@ -233,21 +246,21 @@ watch(formUrl, async () => {
             <QBtnGroup push class="q-gutter-x-sm">
                 <slot name="moreActions" />
                 <QBtn
-                    :label="tMobile('globals.reset')"
-                    color="primary"
-                    icon="restart_alt"
+                    :label="tMobile(defaultButtons.reset.label)"
+                    :color="defaultButtons.reset.color"
+                    :icon="defaultButtons.reset.icon"
                     flat
                     @click="reset"
                     :disable="!hasChanges"
-                    :title="t('globals.reset')"
+                    :title="t(defaultButtons.reset.label)"
                 />
                 <QBtn
-                    :label="tMobile('globals.save')"
-                    color="primary"
-                    icon="save"
+                    :label="tMobile(defaultButtons.save.label)"
+                    :color="defaultButtons.save.color"
+                    :icon="defaultButtons.save.icon"
                     @click="save"
                     :disable="!hasChanges"
-                    :title="t('globals.save')"
+                    :title="t(defaultButtons.save.label)"
                 />
             </QBtnGroup>
         </div>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index ece6d516a..0be04003e 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -31,6 +31,7 @@ export default {
         close: 'Close',
         cancel: 'Cancel',
         confirm: 'Confirm',
+        assign: 'Assign',
         back: 'Back',
         yes: 'Yes',
         no: 'No',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index be16e3671..a9684e4d7 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -31,6 +31,7 @@ export default {
         close: 'Cerrar',
         cancel: 'Cancelar',
         confirm: 'Confirmar',
+        assign: 'Asignar',
         back: 'Volver',
         yes: 'Si',
         no: 'No',
@@ -881,6 +882,7 @@ export default {
             model: 'Modelo',
             serialNumber: 'Número de serie',
             removePDA: 'Desasignar PDA',
+            assignPDA: 'Asignar PDA',
         },
         create: {
             name: 'Nombre',
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index a487f2495..2c2da5d4c 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -2,11 +2,9 @@
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { onMounted, ref, computed } from 'vue';
-
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
-
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import { useRole } from 'src/composables/useRole';
@@ -77,7 +75,9 @@ onMounted(async () => await fetchCurrentDeviceRef.value.fetch());
             :url-create="`Workers/${route.params.id}/allocatePDA`"
             model="DeviceProductionUser"
             :form-initial-data="newPDA"
+            :default-actions="true"
             auto-load
+            :default-buttons="{ save: { label: 'globals.assign', color: 'primary' } }"
             @on-data-saved="(_, data) => setCurrentPDA(data)"
         >
             <template #form="{ data }">

From bd5eb1a1c3f334fa9511f842ed0e238019fe179c Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 12 Mar 2024 11:34:38 -0300
Subject: [PATCH 36/37] remove assignPDA translation

---
 src/i18n/es/index.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index a9684e4d7..610c6017f 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -882,7 +882,6 @@ export default {
             model: 'Modelo',
             serialNumber: 'Número de serie',
             removePDA: 'Desasignar PDA',
-            assignPDA: 'Asignar PDA',
         },
         create: {
             name: 'Nombre',

From ff0b0c81315937372af0cc363dfdd0465bee1db4 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 12 Mar 2024 12:38:44 -0300
Subject: [PATCH 37/37] Remove innecesary prop

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

diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index 2c2da5d4c..ef8c3fe8e 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -75,7 +75,6 @@ onMounted(async () => await fetchCurrentDeviceRef.value.fetch());
             :url-create="`Workers/${route.params.id}/allocatePDA`"
             model="DeviceProductionUser"
             :form-initial-data="newPDA"
-            :default-actions="true"
             auto-load
             :default-buttons="{ save: { label: 'globals.assign', color: 'primary' } }"
             @on-data-saved="(_, data) => setCurrentPDA(data)"