From c84786e0534bf1b4172ee6f67cbc98a94b982f0d Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 26 Aug 2024 11:41:35 +0200
Subject: [PATCH 1/6] refs #7355 fix accountPrivileges

---
 src/pages/Account/Card/AccountPrivileges.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/pages/Account/Card/AccountPrivileges.vue b/src/pages/Account/Card/AccountPrivileges.vue
index 1300f5018..04ae702ad 100644
--- a/src/pages/Account/Card/AccountPrivileges.vue
+++ b/src/pages/Account/Card/AccountPrivileges.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
@@ -9,21 +9,28 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const route = useRoute();
+const loading = ref(false);
 
 const rolesOptions = ref([]);
 const formModelRef = ref();
+watch(
+    () => route.params.id,
+    () => formModelRef.value.reset()
+);
 </script>
 <template>
     <FetchData url="VnRoles" auto-load @on-fetch="(data) => (rolesOptions = data)" />
+
+    <QSpinner v-if="loading" color="primary" size="md" />
     <FormModel
         ref="formModelRef"
         model="AccountPrivileges"
-        :url="`VnUsers/${route.params.id}/privileges`"
-        :url-create="`VnUsers/${route.params.id}/privileges`"
+        url="VnUsers/preview"
         auto-load
         @on-data-saved="formModelRef.fetch()"
     >
         <template #form="{ data }">
+            {{ data }}
             <div class="q-gutter-y-sm">
                 <QCheckbox
                     v-model="data.hasGrant"

From 8568d36ee579189fac38bec19ce5673e03341853 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 26 Aug 2024 12:40:01 +0200
Subject: [PATCH 2/6] refs #7355 fix privileges

---
 src/pages/Account/Card/AccountPrivileges.vue | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/pages/Account/Card/AccountPrivileges.vue b/src/pages/Account/Card/AccountPrivileges.vue
index 04ae702ad..ac2ce4007 100644
--- a/src/pages/Account/Card/AccountPrivileges.vue
+++ b/src/pages/Account/Card/AccountPrivileges.vue
@@ -9,7 +9,6 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const loading = ref(false);
 
 const rolesOptions = ref([]);
 const formModelRef = ref();
@@ -17,18 +16,11 @@ watch(
     () => route.params.id,
     () => formModelRef.value.reset()
 );
+console.log('formModelRef', formModelRef.value);
 </script>
 <template>
     <FetchData url="VnRoles" auto-load @on-fetch="(data) => (rolesOptions = data)" />
-
-    <QSpinner v-if="loading" color="primary" size="md" />
-    <FormModel
-        ref="formModelRef"
-        model="AccountPrivileges"
-        url="VnUsers/preview"
-        auto-load
-        @on-data-saved="formModelRef.fetch()"
-    >
+    <FormModel ref="formModelRef" model="AccountPrivileges" url="VnUsers" auto-load>
         <template #form="{ data }">
             {{ data }}
             <div class="q-gutter-y-sm">

From c4fc644a35a54c13105efd74b47e45c03d4de0c2 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 26 Aug 2024 13:08:47 +0200
Subject: [PATCH 3/6] refs #7355 remove data

---
 src/pages/Account/Card/AccountPrivileges.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Account/Card/AccountPrivileges.vue b/src/pages/Account/Card/AccountPrivileges.vue
index ac2ce4007..5700f9f88 100644
--- a/src/pages/Account/Card/AccountPrivileges.vue
+++ b/src/pages/Account/Card/AccountPrivileges.vue
@@ -22,7 +22,6 @@ console.log('formModelRef', formModelRef.value);
     <FetchData url="VnRoles" auto-load @on-fetch="(data) => (rolesOptions = data)" />
     <FormModel ref="formModelRef" model="AccountPrivileges" url="VnUsers" auto-load>
         <template #form="{ data }">
-            {{ data }}
             <div class="q-gutter-y-sm">
                 <QCheckbox
                     v-model="data.hasGrant"

From 64e776d3116c227ae8a6d07939bc9f1ecce10e4d Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 27 Aug 2024 10:02:59 +0200
Subject: [PATCH 4/6] refs #6899 fix invoiceFix

---
 src/pages/InvoiceOut/InvoiceOutGlobalForm.vue | 12 +++++++++++-
 src/pages/InvoiceOut/InvoiceOutList.vue       | 14 +++++++++++---
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 2070ef09c..32018cdd6 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -101,7 +101,17 @@ onMounted(async () => {
                 dense
                 outlined
                 rounded
-            />
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel>
+                                {{ scope.opt?.name }} #{{ scope.opt?.id }}
+                            </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
             <VnSelect
                 :label="t('invoiceOutSerialType')"
                 v-model="formData.serialType"
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index b08e12b3e..c2fcd049e 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -226,10 +226,18 @@ watchEffect(selectedRows);
                     url="Tickets"
                     v-model="data.ticketFk"
                     :label="t('invoiceOutList.tableVisibleColumns.ticket')"
-                    :options="ticketsOptions"
-                    option-label="nickname"
+                    option-label="id"
                     option-value="id"
-                />
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
                 <span class="q-ml-md">O</span>
             </div>
             <VnSelect

From 39656ee3f56c97a921bff335fd01ad6d136fa8c0 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 27 Aug 2024 10:11:38 +0200
Subject: [PATCH 5/6] refs #7355 remove privileges

---
 src/pages/Account/Card/AccountPrivileges.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Account/Card/AccountPrivileges.vue b/src/pages/Account/Card/AccountPrivileges.vue
index 5700f9f88..0574e08d2 100644
--- a/src/pages/Account/Card/AccountPrivileges.vue
+++ b/src/pages/Account/Card/AccountPrivileges.vue
@@ -16,7 +16,6 @@ watch(
     () => route.params.id,
     () => formModelRef.value.reset()
 );
-console.log('formModelRef', formModelRef.value);
 </script>
 <template>
     <FetchData url="VnRoles" auto-load @on-fetch="(data) => (rolesOptions = data)" />

From 72e4f102879816793bf27362b43b5e1bec54fe5c Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 27 Aug 2024 10:17:06 +0200
Subject: [PATCH 6/6] refs #6899 fix order

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

diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 32018cdd6..334933447 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -106,7 +106,7 @@ onMounted(async () => {
                     <QItem v-bind="scope.itemProps">
                         <QItemSection>
                             <QItemLabel>
-                                {{ scope.opt?.name }} #{{ scope.opt?.id }}
+                                #{{ scope.opt?.id }} {{ scope.opt?.name }}
                             </QItemLabel>
                         </QItemSection>
                     </QItem>