From c0be47a2e41fb4e354b6f5fedb1c95bb10660fa7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 26 Nov 2024 11:29:52 +0000
Subject: [PATCH 01/17] style: limit space QCheckbox when is children's
 QItemSection

---
 src/css/app.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/css/app.scss b/src/css/app.scss
index d4c76ad6b..5f19731d7 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -292,3 +292,7 @@ input::-webkit-inner-spin-button {
 .no-visible {
     visibility: hidden;
 }
+
+.q-item > .q-item__section > .q-checkbox {
+    max-width: fit-content;
+}

From e3fa756b1483c665d2f78fa7f59d615e3678d99a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 26 Nov 2024 11:36:05 +0000
Subject: [PATCH 02/17] style: remove space from checkbox

---
 src/css/app.scss | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index 5f19731d7..86eeb6116 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -293,6 +293,10 @@ input::-webkit-inner-spin-button {
     visibility: hidden;
 }
 
-.q-item > .q-item__section > .q-checkbox {
-    max-width: fit-content;
+.q-item > .q-item__section:has(.q-checkbox) {
+    max-width: min-content;
+}
+
+.row > .column:has(.q-checkbox) {
+    max-width: min-content;
 }

From 64fcf3c824cbde78d67895d343892fb031cf0ef2 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 14 Jan 2025 11:36:46 +0100
Subject: [PATCH 03/17] fix: hotfix 7366 6943

---
 src/i18n/locale/en.yml                          | 1 +
 src/i18n/locale/es.yml                          | 1 +
 src/pages/Customer/Card/CustomerBillingData.vue | 2 +-
 src/pages/Customer/Card/CustomerCredits.vue     | 1 +
 src/pages/Travel/TravelList.vue                 | 7 +++++++
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 33829d98d..4b9accb91 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -773,6 +773,7 @@ travel:
             totalEntries: Total entries
             totalEntriesTooltip: Total entries
             daysOnward: Landed days onwards
+            awb: AWB
     summary:
         entryId: Entry Id
         freight: Freight
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f0cbe3543..f91a02e6a 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -774,6 +774,7 @@ travel:
             totalEntries: ∑
             totalEntriesTooltip: Entradas totales
             daysOnward: Días de llegada en adelante
+            awb: AWB
     summary:
         entryId: Id entrada
         freight: Porte
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index 48f729e29..29394ceec 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -38,7 +38,7 @@ const getBankEntities = (data, formData) => {
                     hide-selected
                     option-label="name"
                     option-value="id"
-                    v-model="data.payMethod"
+                    v-model="data.payMethodFk"
                 />
                 <VnInput :label="t('Due day')" clearable v-model="data.dueDay" />
             </VnRow>
diff --git a/src/pages/Customer/Card/CustomerCredits.vue b/src/pages/Customer/Card/CustomerCredits.vue
index 1fa7047e5..d6e4be89e 100644
--- a/src/pages/Customer/Card/CustomerCredits.vue
+++ b/src/pages/Customer/Card/CustomerCredits.vue
@@ -59,6 +59,7 @@ const columns = computed(() => [
 </script>
 <template>
     <VnTable
+        :user-filter="{ include: filter.include }"
         ref="tableRef"
         data-key="ClientCredit"
         url="ClientCredits"
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 67fdb3254..c976678e0 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -79,6 +79,13 @@ const columns = computed(() => [
         cardVisible: true,
         create: true,
     },
+    {
+        align: 'left',
+        name: 'awb',
+        label: t('travel.travelList.tableVisibleColumns.awb'),
+        columnFilter: false,
+        format: (row) => row.awbCode,
+    },
     {
         align: 'left',
         name: 'warehouseInFk',

From 35e4f9115494f6789b6296858565a0b01532a8a3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 15 Jan 2025 05:59:47 +0100
Subject: [PATCH 04/17] fix: fixed icons in descriptor

---
 .../Customer/Card/CustomerDescriptor.vue      | 37 +++++++------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index dc5f08d37..23b12e11f 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -11,15 +11,9 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import CustomerDescriptorMenu from './CustomerDescriptorMenu.vue';
-import { useState } from 'src/composables/useState';
-const state = useState();
 
-const customer = ref();
-
-onMounted(async () => {
-    customer.value = state.get('customer');
-    if (customer.value) customer.value.webAccess = data.value?.account?.isActive;
-});
+const customerDebt = ref();
+const customerCredit = ref();
 
 const $props = defineProps({
     id: {
@@ -42,10 +36,12 @@ const entityId = computed(() => {
 
 const data = ref(useCardDescription());
 const setData = (entity) => {
+    customerDebt.value = entity?.debt;
+    customerCredit.value = entity?.credit;
     data.value = useCardDescription(entity?.name, entity?.id);
 };
 const debtWarning = computed(() => {
-    return customer.value?.debt > customer.value?.credit ? 'negative' : 'primary';
+    return customerDebt.value > customerCredit.value ? 'negative' : 'primary';
 });
 </script>
 
@@ -97,26 +93,21 @@ const debtWarning = computed(() => {
                 :value="entity.businessType.description"
             />
         </template>
-        <template #icons>
-            <QCardActions v-if="customer" class="q-gutter-x-md">
+        <template #icons="{ entity }">
+            <QCardActions class="q-gutter-x-md">
                 <QIcon
-                    v-if="!customer.isActive"
+                    v-if="!entity.isActive"
                     name="vn:disabled"
                     size="xs"
                     color="primary"
                 >
                     <QTooltip>{{ t('customer.card.isDisabled') }}</QTooltip>
                 </QIcon>
-                <QIcon
-                    v-if="customer.isFreezed"
-                    name="vn:frozen"
-                    size="xs"
-                    color="primary"
-                >
+                <QIcon v-if="entity.isFreezed" name="vn:frozen" size="xs" color="primary">
                     <QTooltip>{{ t('customer.card.isFrozen') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!customer.account?.active"
+                    v-if="!entity.account?.active"
                     color="primary"
                     name="vn:noweb"
                     size="xs"
@@ -124,7 +115,7 @@ const debtWarning = computed(() => {
                     <QTooltip>{{ t('customer.card.webAccountInactive') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="customer.debt > customer.credit"
+                    v-if="entity.debt > entity.credit"
                     name="vn:risk"
                     size="xs"
                     :color="debtWarning"
@@ -132,7 +123,7 @@ const debtWarning = computed(() => {
                     <QTooltip>{{ t('customer.card.hasDebt') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!customer.isTaxDataChecked"
+                    v-if="!entity.isTaxDataChecked"
                     name="vn:no036"
                     size="xs"
                     color="primary"
@@ -140,7 +131,7 @@ const debtWarning = computed(() => {
                     <QTooltip>{{ t('customer.card.notChecked') }}</QTooltip>
                 </QIcon>
                 <QBtn
-                    v-if="customer.unpaid"
+                    v-if="entity.unpaid"
                     flat
                     size="sm"
                     icon="vn:Client_unpaid"

From a7fd073886459424e2bc853e42fd1c1ae45f7422 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 15 Jan 2025 08:23:44 +0100
Subject: [PATCH 05/17] fix: update SIM serial number binding in WorkerPda.vue

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

diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index 3ceee2493..c1beef40d 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -27,7 +27,7 @@ const initialData = computed(() => {
     return {
         userFk: routeId.value,
         deviceProductionFk: null,
-        simSerialNumber: null,
+        simFk: null,
     };
 });
 
@@ -42,7 +42,7 @@ const deallocatePDA = async (deviceProductionFk) => {
 
 function reloadData() {
     initialData.value.deviceProductionFk = null;
-    initialData.value.simSerialNumber = null;
+    initialData.value.simFk = null;
     paginate.value.fetch();
 }
 </script>
@@ -89,7 +89,7 @@ function reloadData() {
                         />
                         <VnInput
                             :label="t('Current SIM')"
-                            :model-value="row?.simSerialNumber"
+                            :model-value="row?.simFk"
                             disable
                         />
                         <QBtn
@@ -150,7 +150,7 @@ function reloadData() {
                                     </template>
                                 </VnSelect>
                                 <VnInput
-                                    v-model="data.simSerialNumber"
+                                    v-model="data.simFk"
                                     :label="t('SIM serial number')"
                                     id="simSerialNumber"
                                     use-input

From 21958cfdb43cbf941d8e2d723cfcf0ae8632467f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 15 Jan 2025 16:10:33 +0100
Subject: [PATCH 06/17] fix: catch mail err

---
 src/pages/Worker/Card/WorkerTimeControl.vue | 27 +++++++++++----------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 65fbf4b43..919331e2d 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -283,21 +283,22 @@ const fetchWeekData = async () => {
         year: selectedDateYear.value,
         week: selectedWeekNumber.value,
     };
-    const mail = (
-        await axiosNoError.get(`Workers/${route.params.id}/mail`, {
-            params: { filter: { where } },
-        })
-    ).data[0];
+    try {
+        const [{ data: mailData }, { data: countData }] = await Promise.all([
+            axiosNoError.get(`Workers/${route.params.id}/mail`, {
+                params: { filter: { where } },
+            }),
+            axiosNoError.get('WorkerTimeControlMails/count', { params: { where } }),
+        ]);
 
-    if (!mail) state.value = null;
-    else {
-        state.value = mail.state;
-        reason.value = mail.reason;
+        const mail = mailData[0];
+
+        state.value = mail?.state;
+        reason.value = mail?.reason;
+        canResend.value = !!countData.count;
+    } catch {
+        state.value = null;
     }
-
-    canResend.value = !!(
-        await axiosNoError.get('WorkerTimeControlMails/count', { params: { where } })
-    ).data.count;
 };
 
 const setHours = (data) => {

From e335322d5ffb94248db66f0b64ac7801839238d1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 16 Jan 2025 09:45:15 +0100
Subject: [PATCH 07/17] fix: refs #7936 allow negative values

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

diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index dcf297d12..47a589aaa 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -84,6 +84,7 @@ const columns = computed(() => [
             component: 'number',
             autofocus: true,
             required: true,
+            positive: false,
         },
         format: ({ amount }) => toCurrency(amount),
         create: true,

From 6c2fbea6d59cf61e0f8ff9c4fd6259143a4ec682 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 16 Jan 2025 11:59:08 +0100
Subject: [PATCH 08/17] fix: refs #8407 close date and time popups on keydown

---
 src/components/common/VnInputDate.vue | 1 +
 src/components/common/VnInputTime.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index fdef6a9a8..db8e25195 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -107,6 +107,7 @@ const manageDate = (date) => {
             :rules="mixinRules"
             :clearable="false"
             @click="isPopupOpen = !isPopupOpen"
+            @keydown="isPopupOpen = false"
             hide-bottom-space
         >
             <template #append>
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index b4b246618..cb1f723ba 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -81,6 +81,7 @@ function dateToTime(newDate) {
             style="min-width: 100px"
             :rules="mixinRules"
             @click="isPopupOpen = !isPopupOpen"
+            @keydown="isPopupOpen = false"
             type="time"
             hide-bottom-space
         >

From 3ab3f146d47b66b04cf882ec43c3f6313c8322a9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 16 Jan 2025 12:45:24 +0100
Subject: [PATCH 09/17] feat: add acl in description button

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

diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 950e6e8be..18dcaea7e 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -166,6 +166,7 @@ async function handleSave() {
                             v-model="row.ticketServiceTypeFk"
                             :options="ticketServiceOptions"
                             option-label="name"
+                            :roles-allowed-to-create="['administrative']"
                             option-value="id"
                             hide-selected
                         >

From 3b9ccab48c2d47fe0177368210b18b77bceaa09c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 20 Jan 2025 08:01:46 +0100
Subject: [PATCH 10/17] fix: redirect to Ticketsale when confirming an order

---
 src/pages/Order/Card/OrderLines.vue | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue
index 6093addb5..36dc3883e 100644
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@@ -208,15 +208,28 @@ async function remove(item) {
 async function handleConfirm() {
     const result = await confirm(route.params.id);
     if (result) {
+        const sale = await axios.get(`OrderRows`, {
+            params: {
+                filter: JSON.stringify({
+                    where: { orderFk: route.params.id },
+                }),
+            },
+        });
+        const ticket = await axios.get(`Sales`, {
+            params: {
+                filter: JSON.stringify({
+                    where: { id: sale.data[0].saleFk },
+                }),
+            },
+        });
         quasar.notify({
             message: t('globals.dataSaved'),
             type: 'positive',
         });
         router.push({
             name: 'TicketSale',
-            query: {
-                table: JSON.stringify({ id: route.params.id }),
-            },
+            params: { id: ticket.data[0].ticketFk },
+            query: { table: JSON.stringify({ filter: { limit: 20, skip: 0 } }) },
         });
     }
 }

From 8843318b668534f7407622d5a82044ed8788eba8 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 20 Jan 2025 10:10:45 +0100
Subject: [PATCH 11/17] fix: refs #7936 update select model-value WIP

---
 src/components/common/VnSelect.vue        |  3 +--
 src/components/common/VnSelectDialog.vue  |  6 ++++-
 src/pages/InvoiceIn/Card/InvoiceInVat.vue | 32 ++++++++++++++++++-----
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index b78c99b8a..243f3ece1 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -294,7 +294,7 @@ async function onScroll({ to, direction, from, index }) {
     }
 }
 
-defineExpose({ opts: myOptions });
+defineExpose({ opts: myOptions, vnSelectRef });
 
 function handleKeyDown(event) {
     if (event.key === 'Tab' && !event.shiftKey) {
@@ -346,7 +346,6 @@ function getCaption(opt) {
         :emit-value="nullishToTrue($attrs['emit-value'])"
         :map-options="nullishToTrue($attrs['map-options'])"
         :use-input="nullishToTrue($attrs['use-input'])"
-        :hide-selected="nullishToTrue($attrs['hide-selected'])"
         :fill-input="nullishToTrue($attrs['fill-input'])"
         ref="vnSelectRef"
         lazy-rules
diff --git a/src/components/common/VnSelectDialog.vue b/src/components/common/VnSelectDialog.vue
index 12322c3fa..a4cd0011d 100644
--- a/src/components/common/VnSelectDialog.vue
+++ b/src/components/common/VnSelectDialog.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useRole } from 'src/composables/useRole';
 import { useAcl } from 'src/composables/useAcl';
 
@@ -7,6 +7,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 const emit = defineEmits(['update:modelValue']);
 
 const value = defineModel({ type: [String, Number, Object] });
+const select = ref(null);
 const $props = defineProps({
     rolesAllowedToCreate: {
         type: Array,
@@ -33,10 +34,13 @@ const isAllowedToCreate = computed(() => {
     if ($props.acls.length) return acl.hasAny($props.acls);
     return role.hasAny($props.rolesAllowedToCreate);
 });
+
+defineExpose({ vnSelectDialogRef: select });
 </script>
 
 <template>
     <VnSelect
+        ref="select"
         v-model="value"
         v-bind="$attrs"
         @update:model-value="(...args) => emit('update:modelValue', ...args)"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index f7ef7d525..b702851b3 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -33,15 +33,19 @@ defineProps({
     },
 });
 
+function test(row) {
+    console.log('test', row);
+    return `${row.id}: ${row.name}`;
+}
+
 const columns = computed(() => [
     {
         name: 'expense',
         label: t('Expense'),
-        field: (row) => row.expenseFk,
         options: expenses.value,
         model: 'expenseFk',
         optionValue: 'id',
-        optionLabel: (row) => `${row.id}: ${row.name}`,
+        optionLabel: (row) => test(row),
         sortable: true,
         align: 'left',
     },
@@ -119,6 +123,8 @@ function taxRate(invoiceInTax) {
     return ((taxTypeSage / 100) * taxableBase).toFixed(2);
 }
 
+const expensesRef = ref();
+const exponseShow = ref(false);
 function autocompleteExpense(evt, row, col) {
     const val = evt.target.value;
     if (!val) return;
@@ -127,9 +133,17 @@ function autocompleteExpense(evt, row, col) {
     const lookup = expenses.value.find(
         ({ id }) => id == useAccountShortToStandard(param)
     );
-
-    if (lookup) row[col.model] = lookup;
+    if (lookup) {
+        row[col.model] = lookup?.id;
+        expensesRef.value.showItem = true;
+    }
 }
+
+const formatOpt = (row, { model, options }, prop) => {
+    const obj = row[model];
+    const option = options.find(({ id }) => id == obj);
+    return option ? `${obj}:${option[prop]}` : '';
+};
 </script>
 <template>
     <FetchData
@@ -167,15 +181,19 @@ function autocompleteExpense(evt, row, col) {
                 <template #body-cell-expense="{ row, col }">
                     <QTd>
                         <VnSelectDialog
+                            ref="expensesRef"
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
-                            :option-label="col.optionLabel"
                             :filter-options="['id', 'name']"
                             :tooltip="t('Create a new expense')"
                             @keydown.tab="autocompleteExpense($event, row, col)"
+                            @input-value="(data) => (row[col.model] = undefined)"
                         >
-                            <template #option="scope">
+                            <template #selected-item="scope">
+                                A{{ scope.opt.id }}B</template
+                            >
+                            <!-- <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
                                     {{ `${scope.opt.id}: ${scope.opt.name}` }}
                                 </QItem>
@@ -184,7 +202,7 @@ function autocompleteExpense(evt, row, col) {
                                 <CreateNewExpenseForm
                                     @on-data-saved="$refs.expensesRef.fetch()"
                                 />
-                            </template>
+                            </template> -->
                         </VnSelectDialog>
                     </QTd>
                 </template>

From a1254b25b4309d32de3ecfb54e0dbc0810d2d736 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 20 Jan 2025 11:26:57 +0100
Subject: [PATCH 12/17] fix: fix ticketSale quantity

---
 src/pages/Ticket/Card/TicketSale.vue | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 8aa785c74..7a8b4a83d 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -54,7 +54,6 @@ const transfer = ref({
 });
 const tableRef = ref([]);
 const canProceed = ref();
-const isLoading = ref(false);
 
 watch(
     () => route.params.id,
@@ -197,6 +196,7 @@ const changeQuantity = async (sale) => {
     try {
         if (!rowToUpdate.value) return;
         rowToUpdate.value = null;
+        sale.isNew = false;
         await updateQuantity(sale);
     } catch (e) {
         const { quantity } = tableRef.value.CrudModelRef.originalData.find(
@@ -214,9 +214,6 @@ const updateQuantity = async ({ quantity, id }) => {
 };
 
 const addSale = async (sale) => {
-    if (isLoading.value) return;
-
-    isLoading.value = true;
     const params = {
         barcode: sale.itemFk,
         quantity: sale.quantity,
@@ -237,6 +234,7 @@ const addSale = async (sale) => {
     sale.item = newSale.item;
 
     notify('globals.dataSaved', 'positive');
+    sale.isNew = false;
     arrayData.fetch({});
 };
 

From ff95882e42191411348b12ab4640b13a8b828560 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 20 Jan 2025 11:51:53 +0100
Subject: [PATCH 13/17] fix: refs #7936 rollback

---
 src/pages/InvoiceIn/Card/InvoiceInVat.vue | 32 +++++------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index b702851b3..f7ef7d525 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -33,19 +33,15 @@ defineProps({
     },
 });
 
-function test(row) {
-    console.log('test', row);
-    return `${row.id}: ${row.name}`;
-}
-
 const columns = computed(() => [
     {
         name: 'expense',
         label: t('Expense'),
+        field: (row) => row.expenseFk,
         options: expenses.value,
         model: 'expenseFk',
         optionValue: 'id',
-        optionLabel: (row) => test(row),
+        optionLabel: (row) => `${row.id}: ${row.name}`,
         sortable: true,
         align: 'left',
     },
@@ -123,8 +119,6 @@ function taxRate(invoiceInTax) {
     return ((taxTypeSage / 100) * taxableBase).toFixed(2);
 }
 
-const expensesRef = ref();
-const exponseShow = ref(false);
 function autocompleteExpense(evt, row, col) {
     const val = evt.target.value;
     if (!val) return;
@@ -133,17 +127,9 @@ function autocompleteExpense(evt, row, col) {
     const lookup = expenses.value.find(
         ({ id }) => id == useAccountShortToStandard(param)
     );
-    if (lookup) {
-        row[col.model] = lookup?.id;
-        expensesRef.value.showItem = true;
-    }
-}
 
-const formatOpt = (row, { model, options }, prop) => {
-    const obj = row[model];
-    const option = options.find(({ id }) => id == obj);
-    return option ? `${obj}:${option[prop]}` : '';
-};
+    if (lookup) row[col.model] = lookup;
+}
 </script>
 <template>
     <FetchData
@@ -181,19 +167,15 @@ const formatOpt = (row, { model, options }, prop) => {
                 <template #body-cell-expense="{ row, col }">
                     <QTd>
                         <VnSelectDialog
-                            ref="expensesRef"
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
+                            :option-label="col.optionLabel"
                             :filter-options="['id', 'name']"
                             :tooltip="t('Create a new expense')"
                             @keydown.tab="autocompleteExpense($event, row, col)"
-                            @input-value="(data) => (row[col.model] = undefined)"
                         >
-                            <template #selected-item="scope">
-                                A{{ scope.opt.id }}B</template
-                            >
-                            <!-- <template #option="scope">
+                            <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
                                     {{ `${scope.opt.id}: ${scope.opt.name}` }}
                                 </QItem>
@@ -202,7 +184,7 @@ const formatOpt = (row, { model, options }, prop) => {
                                 <CreateNewExpenseForm
                                     @on-data-saved="$refs.expensesRef.fetch()"
                                 />
-                            </template> -->
+                            </template>
                         </VnSelectDialog>
                     </QTd>
                 </template>

From ae68f25c3c031d338006682afb4cc38ba4e9afdd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 20 Jan 2025 11:55:49 +0100
Subject: [PATCH 14/17] fix: refs #7936 rollback

---
 src/components/common/VnSelect.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 243f3ece1..662e6006a 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -346,6 +346,7 @@ function getCaption(opt) {
         :emit-value="nullishToTrue($attrs['emit-value'])"
         :map-options="nullishToTrue($attrs['map-options'])"
         :use-input="nullishToTrue($attrs['use-input'])"
+        :hide-selected="nullishToTrue($attrs['hide-selected'])"
         :fill-input="nullishToTrue($attrs['fill-input'])"
         ref="vnSelectRef"
         lazy-rules

From a3cdb18535da81554c280e4aa3d424dfd6a03280 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 20 Jan 2025 12:04:59 +0100
Subject: [PATCH 15/17] fix: fix use-like

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

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 7a8b4a83d..b849b3b35 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -752,6 +752,7 @@ watch(
                 option-label="name"
                 option-value="id"
                 v-model="row.itemFk"
+                :use-like="false"
                 @update:model-value="updateItem(row)"
             >
                 <template #option="scope">

From bdae839e505532fbf02394dd6470164056b08ca5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 20 Jan 2025 12:56:40 +0100
Subject: [PATCH 16/17] fix: refs #7936 toggle option

---
 src/pages/InvoiceIn/Card/InvoiceInVat.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index f7ef7d525..74fd02816 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -25,6 +25,7 @@ const sageTaxTypes = ref([]);
 const sageTransactionTypes = ref([]);
 const rowsSelected = ref([]);
 const invoiceInFormRef = ref();
+const expenseRef = ref();
 
 defineProps({
     actionIcon: {
@@ -128,7 +129,7 @@ function autocompleteExpense(evt, row, col) {
         ({ id }) => id == useAccountShortToStandard(param)
     );
 
-    if (lookup) row[col.model] = lookup;
+    expenseRef.value.vnSelectDialogRef.vnSelectRef.toggleOption(lookup);
 }
 </script>
 <template>
@@ -167,6 +168,7 @@ function autocompleteExpense(evt, row, col) {
                 <template #body-cell-expense="{ row, col }">
                     <QTd>
                         <VnSelectDialog
+                            ref="expenseRef"
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"

From c7b24adc5abb872fb27b8f66b9ce92bcd6092820 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 20 Jan 2025 13:39:56 +0100
Subject: [PATCH 17/17] fix: refs #6898 hotfix filter

---
 src/pages/Supplier/Card/SupplierFiscalData.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 44235717f..71791a4fe 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -68,6 +68,8 @@ function handleLocation(data, location) {
                 'supplierActivityFk',
                 'healthRegister',
                 'street',
+                'isVies',
+                'isTrucker',
             ],
             include: [
                 {