From 6b8bba77af2cf7c5d3b6d393bb585409a358170b Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 11 Mar 2025 14:44:31 +0100
Subject: [PATCH] feat: refs #8602 add sorting options for select fields and
 update locale files with supplier name

---
 src/pages/Entry/Card/EntryBasicData.vue | 10 ++++++++++
 src/pages/Entry/Card/EntryBuys.vue      |  4 +---
 src/pages/Entry/EntryList.vue           |  2 +-
 src/pages/Entry/locale/en.yml           |  1 +
 src/pages/Entry/locale/es.yml           |  1 +
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index 3e0d834d9..e487f4e95 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -85,6 +85,7 @@ onMounted(() => {
                     :options="companiesOptions"
                     option-value="id"
                     option-label="code"
+                    sort-by="code"
                     map-options
                     hide-selected
                     :required="true"
@@ -103,6 +104,7 @@ onMounted(() => {
                     :options="currenciesOptions"
                     option-value="id"
                     option-label="code"
+                    sort-by="code"
                 />
             </VnRow>
             <VnRow class="q-py-sm">
@@ -122,6 +124,14 @@ onMounted(() => {
                     :decimal-places="2"
                     :positive="false"
                 />
+                <VnSelect
+                    v-model="data.typeFk"
+                    url="entryTypes"
+                    :fields="['code', 'description']"
+                    option-value="code"
+                    optionLabel="description"
+                    sortBy="description"
+                />
             </VnRow>
             <VnRow class="q-py-sm">
                 <QInput
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 220b50a41..5cd0fc5b1 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -183,7 +183,6 @@ const columns = [
         },
     },
     {
-        align: 'right',
         labelAbbreviation: 'GM',
         label: t('Grouping selector'),
         toolTip: t('Grouping selector'),
@@ -211,7 +210,6 @@ const columns = [
         },
     },
     {
-        align: 'center',
         labelAbbreviation: 'G',
         label: 'Grouping',
         toolTip: 'Grouping',
@@ -644,7 +642,7 @@ onMounted(() => {
         :is-editable="editableMode"
         :without-header="!editableMode"
         :with-filters="editableMode"
-        :right-search="editableMode"
+        :right-search="false"
         :row-click="false"
         :columns="columns"
         :beforeSaveFn="beforeSave"
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index abcdb5fcd..5ebad3144 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -200,7 +200,7 @@ const columns = computed(() => [
             fields: ['code', 'description'],
             optionValue: 'code',
             optionLabel: 'description',
-            sortBy: 'description ASC',
+            sortBy: 'description',
         },
         width: '65px',
         format: (row, dashIfEmpty) => dashIfEmpty(row.entryTypeDescription),
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 1ba196824..0bc92a5ea 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -113,6 +113,7 @@ entry:
         daysAgo: Days ago
         toShipped: T. shipped
         fromShipped: F. shipped
+        supplierName: Supplier
     search: Search entries
     searchInfo: You can search by entry reference
     descriptorMenu:
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index c1fc35312..ec6308393 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -116,6 +116,7 @@ entry:
         daysAgo: Días atras
         toShipped: F. salida(hasta)
         fromShipped: F. salida(desde)
+        supplierName: Proveedor
 entryFilter:
     params:
         isExcludedFromAvailable: Excluido