From 9565f97c4f04a8b65ed541784f7263528beccef3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 27 Jan 2025 13:37:14 +0100
Subject: [PATCH 1/6] fix: deleted duplicate request

---
 src/components/common/VnInput.vue | 1 +
 src/pages/Item/ItemRequest.vue    | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 57a495ac3..0e739a48d 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -71,6 +71,7 @@ const focus = () => {
 
 defineExpose({
     focus,
+    vnInputRef,
 });
 
 const mixinRules = [
diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue
index d96fbca2f..76e4b8083 100644
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@@ -272,11 +272,12 @@ const onDenyAccept = (_, responseData) => {
         <template #column-achieved="{ row }">
             <span>
                 <VnInput
+                    ref="achievedRef"
                     type="number"
                     v-model.number="row.saleQuantity"
                     :disable="!row.itemFk || row.isOk != null"
                     @blur="changeQuantity(row)"
-                    @keyup.enter="changeQuantity(row)"
+                    @keyup.enter="$refs.achievedRef.vnInputRef.blur()"
                     dense
                 />
             </span>

From 8660b1bea447470044047948e1e92fe1f5043d2e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 29 Jan 2025 12:24:26 +0100
Subject: [PATCH 2/6] fix: refs #8198 ensure warehouseFk is a number when set
 from query

---
 src/pages/Item/Card/ItemDiary.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index c2f2c19a0..3e8b1f676 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -125,7 +125,7 @@ onMounted(async () => {
     inventoriedDate.value =
         (await axios.get('Configs/findOne')).data?.inventoried || today;
 
-    if (query.warehouseFk) ref.warehouseFk = query.warehouseFk;
+    if (query.warehouseFk) ref.warehouseFk = +query.warehouseFk;
     else if (!ref.warehouseFk && user.value) ref.warehouseFk = user.value.warehouseFk;
     if (ref.date) showWhatsBeforeInventory.value = true;
     ref.itemFk = route.params.id;

From ef129eb54228c67253f250fa5d57f4b66ce57c1b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 29 Jan 2025 14:38:58 +0100
Subject: [PATCH 3/6] fix: refs #8198 correct date comparison in getBadgeAttrs
 function

---
 src/pages/Item/Card/ItemDiary.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index 3e8b1f676..4b6775183 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -143,7 +143,7 @@ onMounted(async () => {
 const fetchItemBalances = async () => await arrayDataItemBalances.fetch({});
 
 const getBadgeAttrs = (_date) => {
-    const isSameDate = date.isSameDate(today.value, _date);
+    const isSameDate = date.isSameDate(today, _date);
     const attrs = {
         'text-color': isSameDate ? 'black' : 'white',
         color: isSameDate ? 'warning' : 'transparent',
@@ -153,8 +153,6 @@ const getBadgeAttrs = (_date) => {
 
 const scrollToToday = async () => {
     await nextTick();
-    const today = Date.vnNew();
-    today.setHours(0, 0, 0, 0);
     const todayCell = document.querySelector(`td[data-date="${today.toISOString()}"]`);
     if (todayCell) {
         todayCell.scrollIntoView({ behavior: 'smooth', block: 'center' });

From 855da2b7bf83caef31d3bc35fc4ffd3194dc6db7 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 3 Feb 2025 08:46:44 +0100
Subject: [PATCH 4/6] fix: fixed VnPaginate

---
 src/components/ui/VnPaginate.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 965f4d5e9..4b7e5fdfb 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -119,7 +119,7 @@ watch(
     () => props.data,
     () => {
         store.data = props.data;
-    }
+    },
 );
 
 watch(
@@ -128,12 +128,12 @@ watch(
         if (!mounted.value) return;
         emit('onChange', data);
     },
-    { immediate: true }
+    { immediate: true },
 );
 
 watch(
     () => [props.url, props.filter],
-    ([url, filter]) => mounted.value && fetch({ url, filter })
+    ([url, filter]) => mounted.value && fetch({ url, filter }),
 );
 const addFilter = async (filter, params) => {
     await arrayData.addFilter({ filter, params });
@@ -194,7 +194,7 @@ function endPagination() {
 async function onLoad(index, done) {
     if (!store.data || !mounted.value) return done();
 
-    if (store.data.length === 0 || !props.url) return done(false);
+    if (store.data.length === 0 || !arrayData.store.url) return done(false);
 
     pagination.value.page = pagination.value.page + 1;
 

From a1bba4496dd9599d2dd6285e5df08e2cb455b3e5 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 3 Feb 2025 08:48:32 +0100
Subject: [PATCH 5/6] fix: deleted catalog limit

---
 src/pages/Order/Card/OrderCatalog.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index 186f216fb..ff876b262 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -21,7 +21,6 @@ const catalogParams = {
 };
 const arrayData = useArrayData(dataKey, {
     url: 'Orders/CatalogFilter',
-    limit: 50,
     userParams: catalogParams,
 });
 const store = arrayData.store;

From ac57141c0e1245d06a8439d2c6170c6af6f68832 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 3 Feb 2025 16:19:33 +0000
Subject: [PATCH 6/6] fix: orderList column created

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

diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index ae1fe68bd..d06b1ec26 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -81,7 +81,7 @@ const columns = computed(() => [
         label: t('module.created'),
         component: 'date',
         cardVisible: true,
-        format: (row) => toDateTimeFormat(row?.landed),
+        format: (row) => toDateTimeFormat(row?.created),
         columnField: {
             component: null,
         },