From 5f75d3a0f13923eac703001359027fbaa33223a5 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Tue, 21 Jan 2025 12:56:30 +0100
Subject: [PATCH 01/22] feat: refs #7065 created unit tests for UserPanel

---
 src/components/__tests__/UserPanel.spec.js | 67 ++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 src/components/__tests__/UserPanel.spec.js

diff --git a/src/components/__tests__/UserPanel.spec.js b/src/components/__tests__/UserPanel.spec.js
new file mode 100644
index 000000000..55bc51e66
--- /dev/null
+++ b/src/components/__tests__/UserPanel.spec.js
@@ -0,0 +1,67 @@
+import { vi, describe, expect, it, beforeEach, beforeAll, afterEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
+import UserPanel from 'src/components/UserPanel.vue';
+import axios from 'axios';
+import { useState } from 'src/composables/useState';
+
+vi.mock('axios');
+
+describe('UserPanel', () => {
+    let wrapper;
+    let vm;
+    let state;
+    let axiosPatchMock;
+    let axiosPostMock;
+
+    beforeAll(() => {
+        axiosPatchMock = vi.spyOn(axios, 'patch').mockResolvedValue({});
+        axiosPostMock = vi.spyOn(axios, 'post').mockResolvedValue({});
+    });
+
+    beforeEach(() => {
+        wrapper = createWrapper(UserPanel, {});
+        state = useState();
+        state.setUser({
+            id: 115,
+            name: 'itmanagement',
+            nickname: 'itManagementNick',
+            lang: 'en',
+            darkMode: false,
+            companyFk: 442,
+            warehouseFk: 1,
+        });
+        wrapper = wrapper.wrapper;
+        vm = wrapper.vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should fetch warehouses data on mounted', async () => {
+        const fetchData = wrapper.findComponent({ name: 'FetchData' });
+        expect(fetchData.props('url')).toBe('Warehouses');
+        expect(fetchData.props('autoLoad')).toBe(true);
+    });
+
+    it('should toggle dark mode correctly and update preferences', async () => {
+        await vm.saveDarkMode(true);
+        expect(axiosPatchMock).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
+        expect(vm.user.darkMode).toBe(true);
+        vm.updatePreferences();
+        expect(vm.darkMode).toBe(true);
+    });
+
+    it('should change user language and update preferences', async () => {
+        await vm.saveLanguage('es');
+        expect(axiosPatchMock).toHaveBeenCalledWith('/VnUsers/115', { lang: 'es' });
+        expect(vm.user.lang).toBe('es');
+        vm.updatePreferences();
+        expect(vm.locale).toBe('es');
+    });
+
+    it('should update user data', async () => {
+        await vm.saveUserData('name', 'itboss');
+        expect(axiosPostMock).toHaveBeenCalledWith('UserConfigs/setUserConfig', { ['name']: 'itboss' });
+    });
+});

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 02/22] 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 ff61a5931bac5a473e56ea4c6c3091e4552e850c Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 27 Jan 2025 19:00:07 +0100
Subject: [PATCH 03/22] test: fix clientList spec

---
 .../integration/client/clientList.spec.js     |  2 +-
 test/cypress/support/commands.js              | 29 +------------------
 2 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/test/cypress/integration/client/clientList.spec.js b/test/cypress/integration/client/clientList.spec.js
