From 30f13b65f06115253441aec57ff59c7e5359445e Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 3 Feb 2025 14:19:50 +0100
Subject: [PATCH] refactor: refs #6897 streamline supplier selection component
 and enhance localization entries

---
 src/components/common/VnSelectSupplier.vue |  1 -
 src/pages/Entry/Card/EntryBasicData.vue    | 20 ++++----------------
 src/pages/Entry/Card/EntryDescriptor.vue   | 12 ++++++------
 src/pages/Entry/EntryFilter.vue            | 19 +++----------------
 src/pages/Entry/locale/es.yml              |  2 +-
 src/router/modules/entry.js                | 16 +++++-----------
 6 files changed, 19 insertions(+), 51 deletions(-)

diff --git a/src/components/common/VnSelectSupplier.vue b/src/components/common/VnSelectSupplier.vue
index f86db4f2d..c208600e3 100644
--- a/src/components/common/VnSelectSupplier.vue
+++ b/src/components/common/VnSelectSupplier.vue
@@ -1,5 +1,4 @@
 <script setup>
-import { computed } from 'vue';
 import VnSelect from 'components/common/VnSelect.vue';
 
 const model = defineModel({ type: [String, Number, Object] });
diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index 8d1c295c7..75e4ae51e 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -12,6 +12,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import VnSelectTravelExtended from 'src/components/common/VnSelectTravelExtended.vue';
+import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -58,24 +59,11 @@ onMounted(() => {
                     v-model="data.travelFk"
                     :onFilterTravelSelected="(data, result) => (data.travelFk = result)"
                 />
-                <VnSelect
-                    :label="t('globals.supplier')"
+                <VnSelectSupplier
                     v-model="data.supplierFk"
                     hide-selected
                     :required="true"
-                    map-options
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
-                                <QItemLabel caption>
-                                    {{ scope.opt?.nickname }}, {{ scope.opt?.id }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
+                />
             </VnRow>
             <VnRow>
                 <VnInput v-model="data.reference" :label="t('globals.reference')" />
@@ -153,7 +141,7 @@ onMounted(() => {
                     :label="t('entry.summary.excludedFromAvailable')"
                 />
                 <QCheckbox
-                    v-if="isAdministrative()"
+                    :disable="!isAdministrative()"
                     v-model="data.isBooked"
                     :label="t('entry.basicData.booked')"
                 />
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 003abee25..039bb09b9 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -1,19 +1,19 @@
 <script setup>
 import { ref, computed, onMounted } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import { toDate } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
-import filter from './EntryFilter.js';
+import { useQuasar } from 'quasar';
+import { usePrintService } from 'composables/usePrintService';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 import axios from 'axios';
-import { useRouter } from 'vue-router';
-import { useQuasar } from 'quasar';
 
 const quasar = useQuasar();
 const { push } = useRouter();
+const { openReport } = usePrintService();
 
 const $props = defineProps({
     id: {
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index e6c707086..3446bcab6 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -57,7 +57,7 @@ const entryFilterPanel = ref();
                         <QTooltip>
                             {{
                                 t(
-                                    'entry.list.tableVisibleColumns.isExcludedFromAvailable'
+                                    'entry.list.tableVisibleColumns.isExcludedFromAvailable',
                                 )
                             }}
                         </QTooltip>
@@ -87,19 +87,6 @@ const entryFilterPanel = ref();
                         </QTooltip>
                     </QCheckbox>
                 </QItemSection>
-                <QItemSection>
-                    <QCheckbox
-                        :label="t('params.isRaid')"
-                        v-model="params.isRaid"
-                        toggle-indeterminate
-                    >
-                        <QTooltip>
-                            {{ t('entry.list.tableVisibleColumns.isRaid') }}
-                        </QTooltip>
-                    </QCheckbox>
-                </QItemSection>
-            </QItem>
-            <QItem>
                 <QItemSection>
                     <QCheckbox
                         :label="t('entry.list.tableVisibleColumns.isConfirmed')"
@@ -211,10 +198,10 @@ const entryFilterPanel = ref();
                             <QItem v-bind="scope.itemProps">
                                 <QItemSection>
                                     <QItemLabel>
-                                        {{ scope.opt?.name}}
+                                        {{ scope.opt?.name }}
                                     </QItemLabel>
                                     <QItemLabel caption>
-                                        {{ `#${scope.opt?.id } , ${ scope.opt?.nickname}` }}
+                                        {{ `#${scope.opt?.id} , ${scope.opt?.nickname}` }}
                                     </QItemLabel>
                                 </QItemSection>
                             </QItem>
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index ae28568c6..404ee335c 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -55,7 +55,7 @@ entry:
         currency: Moneda
         observation: Observación
         commission: Comisión
-        booked: Asentado
+        booked: Contabilizada
         excludedFromAvailable: Inventario
         initialTemperature: Ini °C
         finalTemperature: Fin °C
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index f362c7653..52c4066b4 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -6,13 +6,7 @@ const entryCard = {
     component: () => import('src/pages/Entry/Card/EntryCard.vue'),
     redirect: { name: 'EntrySummary' },
     meta: {
-        menu: [
-            'EntryBasicData',
-            'EntryBuys',
-            'EntryNotes',
-            'EntryDms',
-            'EntryLog',
-        ],
+        menu: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryDms', 'EntryLog'],
     },
     children: [
         {
@@ -91,7 +85,7 @@ export default {
             'EntryLatestBuys',
             'EntryStockBought',
             'EntryWasteRecalc',
-        ]
+        ],
     },
     component: RouterView,
     redirect: { name: 'EntryMain' },
@@ -103,7 +97,7 @@ export default {
             redirect: { name: 'EntryIndexMain' },
             children: [
                 {
-                    path:'',
+                    path: '',
                     name: 'EntryIndexMain',
                     redirect: { name: 'EntryList' },
                     component: () => import('src/pages/Entry/EntryList.vue'),
@@ -127,7 +121,7 @@ export default {
                         icon: 'add',
                     },
                     component: () => import('src/pages/Entry/EntryCreate.vue'),
-                },                
+                },
                 {
                     path: 'my',
                     name: 'MyEntries',
@@ -167,4 +161,4 @@ export default {
             ],
         },
     ],
-};
\ No newline at end of file
+};