From 2806c94fdbb5c75529751441393c9499a3c5d28a Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 20 Nov 2024 09:22:50 +0100
Subject: [PATCH 1/6] fix: fix create bankEntity

---
 src/components/CreateBankEntityForm.vue      | 15 ++++++---------
 src/pages/Supplier/Card/SupplierAccounts.vue |  1 -
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index a42be6ef8..5211d6e9d 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -9,8 +9,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
 import { useState } from 'src/composables/useState';
 
-defineProps({ showEntityField: { type: Boolean, default: true } });
-
 const emit = defineEmits(['onDataSaved']);
 const { t } = useI18n();
 const bicInputRef = ref(null);
@@ -22,13 +20,8 @@ const bankEntityFormData = reactive({
     name: null,
     bic: null,
     countryFk: customer.value?.countryFk,
-    id: null,
 });
 
-const countriesFilter = {
-    fields: ['id', 'name', 'code'],
-};
-
 const countriesOptions = ref([]);
 
 const onDataSaved = (...args) => {
@@ -44,7 +37,6 @@ onMounted(async () => {
 <template>
     <FetchData
         url="Countries"
-        :filter="countriesFilter"
         auto-load
         @on-fetch="(data) => (countriesOptions = data)"
     />
@@ -85,7 +77,12 @@ onMounted(async () => {
                         :rules="validate('bankEntity.countryFk')"
                     />
                 </div>
-                <div v-if="showEntityField" class="col">
+                <div
+                    v-if="
+                        countriesOptions.find((c) => c.id === data.countryFk).code == 'ES'
+                    "
+                    class="col"
+                >
                     <VnInput
                         :label="t('id')"
                         v-model="data.id"
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index bc009d3ad..08bebb67e 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -126,7 +126,6 @@ const setWireTransfer = async () => {
                                     (_, requestResponse) =>
                                         onBankEntityCreated(requestResponse, row)
                                 "
-                                :show-entity-field="false"
                             />
                         </template>
                         <template #option="scope">

From c59baf9cf507c12df101318a99c569f1ff503d14 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 20 Nov 2024 09:52:11 +0100
Subject: [PATCH 2/6] fix: fix code

---
 src/components/CreateBankEntityForm.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 5211d6e9d..cbd645056 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -79,7 +79,8 @@ onMounted(async () => {
                 </div>
                 <div
                     v-if="
-                        countriesOptions.find((c) => c.id === data.countryFk).code == 'ES'
+                        countriesOptions.find((c) => c.id === data.countryFk)?.code ==
+                        'ES'
                     "
                     class="col"
                 >

From 131cd2de8c52d9d3c28ec8cd1088618e71fea8ef Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 20 Nov 2024 09:53:52 +0100
Subject: [PATCH 3/6] fix: options

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

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index cbd645056..2da3aa994 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -16,6 +16,10 @@ const state = useState();
 
 const customer = computed(() => state.get('customer'));
 
+const countriesFilter = {
+    fields: ['id', 'name', 'code'],
+};
+
 const bankEntityFormData = reactive({
     name: null,
     bic: null,
@@ -46,6 +50,7 @@ onMounted(async () => {
         :title="t('title')"
         :subtitle="t('subtitle')"
         :form-initial-data="bankEntityFormData"
+        :filter="countriesFilter"
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">

From 2a1cc494990e9589d82e88ee7faeabd64f507be4 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 20 Nov 2024 13:15:40 +0100
Subject: [PATCH 4/6] fix: ticketDescriptor

---
 src/components/common/VnInput.vue              | 8 +++++++-
 src/pages/Ticket/Card/TicketDescriptorMenu.vue | 8 ++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 1246eedcd..a74044136 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -99,7 +99,13 @@ const mixinRules = [
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="hover && value && !$attrs.disabled && $props.clearable"
+                    v-if="
+                        hover &&
+                        value &&
+                        !$attrs.disabled &&
+                        !$attrs.readonly &&
+                        $props.clearable
+                    "
                     @click="
                         () => {
                             value = null;
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index f1d30b1bd..b8e64cb79 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -239,7 +239,7 @@ function makeInvoiceDialog() {
 }
 async function makeInvoice() {
     const params = {
-        ticketsIds: [parseInt(ticketId)],
+        ticketsIds: [parseInt(ticketId.value)],
     };
     await axios.post(`Tickets/invoiceTicketsAndPdf`, params);
 
@@ -265,7 +265,7 @@ async function transferClient(client) {
 
 async function addTurn(day) {
     const params = {
-        ticketFk: parseInt(ticketId),
+        ticketFk: parseInt(ticketId.value),
         weekDay: day,
         agencyModeFk: ticket.value.agencyModeFk,
     };
@@ -280,7 +280,7 @@ async function addTurn(day) {
 
 async function createRefund(withWarehouse) {
     const params = {
-        ticketsIds: [parseInt(ticketId)],
+        ticketsIds: [parseInt(ticketId.value)],
         withWarehouse: withWarehouse,
         negative: true,
     };
@@ -368,7 +368,7 @@ async function uploadDocuware(force) {
 
     const { data } = await axios.post(`Docuwares/upload`, {
         fileCabinet: 'deliveryNote',
-        ticketIds: [parseInt(ticketId)],
+        ticketIds: [parseInt(ticketId.value)],
     });
 
     if (data) notify({ message: t('PDF sent!'), type: 'positive' });

From 7039b68bba8d540be53d5f19ff3cdfc24ef508f1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 20 Nov 2024 17:23:40 +0100
Subject: [PATCH 5/6] fix: refs #7874 show name

---
 src/pages/Claim/Card/ClaimNotes.vue   | 2 +-
 src/pages/Worker/Card/WorkerNotes.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index a4d11e9f6..134ee33ab 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -25,7 +25,7 @@ const claimFilter = computed(() => {
                 include: {
                     relation: 'user',
                     scope: {
-                        fields: ['id', 'nickname'],
+                        fields: ['id', 'nickname', 'name'],
                     },
                 },
             },
diff --git a/src/pages/Worker/Card/WorkerNotes.vue b/src/pages/Worker/Card/WorkerNotes.vue
index c15b1dfab..4f123206b 100644
--- a/src/pages/Worker/Card/WorkerNotes.vue
+++ b/src/pages/Worker/Card/WorkerNotes.vue
@@ -15,7 +15,7 @@ const filter = {
             include: {
                 relation: 'user',
                 scope: {
-                    fields: ['id', 'nickname'],
+                    fields: ['id', 'nickname', 'name'],
                 },
             },
         },

From 3b5d385d22646f18809955bc91bbba2780194f75 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 20 Nov 2024 22:43:04 +0100
Subject: [PATCH 6/6] fix: use id instead description to open
 InvoiceOutDescriptor

---
 src/pages/Claim/Card/ClaimLinesImport.vue   | 2 +-
 src/pages/Customer/Card/CustomerBalance.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimLinesImport.vue b/src/pages/Claim/Card/ClaimLinesImport.vue
index 539d11a7f..d39262a86 100644
--- a/src/pages/Claim/Card/ClaimLinesImport.vue
+++ b/src/pages/Claim/Card/ClaimLinesImport.vue
@@ -130,7 +130,7 @@ function cancel() {
                 <template #body-cell-description="{ row, value }">
                     <QTd auto-width align="right" class="link">
                         {{ value }}
-                        <ItemDescriptorProxy :id="row.itemFk"></ItemDescriptorProxy>
+                        <ItemDescriptorProxy :id="row.itemFk" />
                     </QTd>
                 </template>
             </QTable>
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index f6fc3eed2..712be5e09 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -256,10 +256,10 @@ const showBalancePdf = ({ id }) => {
             {{ toCurrency(balances[rowIndex]?.balance) }}
         </template>
         <template #column-description="{ row }">
-            <div class="link" v-if="row.isInvoice">
+            <span class="link" v-if="row.isInvoice" @click.stop>
                 {{ t('bill', { ref: row.description }) }}
-                <InvoiceOutDescriptorProxy :id="row.description" />
-            </div>
+                <InvoiceOutDescriptorProxy :id="row.id" />
+            </span>
             <span v-else class="q-pa-xs dotted rounded-borders" :title="row.description">
                 {{ row.description }}
             </span>