index d5723375b..21fc0f2ea 100644
--- a/test/cypress/integration/client/clientList.spec.js
+++ b/test/cypress/integration/client/clientList.spec.js
@@ -62,7 +62,7 @@ describe('Client list', () => {
     it('Client founded create order', () => {
         const search = 'Jessica Jones';
         cy.searchByLabel('Name', search);
-        cy.openActionDescriptor('New order');
+        cy.clickButtonDescriptor(3);
         cy.waitForElement('#formModel');
         cy.waitForElement('.q-form');
         cy.checkValueForm(1, search);
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 93f6d0054..9bfa2c03e 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -289,40 +289,13 @@ Cypress.Commands.add('openActionDescriptor', (opt) => {
     cy.openActionsDescriptor();
     const listItem = '[role="menu"] .q-list .q-item';
     cy.contains(listItem, opt).click();
-    1;
 });
 
 Cypress.Commands.add('openActionsDescriptor', () => {
     cy.get('[data-cy="descriptor-more-opts"]').click();
 });
 
-Cypress.Commands.add('clickButtonsDescriptor', (id) => {
-    cy.get(`.actions > .q-card__actions> .q-btn:nth-child(${id})`)
-        .invoke('removeAttr', 'target')
-        .click();
-});
-
-Cypress.Commands.add('openActionDescriptor', (opt) => {
-    cy.openActionsDescriptor();
-    const listItem = '[role="menu"] .q-list .q-item';
-    cy.contains(listItem, opt).click();
-    1;
-});
-
-Cypress.Commands.add('clickButtonsDescriptor', (id) => {
-    cy.get(`.actions > .q-card__actions> .q-btn:nth-child(${id})`)
-        .invoke('removeAttr', 'target')
-        .click();
-});
-
-Cypress.Commands.add('openActionDescriptor', (opt) => {
-    cy.openActionsDescriptor();
-    const listItem = '[role="menu"] .q-list .q-item';
-    cy.contains(listItem, opt).click();
-    1;
-});
-
-Cypress.Commands.add('clickButtonsDescriptor', (id) => {
+Cypress.Commands.add('clickButtonDescriptor', (id) => {
     cy.get(`.actions > .q-card__actions> .q-btn:nth-child(${id})`)
         .invoke('removeAttr', 'target')
         .click();

From 0910425c5c8409982717a16dc256589cf6255b48 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 27 Jan 2025 19:00:27 +0100
Subject: [PATCH 04/22] feat: add addressFk

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

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 4a064843a..c42d77b60 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -190,7 +190,9 @@ const debtWarning = computed(() => {
                         name: 'OrderList',
                         query: {
                             createForm: JSON.stringify({
-                                clientFk: entity.id,
+                                clientFk: entity.id
+                                ,
+                                addressId: entity.defaultAddressFk,
                             }),
                         },
                     }"

From a5adc7550c51690d221bfef5af4f26161b262855 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 27 Jan 2025 19:00:46 +0100
Subject: [PATCH 05/22] style: customerDescriptor

---
 src/pages/Customer/Card/CustomerDescriptor.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index c42d77b60..bc57908ec 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -190,8 +190,7 @@ const debtWarning = computed(() => {
                         name: 'OrderList',
                         query: {
                             createForm: JSON.stringify({
-                                clientFk: entity.id
-                                ,
+                                clientFk: entity.id,
                                 addressId: entity.defaultAddressFk,
                             }),
                         },

From c8cd14f9910b6b56258a0fea4dbd1ed8c13366a6 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Tue, 28 Jan 2025 10:07:51 +0100
Subject: [PATCH 06/22] fix: refs #7065 made consts for repeated values

---
 src/components/__tests__/UserPanel.spec.js | 24 +++++++++-------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/components/__tests__/UserPanel.spec.js b/src/components/__tests__/UserPanel.spec.js
index 55bc51e66..f77c7b318 100644
--- a/src/components/__tests__/UserPanel.spec.js
+++ b/src/components/__tests__/UserPanel.spec.js
@@ -10,13 +10,6 @@ describe('UserPanel', () => {
     let wrapper;
     let vm;
     let state;
-    let axiosPatchMock;
-    let axiosPostMock;
-
-    beforeAll(() => {
-        axiosPatchMock = vi.spyOn(axios, 'patch').mockResolvedValue({});
-        axiosPostMock = vi.spyOn(axios, 'post').mockResolvedValue({});
-    });
 
     beforeEach(() => {
         wrapper = createWrapper(UserPanel, {});
@@ -46,22 +39,25 @@ describe('UserPanel', () => {
 
     it('should toggle dark mode correctly and update preferences', async () => {
         await vm.saveDarkMode(true);
-        expect(axiosPatchMock).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
+        expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
         expect(vm.user.darkMode).toBe(true);
         vm.updatePreferences();
         expect(vm.darkMode).toBe(true);
     });
 
     it('should change user language and update preferences', async () => {
-        await vm.saveLanguage('es');
-        expect(axiosPatchMock).toHaveBeenCalledWith('/VnUsers/115', { lang: 'es' });
-        expect(vm.user.lang).toBe('es');
+        const userLanguage = 'es';
+        await vm.saveLanguage(userLanguage);
+        expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
+        expect(vm.user.lang).toBe(userLanguage);
         vm.updatePreferences();
-        expect(vm.locale).toBe('es');
+        expect(vm.locale).toBe(userLanguage);
     });
 
     it('should update user data', async () => {
-        await vm.saveUserData('name', 'itboss');
-        expect(axiosPostMock).toHaveBeenCalledWith('UserConfigs/setUserConfig', { ['name']: 'itboss' });
+        const key = 'name';
+        const value = 'itboss';
+        await vm.saveUserData(key, value);
+        expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', { [key]: value });
     });
 });

From b8ffc8c26c835fe337e9a4d13bbb52c30c937842 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Tue, 28 Jan 2025 12:39:28 +0100
Subject: [PATCH 07/22] fix: refs #8422 fixed ItemTag e2e test not working

---
 test/cypress/integration/item/itemTag.spec.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/cypress/integration/item/itemTag.spec.js b/test/cypress/integration/item/itemTag.spec.js
index 28e0a747f..cc3814e1d 100644
--- a/test/cypress/integration/item/itemTag.spec.js
+++ b/test/cypress/integration/item/itemTag.spec.js
@@ -18,20 +18,20 @@ describe('Item tag', () => {
         +cy.dataCy('crudModelDefaultSaveBtn').click();
         cy.checkNotification("The tag or priority can't be repeated for an item");
     });
-    // https://redmine.verdnatura.es/issues/8422
-    it.skip('should add a new tag', () => {
+
+    it('should add a new tag', () => {
         cy.get('.q-page').should('be.visible');
         cy.get('.q-page-sticky > div').click();
         cy.get('.q-page-sticky > div').click();
         cy.dataCy('Tag_select').eq(7).click();
-        cy.get('.q-menu .q-item').contains('Ancho de la base').click();
+        cy.get('.q-menu .q-item').contains('Ancho de la base').type('{enter}');
         cy.get(
             ':nth-child(8) > [label="Value"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Value_input"]'
         ).type('50');
         cy.dataCy('crudModelDefaultSaveBtn').click();
         cy.checkNotification('Data saved');
         cy.get(
-            '[data-cy="itemTags"] > :nth-child(7) > .justify-center > .q-icon'
+            '[data-cy="itemTags"] > :nth-child(8) > .justify-center > .q-icon'
         ).click();
         cy.dataCy('VnConfirm_confirm').click();
         cy.checkNotification('Data saved');

From e1566297754aa80bbc2e403573b32e5a27ff3b9a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 28 Jan 2025 23:33:39 +0100
Subject: [PATCH 08/22] feat: new command

---
 .../integration/client/clientList.spec.js     |  4 ++--
 test/cypress/support/commands.js              | 24 ++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/test/cypress/integration/client/clientList.spec.js b/test/cypress/integration/client/clientList.spec.js
index 21fc0f2ea..195987539 100644
--- a/test/cypress/integration/client/clientList.spec.js
+++ b/test/cypress/integration/client/clientList.spec.js
@@ -59,10 +59,10 @@ describe('Client list', () => {
         cy.checkValueForm(1, search);
         cy.checkValueForm(2, search);
     });
-    it('Client founded create order', () => {
+    it.only('Client founded create order', () => {
         const search = 'Jessica Jones';
         cy.searchByLabel('Name', search);
-        cy.clickButtonDescriptor(3);
+        cy.clickButtonWith('icon', 'icon-basketadd');
         cy.waitForElement('#formModel');
         cy.waitForElement('.q-form');
         cy.checkValueForm(1, search);
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 9bfa2c03e..23963125e 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -71,7 +71,7 @@ Cypress.Commands.add('getValue', (selector) => {
             return cy
                 .get(
                     selector +
-                        '> .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > input'
+                        '> .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > input',
                 )
                 .invoke('val');
         }
@@ -303,7 +303,7 @@ Cypress.Commands.add('clickButtonDescriptor', (id) => {
 
 Cypress.Commands.add('openUserPanel', () => {
     cy.get(
-        '.column > .q-avatar > .q-avatar__content > .q-img > .q-img__container > .q-img__image'
+        '.column > .q-avatar > .q-avatar__content > .q-img > .q-img__container > .q-img__image',
     ).click();
 });
 
@@ -329,7 +329,7 @@ Cypress.Commands.add('checkValueForm', (id, search) => {
 
 Cypress.Commands.add('checkValueSelectForm', (id, search) => {
     cy.get(
-        `.grid-create > :nth-child(${id}) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > .q-field__input`
+        `.grid-create > :nth-child(${id}) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > .q-field__input`,
     ).should('have.value', search);
 });
 
@@ -347,3 +347,21 @@ Cypress.Commands.add('addBtnClick', () => {
         .and('be.visible')
         .click();
 });
+
+Cypress.Commands.add('clickButtonWith', (type, value) => {
+    switch (type) {
+        case 'icon':
+            cy.clickButtonWithIcon(value);
+            break;
+
+        default:
+            cy.clickButtonWithText(value);
+            break;
+    }
+});
+Cypress.Commands.add('clickButtonWithIcon', (iconClass) => {
+    cy.get(`.q-icon.${iconClass}`).parent().click();
+});
+Cypress.Commands.add('clickButtonWithText', (buttonText) => {
+    cy.get('.q-btn').contains(buttonText).click();
+});

From c86731d9e859186a1876330d8b6441fd3d537fe5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 28 Jan 2025 23:35:35 +0100
Subject: [PATCH 09/22] test: remove only

---
 test/cypress/integration/client/clientList.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/client/clientList.spec.js b/test/cypress/integration/client/clientList.spec.js
index 195987539..3bc391fc7 100644
--- a/test/cypress/integration/client/clientList.spec.js
+++ b/test/cypress/integration/client/clientList.spec.js
@@ -59,7 +59,7 @@ describe('Client list', () => {
         cy.checkValueForm(1, search);
         cy.checkValueForm(2, search);
     });
-    it.only('Client founded create order', () => {
+    it('Client founded create order', () => {
         const search = 'Jessica Jones';
         cy.searchByLabel('Name', search);
         cy.clickButtonWith('icon', 'icon-basketadd');

From 5c280867e2eb3f95882d95d9e9e315fca309fbd6 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 29 Jan 2025 08:35:37 +0100
Subject: [PATCH 10/22] fix: refs #8418 adjusted route for button click

---
 test/cypress/integration/entry/myEntry.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js
index c25476419..f06fdbbcc 100644
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@@ -9,11 +9,11 @@ describe('EntryMy when is supplier', () => {
         });
     });
     // https://redmine.verdnatura.es/issues/8418
-    it.skip('should open buyLabel when is supplier', () => {
+    it('should open buyLabel when is supplier', () => {
         cy.get(
             '[to="/null/3"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
         ).click();
-        cy.get('.q-card__actions > .q-btn').click();
+        cy.get('.q-card__section > .q-infinite-scroll > .q-table__container > .q-table__top > :nth-child(3) > .q-btn > .q-btn__content > .q-icon').click();
         cy.window().its('open').should('be.called');
     });
 });

From 10c9bfe2665fb8828d2748a76599925ba535d92b Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 29 Jan 2025 08:49:41 +0100
Subject: [PATCH 11/22] refactor: refs #8418 remove commented issue reference
 from myEntry.spec.js

---
 test/cypress/integration/entry/myEntry.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js
index f06fdbbcc..bf5adcae9 100644
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@@ -8,7 +8,7 @@ describe('EntryMy when is supplier', () => {
             },
         });
     });
-    // https://redmine.verdnatura.es/issues/8418
+    
     it('should open buyLabel when is supplier', () => {
         cy.get(
             '[to="/null/3"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'

From 74a6b20590dd1340628e2ab79582d6ae1263a5e7 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Wed, 29 Jan 2025 11:48:36 +0100
Subject: [PATCH 12/22] feat: refs #8418 add data-cy attribute for print labels
 button in EntryBuysTableDialog

---
 src/pages/Entry/EntryBuysTableDialog.vue       | 1 +
 test/cypress/integration/entry/myEntry.spec.js | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue
index a2d8c9117..8ac00f999 100644
--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@@ -134,6 +134,7 @@ function downloadCSV(rows) {
                                     @click="
                                         openReport(`Entries/${entityId}/labelSupplier`)
                                     "
+                                    data-cy="entryBuysTableDialog_printLabelsBtn"
                                 />
                             </template>
                             <template #body="props">
diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js
index bf5adcae9..52d95d5b0 100644
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@@ -13,7 +13,7 @@ describe('EntryMy when is supplier', () => {
         cy.get(
             '[to="/null/3"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
         ).click();
-        cy.get('.q-card__section > .q-infinite-scroll > .q-table__container > .q-table__top > :nth-child(3) > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('[data-cy="entryBuysTableDialog_printLabelsBtn"]').click();
         cy.window().its('open').should('be.called');
     });
 });

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 13/22] 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 14/22] 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 2f80bc90af2112904781008ba04183a87972a7b4 Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Fri, 31 Jan 2025 07:52:09 +0100
Subject: [PATCH 15/22] fix: refs #8422 optimized get and dataCy

---
 test/cypress/integration/item/itemTag.spec.js | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/test/cypress/integration/item/itemTag.spec.js b/test/cypress/integration/item/itemTag.spec.js
index cc3814e1d..10d68d08a 100644
--- a/test/cypress/integration/item/itemTag.spec.js
+++ b/test/cypress/integration/item/itemTag.spec.js
@@ -12,9 +12,7 @@ describe('Item tag', () => {
         cy.get('.q-page-sticky > div').click();
         cy.dataCy('Tag_select').eq(7).type('Tallos');
         cy.get('.q-menu .q-item').contains('Tallos').click();
-        cy.get(
-            ':nth-child(8) > [label="Value"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Value_input"]'
-        ).type('1');
+        cy.get(':nth-child(8) > [label="Value"]').type('1');
         +cy.dataCy('crudModelDefaultSaveBtn').click();
         cy.checkNotification("The tag or priority can't be repeated for an item");
     });
@@ -25,15 +23,11 @@ describe('Item tag', () => {
         cy.get('.q-page-sticky > div').click();
         cy.dataCy('Tag_select').eq(7).click();
         cy.get('.q-menu .q-item').contains('Ancho de la base').type('{enter}');
-        cy.get(
-            ':nth-child(8) > [label="Value"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Value_input"]'
-        ).type('50');
+        cy.get(':nth-child(8) > [label="Value"]').type('50');
         cy.dataCy('crudModelDefaultSaveBtn').click();
         cy.checkNotification('Data saved');
-        cy.get(
-            '[data-cy="itemTags"] > :nth-child(8) > .justify-center > .q-icon'
-        ).click();
+        cy.dataCy('itemTags').children(':nth-child(8)').find('.justify-center > .q-icon').click();
         cy.dataCy('VnConfirm_confirm').click();
         cy.checkNotification('Data saved');
     });
-});
+});
\ No newline at end of file

From 645f3f3cb94a90754e942aad3694e2087b5ef8bb Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Fri, 31 Jan 2025 09:36:37 +0100
Subject: [PATCH 16/22] refactor: refs #8418 update selector to use cy.dataCy
 instead cy.get

---
 test/cypress/integration/entry/myEntry.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js
index 52d95d5b0..7bf4a9638 100644
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@@ -13,7 +13,7 @@ describe('EntryMy when is supplier', () => {
         cy.get(
             '[to="/null/3"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
         ).click();
-        cy.get('[data-cy="entryBuysTableDialog_printLabelsBtn"]').click();
+        cy.dataCy('entryBuysTableDialog_printLabelsBtn').click();
         cy.window().its('open').should('be.called');
     });
 });

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 17/22] 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 18/22] 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 11cfca5d806371abf1498c9214b674af93b89c1a Mon Sep 17 00:00:00 2001
From: provira <provira@verdnatura.es>
Date: Mon, 3 Feb 2025 11:43:48 +0100
Subject: [PATCH 19/22] fix: refs #7065 removed unnecessary code

---
 src/components/__tests__/UserPanel.spec.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/__tests__/UserPanel.spec.js b/src/components/__tests__/UserPanel.spec.js
index f77c7b318..ac20f911e 100644
--- a/src/components/__tests__/UserPanel.spec.js
+++ b/src/components/__tests__/UserPanel.spec.js
@@ -4,8 +4,6 @@ import UserPanel from 'src/components/UserPanel.vue';
 import axios from 'axios';
 import { useState } from 'src/composables/useState';
 
-vi.mock('axios');
-
 describe('UserPanel', () => {
     let wrapper;
     let vm;

From de19f2b54cec6a7442fa6510dab7577f690ff0d8 Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Mon, 3 Feb 2025 13:14:11 +0100
Subject: [PATCH 20/22] refactor: refs #8418 update data-cy attribute for print
 labels button in EntryBuysTableDialog

---
 src/pages/Entry/EntryBuysTableDialog.vue       | 2 +-
 test/cypress/integration/entry/myEntry.spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue
index 8ac00f999..86a9b018f 100644
--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@@ -134,7 +134,7 @@ function downloadCSV(rows) {
                                     @click="
                                         openReport(`Entries/${entityId}/labelSupplier`)
                                     "
-                                    data-cy="entryBuysTableDialog_printLabelsBtn"
+                                    data-cy="printLabelsBtn"
                                 />
                             </template>
                             <template #body="props">
diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js
index 7bf4a9638..492e1b491 100644
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@@ -13,7 +13,7 @@ describe('EntryMy when is supplier', () => {
         cy.get(
             '[to="/null/3"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
         ).click();
-        cy.dataCy('entryBuysTableDialog_printLabelsBtn').click();
+        cy.dataCy('printLabelsBtn').click();
         cy.window().its('open').should('be.called');
     });
 });

From 535fa779866fd352a439a25c7f6c7b87c2c2c5ec Mon Sep 17 00:00:00 2001
From: jtubau <jtubau@verdnatura.es>
Date: Mon, 3 Feb 2025 13:19:26 +0100
Subject: [PATCH 21/22] fix: refs #8418 correct casing in translation keys for
 supplier reference and issued date labels

---
 src/pages/InvoiceIn/InvoiceInList.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 805f41726..e1723e3b1 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -177,7 +177,7 @@ const cols = computed(() => [
                         :required="true"
                     />
                     <VnInput
-                        :label="t('invoicein.list.supplierRef')"
+                        :label="t('invoiceIn.list.supplierRef')"
                         v-model="data.supplierRef"
                     />
                     <VnSelect
@@ -190,7 +190,7 @@ const cols = computed(() => [
                         :required="true"
                     />
                     <VnInputDate
-                        :label="t('invoicein.summary.issued')"
+                        :label="t('invoiceIn.summary.issued')"
                         v-model="data.issued"
                     />
                 </template>

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 22/22] 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,
         },