From 3a7366c91ac59e8c088bf8d5ab0414086aacb52a Mon Sep 17 00:00:00 2001 From: robert Date: Thu, 6 Feb 2025 11:47:14 +0100 Subject: [PATCH 1/6] feat: refs #6822 change traduction Partial delay --- src/pages/Entry/Card/EntryDescriptorMenu.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/Entry/Card/EntryDescriptorMenu.vue b/src/pages/Entry/Card/EntryDescriptorMenu.vue index 03cd53358..dc759c7a8 100644 --- a/src/pages/Entry/Card/EntryDescriptorMenu.vue +++ b/src/pages/Entry/Card/EntryDescriptorMenu.vue @@ -54,8 +54,8 @@ const transferEntry = async () => { en: transferEntryDialog: The entries will be transferred to the next day - transferEntry: Transfer Entry + transferEntry: Partial delay es: transferEntryDialog: Se van a transferir las compras al dia siguiente - transferEntry: Transferir Entrada + transferEntry: Retraso parcial From 2fea795bdb6ec24793c1f76dae4313d414fca086 Mon Sep 17 00:00:00 2001 From: alexm Date: Fri, 7 Feb 2025 07:21:59 +0100 Subject: [PATCH 2/6] fix: hotfix empty observations --- src/pages/Customer/Card/CustomerAddress.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue index 5c200582d..4869182cb 100644 --- a/src/pages/Customer/Card/CustomerAddress.vue +++ b/src/pages/Customer/Card/CustomerAddress.vue @@ -189,11 +189,11 @@ const toCustomerAddressEdit = (addressId) => { -
+
Date: Fri, 7 Feb 2025 07:32:28 +0100 Subject: [PATCH 3/6] fix: hotfix fetchData not use userFilter --- src/pages/Customer/Card/CustomerAddress.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue index 4869182cb..1b0d1dde1 100644 --- a/src/pages/Customer/Card/CustomerAddress.vue +++ b/src/pages/Customer/Card/CustomerAddress.vue @@ -117,7 +117,7 @@ const toCustomerAddressEdit = (addressId) => { data-key="CustomerAddresses" order="id DESC" ref="vnPaginateRef" - :user-filter="addressFilter" + :filter="addressFilter" :url="`Clients/${route.params.id}/addresses`" />
From 43b6ff89bef4b2f2a2b388f8e6d1ed3a2da45b92 Mon Sep 17 00:00:00 2001 From: Jon Date: Fri, 7 Feb 2025 07:56:08 +0100 Subject: [PATCH 4/6] fix: fixed company filter --- src/pages/InvoiceOut/InvoiceOutList.vue | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue index 09873642d..10b41509c 100644 --- a/src/pages/InvoiceOut/InvoiceOutList.vue +++ b/src/pages/InvoiceOut/InvoiceOutList.vue @@ -96,12 +96,19 @@ const columns = computed(() => [ }, { align: 'left', - name: 'companyCode', + name: 'companyFk', label: t('globals.company'), cardVisible: true, component: 'select', - attrs: { url: 'Companies', optionLabel: 'code', optionValue: 'id' }, - columnField: { component: null }, + attrs: { + url: 'Companies', + optionLabel: 'code', + optionValue: 'id', + }, + columnField: { + component: null, + }, + format: (row, dashIfEmpty) => dashIfEmpty(row.companyCode), }, { align: 'left', From 2a3e80746000feeb949fa0d21629be5221eb5441 Mon Sep 17 00:00:00 2001 From: Javier Segarra Date: Fri, 7 Feb 2025 13:38:06 +0000 Subject: [PATCH 5/6] fix: improve method --- src/router/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/router/index.js b/src/router/index.js index f0d9487c6..4403901cb 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -107,7 +107,10 @@ export default defineRouter(function (/* { store, ssrContext } */) { 'Failed to fetch dynamically imported module', 'Importing a module script failed', ]; - state.set('error', errorMessages.some(message.includes)); + state.set( + 'error', + errorMessages.some((error) => message.startsWith(error)), + ); }); return Router; }); From 0a40dd598e176503946c1adc2fad4229963a0396 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 10 Feb 2025 10:21:38 +0100 Subject: [PATCH 6/6] fix: cardDescriptor use userFilter --- src/components/ui/CardDescriptor.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue index 275d919d6..8f834b426 100644 --- a/src/components/ui/CardDescriptor.vue +++ b/src/components/ui/CardDescriptor.vue @@ -57,7 +57,7 @@ defineExpose({ getData }); onBeforeMount(async () => { arrayData = useArrayData($props.dataKey, { url: $props.url, - filter: $props.filter, + userFilter: $props.filter, skip: 0, oneRecord: true, });