From 8861ee038dfbf44da1b97f8cf91a6bb4517f86ab Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Jan 2024 10:35:39 +0100
Subject: [PATCH 001/111] refs #6384 fix: redirect to same path when id change

---
 src/components/ui/VnSearchbar.vue | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 35f6c1548..bb54f6d31 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -72,15 +72,10 @@ async function search() {
     });
     if (!props.redirect) return;
 
-    const rows = store.data;
-    const module = route.matched[1];
-    if (rows.length === 1) {
-        const [firstRow] = rows;
-        await router.push({ path: `${module.path}/${firstRow.id}` });
-    } else if (route.matched.length > 3) {
-        await router.push({ path: `/${module.path}` });
-        arrayData.updateStateParams();
-    }
+    const { matched: matches } = route;
+    const { path } = matches[matches.length-1];
+    const newRoute = path.replace(':id', searchText.value);
+    await router.push(newRoute);
 }
 </script>
 

From d139d670f17bc8f239455937b7ed47b12e41d20e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Jan 2024 10:37:59 +0100
Subject: [PATCH 002/111] refs #6384 perf: replace code with VnSubToolbar

---
 src/pages/Claim/Card/ClaimCard.vue         | 1 -
 src/pages/Customer/Card/CustomerCard.vue   | 7 ++-----
 src/pages/InvoiceIn/Card/InvoiceInCard.vue | 7 ++-----
 src/pages/Supplier/Card/SupplierCard.vue   | 7 ++-----
 src/pages/Ticket/Card/TicketCard.vue       | 7 ++-----
 src/pages/Travel/Card/TravelCard.vue       | 7 ++-----
 src/pages/Worker/Card/WorkerCard.vue       | 7 ++-----
 7 files changed, 12 insertions(+), 31 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index b6c948c96..8ebfcc285 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -1,6 +1,5 @@
 <script setup>
 import LeftMenu from 'components/LeftMenu.vue';
-import { getUrl } from 'composables/getUrl';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { computed } from 'vue';
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index c833d0cf9..36ec263f0 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -5,6 +5,7 @@ import { useRoute } from 'vue-router';
 import CustomerDescriptor from './CustomerDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const route = useRoute();
@@ -28,11 +29,7 @@ const { t } = useI18n();
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <QToolbar class="bg-vn-dark justify-end">
-                <div id="st-data"></div>
-                <QSpace />
-                <div id="st-actions"></div>
-            </QToolbar>
+            <VnSubToolbar />
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index 4d06cb41e..de843d6af 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
@@ -74,11 +75,7 @@ onMounted(async () => {
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <QToolbar class="bg-vn-dark justify-end">
-                <div id="st-data"></div>
-                <QSpace />
-                <div id="st-actions"></div>
-            </QToolbar>
+            <VnSubToolbar />
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index cf94c9e8d..33d1fe592 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -2,6 +2,7 @@
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -23,11 +24,7 @@ const { t } = useI18n();
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <QToolbar class="bg-vn-dark justify-end">
-                <div id="st-data"></div>
-                <QSpace />
-                <div id="st-actions"></div>
-            </QToolbar>
+            <VnSubToolbar />
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index 91921f827..d8b899b17 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -4,6 +4,7 @@ import { useStateStore } from 'stores/useStateStore';
 import TicketDescriptor from './TicketDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -26,11 +27,7 @@ const { t } = useI18n();
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <QToolbar class="bg-vn-dark justify-end">
-                <div id="st-data"></div>
-                <QSpace />
-                <div id="st-actions"></div>
-            </QToolbar>
+            <VnSubToolbar />
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index 6309c14ab..db34bbfa0 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -1,5 +1,6 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 </script>
@@ -11,11 +12,7 @@ const stateStore = useStateStore();
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <QToolbar class="bg-vn-dark justify-end">
-                <div id="st-data"></div>
-                <QSpace />
-                <div id="st-actions"></div>
-            </QToolbar>
+            <VnSubToolbar />
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 972eb52ec..19397b62e 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -4,6 +4,7 @@ import { useStateStore } from 'stores/useStateStore';
 import WorkerDescriptor from './WorkerDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -26,11 +27,7 @@ const { t } = useI18n();
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <QToolbar class="bg-vn-dark justify-end">
-                <div id="st-data"></div>
-                <QSpace />
-                <div id="st-actions"></div>
-            </QToolbar>
+            <VnSubToolbar />
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>

From 762daa620b6e62da265491912e915b948e33fcde Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Jan 2024 12:06:17 +0100
Subject: [PATCH 003/111] refs #6384 test: e2e

---
 test/cypress/integration/vnSearchBar.spec.js | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 test/cypress/integration/vnSearchBar.spec.js

diff --git a/test/cypress/integration/vnSearchBar.spec.js b/test/cypress/integration/vnSearchBar.spec.js
new file mode 100644
index 000000000..6a769c9d9
--- /dev/null
+++ b/test/cypress/integration/vnSearchBar.spec.js
@@ -0,0 +1,20 @@
+/// <reference types="cypress" />
+describe('VnSearchBar', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.visit('/');
+    });
+
+        it('should redirect to new customer', () => {
+            cy.visit('#/customer/1112/basic-data')
+            cy.get('.q-toolbar > .q-btn--round.q-btn--dense > .q-btn__content > .q-icon').click();
+            cy.get('.q-item > .q-item__label').should('have.text',' #1112')
+            cy.get('.fullscreen').click();
+            cy.get('#searchbar > form > label > div:nth-child(1) input').clear();
+            cy.get('#searchbar > form > label > div:nth-child(1) input').type('1{enter}');
+            cy.get('.q-toolbar > .q-btn--round.q-btn--dense > .q-btn__content > .q-icon').click();
+            cy.get('.q-item > .q-item__label').should('have.text',' #1')
+        });
+
+
+            });

From b4f330a2378ea217ee8e10a4d8f955b055a33e8b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Jan 2024 12:20:56 +0100
Subject: [PATCH 004/111] refs #6384 test: e2e

---
 test/cypress/integration/vnSearchBar.spec.js | 15 +++++++--------
 test/cypress/support/commands.js             | 17 +++++++++++++++++
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/test/cypress/integration/vnSearchBar.spec.js b/test/cypress/integration/vnSearchBar.spec.js
index 6a769c9d9..d6dea0780 100644
--- a/test/cypress/integration/vnSearchBar.spec.js
+++ b/test/cypress/integration/vnSearchBar.spec.js
@@ -7,14 +7,13 @@ describe('VnSearchBar', () => {
 
         it('should redirect to new customer', () => {
             cy.visit('#/customer/1112/basic-data')
-            cy.get('.q-toolbar > .q-btn--round.q-btn--dense > .q-btn__content > .q-icon').click();
+            cy.openLeftMenu();
             cy.get('.q-item > .q-item__label').should('have.text',' #1112')
-            cy.get('.fullscreen').click();
-            cy.get('#searchbar > form > label > div:nth-child(1) input').clear();
-            cy.get('#searchbar > form > label > div:nth-child(1) input').type('1{enter}');
-            cy.get('.q-toolbar > .q-btn--round.q-btn--dense > .q-btn__content > .q-icon').click();
+            cy.closeLeftMenu();
+            cy.clearSearchbar();
+            cy.writeSearchbar('1{enter}');
+            cy.openLeftMenu();
             cy.get('.q-item > .q-item__label').should('have.text',' #1')
+            cy.closeLeftMenu();
         });
-
-
-            });
+});
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 4dfde6e21..7effb94a6 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -166,6 +166,23 @@ Cypress.Commands.add('openRightMenu', (element) => {
     cy.get('#actions-append').click();
 });
 
+Cypress.Commands.add('openLeftMenu', (element) => {
+    if (element) cy.waitForElement(element);
+    cy.get('.q-toolbar > .q-btn--round.q-btn--dense > .q-btn__content > .q-icon').click();
+});
+Cypress.Commands.add('closeLeftMenu', (element) => {
+    if (element) cy.waitForElement(element);
+    cy.get('.fullscreen').click();
+});
+
+Cypress.Commands.add('clearSearchbar', (element) => {
+    if (element) cy.waitForElement(element);
+    cy.get('#searchbar > form > label > div:nth-child(1) input').clear();
+});
+
+Cypress.Commands.add('writeSearchbar', (value) => {
+     cy.get('#searchbar > form > label > div:nth-child(1) input').type(value);
+});
 Cypress.Commands.add('validateContent', (selector, expectedValue) => {
     cy.get(selector).should('have.text', expectedValue);
 });

From bdbc34d4e7fb9a1a1bb9f5183cf9f7f955f7471b Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 9 Jan 2024 14:00:51 +0100
Subject: [PATCH 005/111] refs #6325 claimRatio

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

diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 6693274ac..4ebd6efab 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -38,7 +38,7 @@ const balanceDue = computed(() => {
 const balanceDueWarning = computed(() => (balanceDue.value ? 'negative' : ''));
 
 const claimRate = computed(() => {
-    return customer.value.claimsRatio.claimingRate * 100;
+    return customer.value.claimsRatio.claimingRate;
 });
 
 const priceIncreasingRate = computed(() => {

From 3e8744c8371be5ea1df84cb5c542223ca0629196 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 9 Jan 2024 14:24:29 +0100
Subject: [PATCH 006/111] fix: refs #6630 fix css

---
 src/components/common/VnLog.vue | 51 ++++++++++++++++-----------------
 src/components/ui/VnAvatar.vue  |  3 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 0949fb5cb..1794c3850 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -415,7 +415,7 @@ setLogTree();
             <div class="line bg-grey"></div>
         </QItem>
         <div
-            class="user-log q-mb-sm row"
+            class="user-log q-mb-sm"
             v-for="(userLog, userIndex) in originLog.logs"
             :key="userIndex"
         >
@@ -425,6 +425,7 @@ setLogTree();
                         class="cursor-pointer"
                         :worker="userLog.user.id"
                         :title="userLog.user.nickname"
+                        size="lg"
                     />
                     <WorkerDescriptorProxy
                         v-if="userLog.user.image"
@@ -823,14 +824,30 @@ setLogTree();
 .q-item {
     min-height: 0px;
 }
+.q-menu {
+    display: block;
 
+    & > .loading {
+        display: flex;
+        justify-content: center;
+    }
+    & > .q-card {
+        min-width: 180px;
+        max-width: 400px;
+
+        & > .header {
+            color: $dark;
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
+        }
+    }
+}
 .origin-log {
     &:first-child > .origin-info {
         margin-top: 0;
     }
     & > .origin-info {
-        width: 100%;
-        max-width: 42em;
         margin-top: 28px;
         gap: 6px;
 
@@ -847,14 +864,15 @@ setLogTree();
     }
 }
 .user-log {
+    display: flex;
     width: 100%;
     max-width: 40em;
-
     & > .timeline {
         position: relative;
-        padding-right: 5px;
-        width: 50px;
+        padding-right: 1px;
+        width: 38px;
         min-width: 38px;
+        flex-grow: auto;
         & > .arrow {
             height: 8px;
             width: 8px;
@@ -874,7 +892,7 @@ setLogTree();
             position: absolute;
             background-color: $primary;
             width: 2px;
-            left: 23px;
+            left: 19px;
             z-index: -1;
             top: 0;
             bottom: -8px;
@@ -984,25 +1002,6 @@ setLogTree();
         }
     }
 }
-.q-menu {
-    display: block;
-
-    & > .loading {
-        display: flex;
-        justify-content: center;
-    }
-    & > .q-card {
-        min-width: 180px;
-        max-width: 400px;
-
-        & > .header {
-            color: $dark;
-            overflow: hidden;
-            white-space: nowrap;
-            text-overflow: ellipsis;
-        }
-    }
-}
 </style>
 <i18n>
 en:
diff --git a/src/components/ui/VnAvatar.vue b/src/components/ui/VnAvatar.vue
index 85bece243..0cda98b32 100644
--- a/src/components/ui/VnAvatar.vue
+++ b/src/components/ui/VnAvatar.vue
@@ -5,13 +5,14 @@ const $props = defineProps({
     worker: { type: Number, required: true },
     description: { type: String, default: null },
     clickable: { type: Boolean, default: false },
+    size: { type: String, default: 'xl' },
 });
 const session = useSession();
 const token = session.getToken();
 </script>
 <template>
     <div class="avatar-picture column items-center">
-        <QAvatar color="orange">
+        <QAvatar color="orange" :size="$props.size">
             <QImg
                 :src="`/api/Images/user/160x160/${$props.worker}/download?access_token=${token}`"
                 spinner-color="white"

From 5438ce5c337155454044a62a8462930aca30ed71 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 9 Jan 2024 14:34:25 +0100
Subject: [PATCH 007/111] fix: refs #6630 fix css

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

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 1794c3850..14e4789fc 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -911,6 +911,7 @@ setLogTree();
         overflow: hidden;
         white-space: nowrap;
         text-overflow: ellipsis;
+        min-height: 22px;
         .model-value {
             font-style: italic;
         }

From 57eca9b2672cc988fcee5730b65c598fb008d9ac Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 9 Jan 2024 15:21:26 +0100
Subject: [PATCH 008/111] fix: refs #6630 getLogTree grouping fixed

---
 src/components/common/VnLog.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 14e4789fc..b0a9f230c 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -168,17 +168,17 @@ function getLogTree(data) {
     let originLog = null;
     let userLog = null;
     let modelLog = null;
-    let prevLog;
     let nLogs;
 
-    data.forEach((log) => {
+    for (let i = 0; i < data.length; i++) {
+        let log = data[i];
+        let prevLog = i > 0 ? data[i - 1] : null;
         const locale = validations[log.changedModel]?.locale || {};
 
         // Origin
         const originChanged = !prevLog || log.originFk != prevLog.originFk;
         if (originChanged) {
             logs.push((originLog = { originFk: log.originFk, logs: [] }));
-            prevLog = log;
         }
         // User
         const userChanged = originChanged || log.userFk != prevLog.userFk;
@@ -197,6 +197,7 @@ function getLogTree(data) {
             log.changedModel != prevLog.changedModel ||
             log.changedModelId != prevLog.changedModelId ||
             nLogs >= 6;
+
         if (modelChanged) {
             userLog.logs.push(
                 (modelLog = {
@@ -221,7 +222,7 @@ function getLogTree(data) {
         propNames = [...new Set(propNames)];
 
         log.props = parseProps(propNames, locale, vals, olds);
-    });
+    }
     return logs;
 }
 

From ef8e77904d78772a4a2517829f71a205c0b907f3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Jan 2024 16:54:07 +0100
Subject: [PATCH 009/111] refs #6384 test: vitest

---
 .../components/common/VnSearchBar.spec.js     | 70 +++++++++++++++++++
 test/vitest/helper.js                         | 20 +-----
 2 files changed, 71 insertions(+), 19 deletions(-)
 create mode 100644 test/vitest/__tests__/components/common/VnSearchBar.spec.js

diff --git a/test/vitest/__tests__/components/common/VnSearchBar.spec.js b/test/vitest/__tests__/components/common/VnSearchBar.spec.js
new file mode 100644
index 000000000..24111e90e
--- /dev/null
+++ b/test/vitest/__tests__/components/common/VnSearchBar.spec.js
@@ -0,0 +1,70 @@
+import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+
+vi.mock('vue-router', () => ({
+    useRouter: () => ({
+        push: vi.fn( ),
+        currentRoute: {
+            value: {
+                params: {
+                    id: 11,
+                },
+            },
+        },
+    }),
+    useRoute: () => ({
+        matched: [
+            {
+                path: '/',
+            },
+            {
+                path: '/customer',
+            },
+            {
+                path: '/customer/:id',
+            },
+            {
+                path: '/customer/:id/basic-data',
+            },
+        ],
+        query: {},
+        params: {},
+    }),
+}));
+
+describe('VnSearchBar', () => {
+    let vm;
+    let wrapper;
+
+    beforeAll(() => {
+        wrapper = createWrapper(VnSearchbar, {
+            propsData: {
+                dataKey: 'CustomerList',
+                label: 'Search customer',
+                info: 'Info customer',
+            },
+        });
+        vm = wrapper.vm;
+
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+    it('should be defined', async () => {
+        expect(vm.searchText).toBeDefined();
+        expect(vm.searchText).toEqual('');
+    });
+    it('should redirect', async () => {
+        vi.spyOn(vm.router,'push');
+        vm.searchText = '1';
+        await vm.search();
+        expect(vm.router.push).toHaveBeenCalledWith('/customer/1/basic-data');
+        vm.searchText = '1112';
+        expect(vm.searchText).toEqual('1112');
+        vi.spyOn(vm.router,'push');
+        await vm.search();
+        expect(vm.router.push).toHaveBeenCalledWith('/customer/1112/basic-data');
+     });
+});
diff --git a/test/vitest/helper.js b/test/vitest/helper.js
index 89cc640fd..2b8c70a5f 100644
--- a/test/vitest/helper.js
+++ b/test/vitest/helper.js
@@ -14,25 +14,6 @@ installQuasarPlugin({
     },
 });
 const pinia = createTestingPinia({ createSpy: vi.fn, stubActions: false });
-const mockPush = vi.fn();
-
-vi.mock('vue-router', () => ({
-    useRouter: () => ({
-        push: mockPush,
-        currentRoute: {
-            value: {
-                params: {
-                    id: 1,
-                },
-            },
-        },
-    }),
-    useRoute: () => ({
-        matched: [],
-        query: {},
-        params: {},
-    }),
-}));
 
 vi.mock('axios');
 
@@ -74,6 +55,7 @@ export function createWrapper(component, options) {
         mocks: {
             t: (tKey) => tKey,
             $t: (tKey) => tKey,
+            customRouter: false
         },
     };
 

From 988c47677b8287f9591e0be543b9b20cb957f35f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Jan 2024 17:01:11 +0100
Subject: [PATCH 010/111] refs #6384 test: fix vitest

---
 .../components/common/VnSearchBar.spec.js     | 45 ++++++-------------
 test/vitest/helper.js                         | 20 ++++++++-
 2 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/test/vitest/__tests__/components/common/VnSearchBar.spec.js b/test/vitest/__tests__/components/common/VnSearchBar.spec.js
index 24111e90e..fd0a026ef 100644
--- a/test/vitest/__tests__/components/common/VnSearchBar.spec.js
+++ b/test/vitest/__tests__/components/common/VnSearchBar.spec.js
@@ -2,36 +2,6 @@ import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vite
 import { createWrapper, axios } from 'app/test/vitest/helper';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 
-vi.mock('vue-router', () => ({
-    useRouter: () => ({
-        push: vi.fn( ),
-        currentRoute: {
-            value: {
-                params: {
-                    id: 11,
-                },
-            },
-        },
-    }),
-    useRoute: () => ({
-        matched: [
-            {
-                path: '/',
-            },
-            {
-                path: '/customer',
-            },
-            {
-                path: '/customer/:id',
-            },
-            {
-                path: '/customer/:id/basic-data',
-            },
-        ],
-        query: {},
-        params: {},
-    }),
-}));
 
 describe('VnSearchBar', () => {
     let vm;
@@ -46,7 +16,20 @@ describe('VnSearchBar', () => {
             },
         });
         vm = wrapper.vm;
-
+        vm.route.matched = [
+            {
+                path: '/',
+            },
+            {
+                path: '/customer',
+            },
+            {
+                path: '/customer/:id',
+            },
+            {
+                path: '/customer/:id/basic-data',
+            },
+        ];
     });
 
     afterEach(() => {
diff --git a/test/vitest/helper.js b/test/vitest/helper.js
index 2b8c70a5f..89cc640fd 100644
--- a/test/vitest/helper.js
+++ b/test/vitest/helper.js
@@ -14,6 +14,25 @@ installQuasarPlugin({
     },
 });
 const pinia = createTestingPinia({ createSpy: vi.fn, stubActions: false });
+const mockPush = vi.fn();
+
+vi.mock('vue-router', () => ({
+    useRouter: () => ({
+        push: mockPush,
+        currentRoute: {
+            value: {
+                params: {
+                    id: 1,
+                },
+            },
+        },
+    }),
+    useRoute: () => ({
+        matched: [],
+        query: {},
+        params: {},
+    }),
+}));
 
 vi.mock('axios');
 
@@ -55,7 +74,6 @@ export function createWrapper(component, options) {
         mocks: {
             t: (tKey) => tKey,
             $t: (tKey) => tKey,
-            customRouter: false
         },
     };
 

From d4968d060b9181857966784049763fbf707ffb11 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Jan 2024 17:02:21 +0100
Subject: [PATCH 011/111] Revert "refs #6384 perf: replace code with
 VnSubToolbar"

This reverts commit d139d670f17bc8f239455937b7ed47b12e41d20e.
---
 src/pages/Claim/Card/ClaimCard.vue         | 1 +
 src/pages/Customer/Card/CustomerCard.vue   | 7 +++++--
 src/pages/InvoiceIn/Card/InvoiceInCard.vue | 7 +++++--
 src/pages/Supplier/Card/SupplierCard.vue   | 7 +++++--
 src/pages/Ticket/Card/TicketCard.vue       | 7 +++++--
 src/pages/Travel/Card/TravelCard.vue       | 7 +++++--
 src/pages/Worker/Card/WorkerCard.vue       | 7 +++++--
 7 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index 8ebfcc285..b6c948c96 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -1,5 +1,6 @@
 <script setup>
 import LeftMenu from 'components/LeftMenu.vue';
+import { getUrl } from 'composables/getUrl';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { computed } from 'vue';
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 36ec263f0..c833d0cf9 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -5,7 +5,6 @@ import { useRoute } from 'vue-router';
 import CustomerDescriptor from './CustomerDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const route = useRoute();
@@ -29,7 +28,11 @@ const { t } = useI18n();
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <VnSubToolbar />
+            <QToolbar class="bg-vn-dark justify-end">
+                <div id="st-data"></div>
+                <QSpace />
+                <div id="st-actions"></div>
+            </QToolbar>
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index de843d6af..4d06cb41e 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
@@ -75,7 +74,11 @@ onMounted(async () => {
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <VnSubToolbar />
+            <QToolbar class="bg-vn-dark justify-end">
+                <div id="st-data"></div>
+                <QSpace />
+                <div id="st-actions"></div>
+            </QToolbar>
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index 33d1fe592..cf94c9e8d 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -2,7 +2,6 @@
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -24,7 +23,11 @@ const { t } = useI18n();
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <VnSubToolbar />
+            <QToolbar class="bg-vn-dark justify-end">
+                <div id="st-data"></div>
+                <QSpace />
+                <div id="st-actions"></div>
+            </QToolbar>
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index d8b899b17..91921f827 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -4,7 +4,6 @@ import { useStateStore } from 'stores/useStateStore';
 import TicketDescriptor from './TicketDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -27,7 +26,11 @@ const { t } = useI18n();
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <VnSubToolbar />
+            <QToolbar class="bg-vn-dark justify-end">
+                <div id="st-data"></div>
+                <QSpace />
+                <div id="st-actions"></div>
+            </QToolbar>
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index db34bbfa0..6309c14ab 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -1,6 +1,5 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 </script>
@@ -12,7 +11,11 @@ const stateStore = useStateStore();
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <VnSubToolbar />
+            <QToolbar class="bg-vn-dark justify-end">
+                <div id="st-data"></div>
+                <QSpace />
+                <div id="st-actions"></div>
+            </QToolbar>
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 19397b62e..972eb52ec 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -4,7 +4,6 @@ import { useStateStore } from 'stores/useStateStore';
 import WorkerDescriptor from './WorkerDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -27,7 +26,11 @@ const { t } = useI18n();
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <VnSubToolbar />
+            <QToolbar class="bg-vn-dark justify-end">
+                <div id="st-data"></div>
+                <QSpace />
+                <div id="st-actions"></div>
+            </QToolbar>
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>

From f2006663b732bf70908254362624e4e08078fce1 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 10 Jan 2024 14:29:01 +0100
Subject: [PATCH 012/111] refs #6664 popup

---
 src/components/ui/VnConfirm.vue      | 13 ++++++++++---
 src/pages/Claim/Card/ClaimAction.vue | 16 +++++++++++-----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/components/ui/VnConfirm.vue b/src/components/ui/VnConfirm.vue
index f8715f685..c6650a28f 100644
--- a/src/components/ui/VnConfirm.vue
+++ b/src/components/ui/VnConfirm.vue
@@ -2,6 +2,7 @@
 import { ref } from 'vue';
 import { useDialogPluginComponent } from 'quasar';
 import { useI18n } from 'vue-i18n';
+import { onMounted } from 'vue';
 
 const { t } = useI18n();
 
@@ -28,6 +29,7 @@ const props = defineProps({
         required: false,
         default: null,
     },
+    callbackFn: Function,
 });
 
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);
@@ -37,12 +39,17 @@ const { dialogRef, onDialogOK } = useDialogPluginComponent();
 const title = props.title || t('Confirm');
 const message = props.message || t('Are you sure you want to continue?');
 const isLoading = ref(false);
-
+onMounted(() => {
+    if (props.callbackFn) props.callbackFn();
+});
 async function confirm() {
+    let html = null;
+    html = document.getElementById(props.data.inputId);
     isLoading.value = true;
     if (props.promise) {
         try {
-            await props.promise(props.data);
+            if (html) await props.promise({ ...props.data, return: html.value });
+            else await props.promise(props.data);
         } finally {
             isLoading.value = false;
         }
@@ -66,7 +73,7 @@ async function confirm() {
                 <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
             </QCardSection>
             <QCardSection class="row items-center">
-                <span v-html="message"></span>
+                <span id="spanHTML" v-html="message"></span>
             </QCardSection>
             <QCardActions align="right">
                 <QBtn
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index e92e65fc7..f3dd0b952 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -37,6 +37,7 @@ const marker_labels = [
     { value: DEFAULT_MIN_RESPONSABILITY, label: t('claim.summary.company') },
     { value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.summary.person') },
 ];
+const portesMultiplicator = ref();
 
 const columns = computed(() => [
     {
@@ -140,22 +141,27 @@ async function regularizeClaim() {
                 component: VnConfirm,
                 componentProps: {
                     title: t('confirmGreuges'),
-                    message: t('confirmGreugesMessage'),
+                    message: `
+                    <input class="q-field__native q-m-md" type="number" placeholder="1" id="multiplicatorValue" name="multiplicatorValue" min="0" max="50"/>
+                     `,
+                    data: { inputId: 'multiplicatorValue' },
+                    promise: onUpdateGreugeAccept,
                 },
             })
             .onOk(async () => await onUpdateGreugeAccept());
     }
 }
 
-async function onUpdateGreugeAccept() {
+async function onUpdateGreugeAccept({ return: multiplicatorValue }) {
     const greugeTypeFreightId = (
         await axios.get(`GreugeTypes/findOne`, {
             filter: { where: { code: 'freightPickUp' } },
         })
     ).data.id;
-    const freightPickUpPrice = (await axios.get(`GreugeConfigs/findOne`)).data
-        .freightPickUpPrice;
-
+    const freightPickUpPrice =
+        (await axios.get(`GreugeConfigs/findOne`)).data.freightPickUpPrice *
+        +multiplicatorValue;
+    console.log(freightPickUpPrice);
     await axios.post(`Greuges`, {
         clientFk: claim.value.clientFk,
         description: `${t('ClaimGreugeDescription')} ${claimId}`.toUpperCase(),

From cdadb57af38c0b3f749c8d551775c251f95765d8 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 10 Jan 2024 15:41:00 +0100
Subject: [PATCH 013/111] fix: refs #6630 resolve conficts

---
 src/components/common/VnLog.vue | 2 +-
 src/components/ui/VnAvatar.vue  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 1a271f50f..b42dac386 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -428,6 +428,7 @@ setLogTree();
                                 :class="{ 'cursor-pointer': userLog.user.id }"
                                 :worker-id="userLog.user.id"
                                 :title="userLog.user.nickname"
+                                size="md"
                             />
                         </template>
                     </VnUserLink>
@@ -666,7 +667,6 @@ setLogTree();
                         option-label="locale"
                         :options="actions"
                         @update:model-value="selectFilter('action')"
-                        @clear="() => selectFilter('action')"
                         hide-selected
                     />
                 </QItem>
diff --git a/src/components/ui/VnAvatar.vue b/src/components/ui/VnAvatar.vue
index 566497395..d26aeac19 100644
--- a/src/components/ui/VnAvatar.vue
+++ b/src/components/ui/VnAvatar.vue
@@ -4,6 +4,7 @@ import { useSession } from 'src/composables/useSession';
 const $props = defineProps({
     workerId: { type: Number, required: true },
     description: { type: String, default: null },
+    size: { type: String, default: 'xl' },
 });
 const session = useSession();
 const token = session.getToken();

From 3c8022ac459f92d10cc67959e2e4ca3ebfdb47ec Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 10 Jan 2024 16:49:09 +0100
Subject: [PATCH 014/111] feat: refs #6630 VnAvatar letter feature added

---
 src/components/common/VnLog.vue |  4 ++--
 src/components/ui/VnAvatar.vue  | 21 +++++++++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index b42dac386..4dcb86780 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -422,13 +422,13 @@ setLogTree();
         >
             <div class="timeline">
                 <div class="user-avatar">
-                    <VnUserLink v-if="userLog.user.image" :worker-id="userLog.user.id">
+                    <VnUserLink :worker-id="userLog.user.id">
                         <template #link>
                             <VnAvatar
                                 :class="{ 'cursor-pointer': userLog.user.id }"
                                 :worker-id="userLog.user.id"
                                 :title="userLog.user.nickname"
-                                size="md"
+                                size="lg"
                             />
                         </template>
                     </VnUserLink>
diff --git a/src/components/ui/VnAvatar.vue b/src/components/ui/VnAvatar.vue
index d26aeac19..5a5483084 100644
--- a/src/components/ui/VnAvatar.vue
+++ b/src/components/ui/VnAvatar.vue
@@ -1,20 +1,37 @@
 <script setup>
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
 import { useSession } from 'src/composables/useSession';
+import { useColor } from 'src/composables/useColor';
 
 const $props = defineProps({
     workerId: { type: Number, required: true },
     description: { type: String, default: null },
-    size: { type: String, default: 'xl' },
+    size: { type: String, default: null },
+    title: { type: String, default: null },
 });
 const session = useSession();
 const token = session.getToken();
+const { t } = useI18n();
+
+const title = computed(() => $props.title ?? t('globals.system'));
+const showLetter = ref(false);
 </script>
 <template>
     <div class="avatar-picture column items-center">
-        <QAvatar color="orange" :size="$props.size">
+        <QAvatar
+            :style="{
+                backgroundColor: useColor(title),
+            }"
+            :size="$props.size"
+            :title="title"
+        >
+            <template v-if="showLetter">{{ title.charAt(0) }}</template>
             <QImg
+                v-else
                 :src="`/api/Images/user/160x160/${$props.workerId}/download?access_token=${token}`"
                 spinner-color="white"
+                @error="showLetter = true"
             />
         </QAvatar>
         <div class="description">

From b36cdbf7214376bfc6d3d99e1b96c1f89723ec65 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 11 Jan 2024 08:33:57 +0100
Subject: [PATCH 015/111] refs #6664 scss

---
 src/components/ui/VnConfirm.vue      | 2 +-
 src/pages/Claim/Card/ClaimAction.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/VnConfirm.vue b/src/components/ui/VnConfirm.vue
index c6650a28f..0ce18cadb 100644
--- a/src/components/ui/VnConfirm.vue
+++ b/src/components/ui/VnConfirm.vue
@@ -72,7 +72,7 @@ async function confirm() {
                 <QSpace />
                 <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
             </QCardSection>
-            <QCardSection class="row items-center">
+            <QCardSection class="row justify-center items-center">
                 <span id="spanHTML" v-html="message"></span>
             </QCardSection>
             <QCardActions align="right">
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index f3dd0b952..76f76903c 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -142,7 +142,7 @@ async function regularizeClaim() {
                 componentProps: {
                     title: t('confirmGreuges'),
                     message: `
-                    <input class="q-field__native q-m-md" type="number" placeholder="1" id="multiplicatorValue" name="multiplicatorValue" min="0" max="50"/>
+                    <input class="q-field__native text-grey-2" type="number" placeholder="1" id="multiplicatorValue" name="multiplicatorValue" min="0" max="50"/>
                      `,
                     data: { inputId: 'multiplicatorValue' },
                     promise: onUpdateGreugeAccept,

From 375154b18d06624e809dafe3a152a0af9283fca4 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 11 Jan 2024 10:26:15 +0100
Subject: [PATCH 016/111] refs #6325 claimingRate

---
 src/pages/Claim/Card/ClaimDescriptor.vue | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 85ae9f7e1..47809e9dc 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -2,7 +2,7 @@
 import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { toDate } from 'src/filters';
+import { toDate, toPercentage } from 'src/filters';
 import { useState } from 'src/composables/useState';
 
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
@@ -34,7 +34,16 @@ const filter = {
         {
             relation: 'client',
             scope: {
-                include: { relation: 'salesPersonUser' },
+                include: [
+                    { relation: 'salesPersonUser' },
+                    {
+                        relation: 'claimsRatio',
+                        scope: {
+                            fields: ['claimingRate'],
+                            limit: 1,
+                        },
+                    },
+                ],
             },
         },
         {
@@ -137,6 +146,10 @@ const setData = (entity) => {
                 :value="entity.ticket?.address?.province?.name"
             />
             <VnLv :label="t('claim.card.zone')" :value="entity.ticket?.zone?.name" />
+            <VnLv
+                :label="t('claim.card.zone')"
+                :value="toPercentage(entity.client?.claimsRatio?.claimingRate)"
+            />
         </template>
         <template #actions="{ entity }">
             <QCardActions>

From 1bc2abdab2a6515bd6818c1518ff8ce09f172a13 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 11 Jan 2024 11:44:53 +0100
Subject: [PATCH 017/111] fix: refs #6630 drop unused imports

---
 src/components/ui/CardDescriptor.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 5c911a08e..9571c742e 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -1,8 +1,7 @@
 <script setup>
-import { onMounted, useSlots, ref, watch, computed } from 'vue';
+import { onMounted, useSlots, watch, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-import axios from 'axios';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
 

From 88b68ef399800f49eb31ce1ec5c3613c57d7715d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 11 Jan 2024 12:02:33 +0100
Subject: [PATCH 018/111] fix: refs #6630 large click event

---
 src/pages/Claim/ClaimList.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index 55a244995..eac32c040 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -98,10 +98,12 @@ function viewSummary(id) {
                             </VnLv>
                             <VnLv :label="t('claim.list.assignedTo')" @click.stop>
                                 <template #value>
-                                    <VnUserLink
-                                        :name="row.workerName"
-                                        :worker-id="row.workerFk"
-                                    />
+                                    <span>
+                                        <VnUserLink
+                                            :name="row.workerName"
+                                            :worker-id="row.workerFk"
+                                        />
+                                    </span>
                                 </template>
                             </VnLv>
                             <VnLv

From 77d4e7296812dc0647f89092326eab0dc42dc06d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 11 Jan 2024 12:08:06 +0100
Subject: [PATCH 019/111] fix: refs #6630 fix click event propagation

---
 src/pages/Claim/ClaimList.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index eac32c040..da44427dd 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -88,17 +88,17 @@ function viewSummary(id) {
                     >
                         <template #list-items>
                             <VnLv label="ID" :value="row.id" />
-                            <VnLv :label="t('claim.list.customer')" @click.stop>
+                            <VnLv :label="t('claim.list.customer')">
                                 <template #value>
-                                    <span class="link">
+                                    <span class="link" @click.stop>
                                         {{ row.clientName }}
                                         <CustomerDescriptorProxy :id="row.clientFk" />
                                     </span>
                                 </template>
                             </VnLv>
-                            <VnLv :label="t('claim.list.assignedTo')" @click.stop>
+                            <VnLv :label="t('claim.list.assignedTo')">
                                 <template #value>
-                                    <span>
+                                    <span @click.stop>
                                         <VnUserLink
                                             :name="row.workerName"
                                             :worker-id="row.workerFk"

From 96fdd3f4106b4776f15218536d94f57fcdea1dae Mon Sep 17 00:00:00 2001
From: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Date: Thu, 11 Jan 2024 12:35:58 +0000
Subject: [PATCH 020/111] refs #6384 perf: remove unused dependencie

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index c4f5b828a..1d729b82f 100644
--- a/package.json
+++ b/package.json
@@ -24,8 +24,7 @@
         "validator": "^13.9.0",
         "vue": "^3.3.4",
         "vue-i18n": "^9.2.2",
-        "vue-router": "^4.2.1",
-        "vue-router-mock": "^0.2.0"
+        "vue-router": "^4.2.1"
     },
     "devDependencies": {
         "@intlify/unplugin-vue-i18n": "^0.8.1",

From 8df915e0ef6b7f8cd656f96bc668ce7cfa026d63 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 11 Jan 2024 15:53:31 +0100
Subject: [PATCH 021/111] fix: refs #6630 remove autoload

---
 src/pages/InvoiceIn/InvoiceInList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index effccc830..bf16faafa 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -76,7 +76,6 @@ function viewSummary(id) {
                 data-key="InvoiceInList"
                 url="InvoiceIns/filter"
                 order="issued DESC, id DESC"
-                auto-load
             >
                 <template #body="{ rows }">
                     <CardList

From 3f720e057160ce4a2c31319069d684d29bea42f2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 11 Jan 2024 16:29:20 +0100
Subject: [PATCH 022/111] fix: refs #6630 fix flush selectfilter in vnlog

---
 src/components/common/VnLog.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 4dcb86780..c93399e58 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -321,7 +321,6 @@ function selectFilter(type, dateType) {
     }
     if (type === 'action' && selectedFilters.value.changedModel === null) {
         selectedFilters.value.changedModel = undefined;
-        reload = false;
     }
     if (type === 'userRadio') {
         selectedFilters.value.userFk = userRadio.value;

From 14e68548817731a8b122e04d82a7b190f29e64f5 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 11 Jan 2024 16:42:41 +0100
Subject: [PATCH 023/111] fix: refs #6630 fix invoiceInList test

---
 test/cypress/integration/invoiceIn/invoiceInList.spec.js | 1 +
 test/cypress/support/commands.js                         | 6 +++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInList.spec.js b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
index 60d8c5be1..9d3adbc73 100644
--- a/test/cypress/integration/invoiceIn/invoiceInList.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
@@ -9,6 +9,7 @@ describe('InvoiceInList', () => {
     beforeEach(() => {
         cy.login('developer');
         cy.visit(`/#/invoice-in`);
+        cy.clickFilterSearchBtn();
     });
 
     it('should redirect on clicking a invoice', () => {
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 7dc6ffab7..e4d1cebe1 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -178,9 +178,13 @@ Cypress.Commands.add('clearSearchbar', (element) => {
 });
 
 Cypress.Commands.add('writeSearchbar', (value) => {
-     cy.get('#searchbar > form > label > div:nth-child(1) input').type(value);
+    cy.get('#searchbar > form > label > div:nth-child(1) input').type(value);
 });
 Cypress.Commands.add('validateContent', (selector, expectedValue) => {
     cy.get(selector).should('have.text', expectedValue);
 });
+
+Cypress.Commands.add('clickFilterSearchBtn', () => {
+    cy.get('.q-item__section > .q-btn > .q-btn__content > .q-icon').click();
+});
 // registerCommands();

From 334b4dc9283bd2551881cf993e2301c9d247cbea Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 12 Jan 2024 09:13:36 +0100
Subject: [PATCH 024/111] refs #6353 remove rating

---
 src/pages/Order/Card/OrderCatalogItem.vue | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogItem.vue b/src/pages/Order/Card/OrderCatalogItem.vue
index 140a4c349..bc448eb8c 100644
--- a/src/pages/Order/Card/OrderCatalogItem.vue
+++ b/src/pages/Order/Card/OrderCatalogItem.vue
@@ -51,13 +51,6 @@ const dialog = ref(null);
                         :value="item?.[`value${index + 4}`]"
                     />
                 </template>
-                <QRating
-                    :model-value="item.stars"
-                    icon="star"
-                    icon-selected="star"
-                    color="primary"
-                    readonly
-                />
                 <div class="footer">
                     <div class="price">
                         <p>{{ item.available }} {{ t('to') }} {{ item.price }}</p>
@@ -72,7 +65,8 @@ const dialog = ref(null);
                         </QIcon>
                     </div>
                     <p v-if="item.priceKg" class="price-kg">
-                        {{ t('price-kg') }} {{ toCurrency(item.priceKg) || DEFAULT_PRICE_KG }}
+                        {{ t('price-kg') }}
+                        {{ toCurrency(item.priceKg) || DEFAULT_PRICE_KG }}
                     </p>
                 </div>
             </div>

From 810dd81b34669426630453370dde37ec00beaa4f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 12 Jan 2024 09:58:12 +0100
Subject: [PATCH 025/111] refs #6280 feat VnLocation approach

---
 src/components/common/VnLocation.vue | 179 +++++++++++++++++++++++++++
 1 file changed, 179 insertions(+)
 create mode 100644 src/components/common/VnLocation.vue

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
new file mode 100644
index 000000000..70e818ade
--- /dev/null
+++ b/src/components/common/VnLocation.vue
@@ -0,0 +1,179 @@
+<script setup>
+import { ref, toRefs, computed, watch } from 'vue';
+import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+import VnSelectCreate from 'components/common/VnSelectCreate.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import FetchData from 'components/FetchData.vue';
+const emit = defineEmits(['update:modelValue', 'update:options']);
+import { useI18n } from 'vue-i18n';
+
+const { t } = useI18n();
+const citiesLocationOptions = ref([]);
+const provincesLocationOptions = ref([]);
+const countriesOptions = ref([]);
+const postcodesOptions = ref([]);
+const postcodeFetchDataRef = ref(null);
+
+const $props = defineProps({
+    modelValue: {
+        type: [String, Number, Object],
+        default: null,
+    },
+    options: {
+        type: Array,
+        default: () => [],
+    },
+    optionLabel: {
+        type: String,
+        default: '',
+    },
+    optionValue: {
+        type: String,
+        default: '',
+    },
+    filterOptions: {
+        type: Array,
+        default: () => [],
+    },
+    isClearable: {
+        type: Boolean,
+        default: true,
+    },
+    defaultFilter: {
+        type: Boolean,
+        default: true,
+    },
+});
+const locationsRef = ref();
+const locationsRefFilter = ref({ fields: ['code', 'nickname'], limit: 30 });
+
+const { optionLabel, optionValue, options } = toRefs($props);
+const myOptions = ref([]);
+const myOptionsOriginal = ref([]);
+const vnSelectRef = ref();
+const showForm = ref(false);
+
+const value = computed({
+    get() {
+        return $props.modelValue;
+    },
+    set(value) {
+        emit('update:modelValue', value);
+    },
+});
+
+function setOptions(data) {
+    myOptions.value = JSON.parse(JSON.stringify(data));
+    myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
+}
+setOptions(options.value);
+const filter = (val, options) => {
+    const search = val.toString().toLowerCase();
+
+    if (!search) return options;
+    // if (!search.length < 2) return options;
+
+    return options
+};
+
+const filterHandler = (val, update) => {
+    update(
+        () => {
+            // if (val.length>2)
+                myOptions.value = filter(val, myOptionsOriginal.value);
+        },
+        (ref) => {
+            if (val !== '' && ref.options.length > 0) {
+                ref.setOptionIndex(-1);
+                ref.moveOptionSelection(1, true);
+            }
+        }
+    );
+};
+
+function locationFilter(val) {
+    let where = { limit: 30 };
+    let params = {};
+    let key = 'nickname';
+
+    if (new RegExp(/\d/g).test(val)) {
+        key = 'id';
+    }
+    params = { [key]: { like: `%${val}%` } };
+    where = Object.assign(where, params);
+    locationsRef.value.fetch({ where });
+}
+watch(options, (newValue) => {
+    setOptions(newValue);
+});
+
+function showLabel(data){
+    return `${data.code} - ${data.town.name}(${data.town.province.name}), ${data.town.province.country.country}`;
+}
+
+</script>
+
+<template>
+    <FetchData
+        ref="postcodeFetchDataRef"
+        url="Postcodes/location"
+        @on-fetch="(data) => (postcodesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        @on-fetch="(data) => (citiesLocationOptions = data)"
+        auto-load
+        url="Towns/location"
+    />
+    <FetchData
+        @on-fetch="(data) => (provincesLocationOptions = data)"
+        auto-load
+        url="Provinces/location"
+    />
+    <FetchData
+        @on-fetch="(data) => (countriesOptions = data)"
+        auto-load
+        url="Countries"
+    />
+    <VnSelectCreate
+        v-model="value"
+        :options="postcodesOptions"
+        :label="t('Location')"
+        :option-label="showLabel"
+        v-bind="$attrs"
+        emit-value
+        map-options
+        use-input
+        @filter="filterHandler"
+        clearable
+        hide-selected
+        fill-input
+        :class="{ required: $attrs.required }"
+    >
+        <template #form>
+            <CreateNewPostcode @on-data-saved="onPostcodeCreated($event)" />
+        </template>
+        <template #option="scope">
+            <QItem v-bind="scope.itemProps">
+                <QItemSection v-if="scope.opt">
+                    <QItemLabel>{{ scope.opt.code }}</QItemLabel>
+                    <QItemLabel caption
+                        >{{ showLabel(scope.opt)}}</QItemLabel
+                    >
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnSelectCreate>
+</template>
+<style lang="scss" scoped>
+.add-icon {
+    cursor: pointer;
+    background-color: $primary;
+    border-radius: 50px;
+}
+</style>
+
+<i18n>
+es:
+    Location: Ubicación
+</i18n>

From 68ba851e6e9f5c2b5a7e47b3b33df2b8ce1fddf3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 12 Jan 2024 09:58:24 +0100
Subject: [PATCH 026/111] refs #6280 feat use VnLocation in CustomerCreate

---
 src/pages/Customer/CustomerCreate.vue | 96 ++-------------------------
 1 file changed, 7 insertions(+), 89 deletions(-)

diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index cfaef0855..f6ac6a165 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -2,12 +2,11 @@
 import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
-import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+import VnLocation from 'src/components/common/VnLocation.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
@@ -133,96 +132,15 @@ const onPostcodeCreated = async () => {
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectCreate
-                            v-model="data.postcode"
-                            :label="t('Postcode')"
-                            :rules="validate('Worker.postcode')"
-                            :roles-allowed-to-create="['deliveryAssistant']"
+                        <VnLocation
                             :options="postcodesOptions"
-                            option-label="code"
-                            option-value="code"
-                            hide-selected
-                        >
-                            <template #form>
-                                <CustomerCreateNewPostcode
-                                    @on-data-saved="onPostcodeCreated($event)"
-                                />
-                            </template>
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection v-if="scope.opt">
-                                        <QItemLabel>{{ scope.opt.code }}</QItemLabel>
-                                        <QItemLabel caption
-                                            >{{ scope.opt.code }} -
-                                            {{ scope.opt.town.name }} ({{
-                                                scope.opt.town.province.name
-                                            }},
-                                            {{
-                                                scope.opt.town.province.country.country
-                                            }})</QItemLabel
-                                        >
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectCreate>
-                    </div>
-                    <div class="col">
-                        <!-- ciudades -->
-                        <VnSelectFilter
-                            :label="t('City')"
-                            :options="citiesLocationOptions"
-                            hide-selected
-                            option-label="name"
-                            option-value="name"
-                            v-model="data.city"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ scope.opt.name }}</QItemLabel>
-                                        <QItemLabel caption>
-                                            {{
-                                                `${scope.opt.name}, ${scope.opt.province.name} (${scope.opt.province.country.country})`
-                                            }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectFilter>
-                    </div>
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelectFilter
-                            :label="t('Province')"
-                            :options="provincesLocationOptions"
-                            hide-selected
-                            option-label="name"
-                            option-value="id"
-                            v-model="data.provinceFk"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{
-                                            `${scope.opt.name} (${scope.opt.country.country})`
-                                        }}</QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectFilter>
-                    </div>
-                    <div class="col">
-                        <VnSelectFilter
-                            :label="t('Country')"
-                            :options="countriesOptions"
-                            hide-selected
-                            option-label="country"
-                            option-value="id"
-                            v-model="data.countryFk"
-                        />
+                            v-model="data.location"
+                        @update:model-value="(data)=> console.log(data)"
+                            >
+                        </VnLocation>
                     </div>
                 </VnRow>
+
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
                         <QInput v-model="data.userName" :label="t('Web user')" />

From 67d4471f42eb2d125103ad42f8c65d3e44e4fe70 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 12 Jan 2024 10:57:50 +0100
Subject: [PATCH 027/111] refs #6280 feat: improve VnLocation

---
 src/components/common/VnLocation.vue     |  7 +++--
 src/components/common/VnSelectFilter.vue | 38 ++++++++++++++++++++++--
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 70e818ade..3a296e168 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -135,16 +135,19 @@ function showLabel(data){
         auto-load
         url="Countries"
     />
+    <!-- @input-value="filter"
+    :default-filter="false" -->
     <VnSelectCreate
         v-model="value"
         :options="postcodesOptions"
         :label="t('Location')"
-        :option-label="showLabel"
+        option-label="code"
         v-bind="$attrs"
         emit-value
         map-options
         use-input
-        @filter="filterHandler"
+        :filter-options="['code','town.name']"
+        :filter-rules="['val.length>2',{code:'.length > 2'}]"
         clearable
         hide-selected
         fill-input
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 244fb50bb..2c5c16e4f 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -16,7 +16,11 @@ const $props = defineProps({
         default: '',
     },
     filterOptions: {
-        type: Array,
+        type: [Array, Function],
+        default: () => [],
+    },
+    filterRules: {
+        type: [Array, Function],
         default: () => [],
     },
     isClearable: {
@@ -47,16 +51,46 @@ function setOptions(data) {
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
 }
+function deepFind(obj, path) {
+  var paths = path.split('.')
+    , current = obj
+    , i;
+
+  for (i = 0; i < paths.length; ++i) {
+    if (current[paths[i]] == undefined) {
+      return undefined;
+    } else {
+      current = current[paths[i]];
+    }
+  }
+  return current;
+}
 setOptions(options.value);
 const filter = (val, options) => {
     const search = val.toString().toLowerCase();
 
     if (!search) return options;
+    if($props.filterRules.length) {
+        const passSomeRule = $props.filterRules.some((rule) => {
+            if(typeof rule === 'object') return true
+            const cond = eval(rule)
+            return cond;
+        });
+        if(!passSomeRule) return options
+    }
 
     return options.filter((row) => {
         if ($props.filterOptions.length) {
             return $props.filterOptions.some((prop) => {
-                const propValue = String(row[prop]).toLowerCase();
+                const passRules = $props.filterRules
+                .filter(rule=>typeof rule === 'object')
+                .every(rule=>{
+                    const propExists = Object.keys(rule).includes(prop);
+                    if(!propExists) return false;
+                    return eval(prop.concat(rule[prop]))
+                });
+                const propValue = String(deepFind(row,prop)).toLowerCase();
+                if(passRules)
                 return propValue.includes(search);
             });
         }

From 4b3ca3bbd97872f8c8935f0ec30ee3d442f14788 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 12 Jan 2024 11:27:54 +0100
Subject: [PATCH 028/111] refs #6280 feat: return geoFk VnLocation

---
 src/components/common/VnLocation.vue     | 51 +++---------------------
 src/components/common/VnSelectFilter.vue |  9 -----
 2 files changed, 5 insertions(+), 55 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 3a296e168..5c41144ac 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -2,7 +2,6 @@
 import { ref, toRefs, computed, watch } from 'vue';
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectCreate from 'components/common/VnSelectCreate.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
 const emit = defineEmits(['update:modelValue', 'update:options']);
 import { useI18n } from 'vue-i18n';
@@ -44,14 +43,10 @@ const $props = defineProps({
         default: true,
     },
 });
-const locationsRef = ref();
-const locationsRefFilter = ref({ fields: ['code', 'nickname'], limit: 30 });
 
-const { optionLabel, optionValue, options } = toRefs($props);
+const { options } = toRefs($props);
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
-const vnSelectRef = ref();
-const showForm = ref(false);
 
 const value = computed({
     get() {
@@ -67,42 +62,6 @@ function setOptions(data) {
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
 }
 setOptions(options.value);
-const filter = (val, options) => {
-    const search = val.toString().toLowerCase();
-
-    if (!search) return options;
-    // if (!search.length < 2) return options;
-
-    return options
-};
-
-const filterHandler = (val, update) => {
-    update(
-        () => {
-            // if (val.length>2)
-                myOptions.value = filter(val, myOptionsOriginal.value);
-        },
-        (ref) => {
-            if (val !== '' && ref.options.length > 0) {
-                ref.setOptionIndex(-1);
-                ref.moveOptionSelection(1, true);
-            }
-        }
-    );
-};
-
-function locationFilter(val) {
-    let where = { limit: 30 };
-    let params = {};
-    let key = 'nickname';
-
-    if (new RegExp(/\d/g).test(val)) {
-        key = 'id';
-    }
-    params = { [key]: { like: `%${val}%` } };
-    where = Object.assign(where, params);
-    locationsRef.value.fetch({ where });
-}
 watch(options, (newValue) => {
     setOptions(newValue);
 });
@@ -135,19 +94,19 @@ function showLabel(data){
         auto-load
         url="Countries"
     />
-    <!-- @input-value="filter"
-    :default-filter="false" -->
     <VnSelectCreate
         v-model="value"
         :options="postcodesOptions"
         :label="t('Location')"
-        option-label="code"
+        option-value="geoFk"
+        :option-label="showLabel"
+        :placeholder="t('Min. 3 char')"
         v-bind="$attrs"
         emit-value
         map-options
         use-input
         :filter-options="['code','town.name']"
-        :filter-rules="['val.length>2',{code:'.length > 2'}]"
+        :filter-rules="['val.length>2']"
         clearable
         hide-selected
         fill-input
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 2c5c16e4f..ad0a0ec38 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -72,7 +72,6 @@ const filter = (val, options) => {
     if (!search) return options;
     if($props.filterRules.length) {
         const passSomeRule = $props.filterRules.some((rule) => {
-            if(typeof rule === 'object') return true
             const cond = eval(rule)
             return cond;
         });
@@ -82,15 +81,7 @@ const filter = (val, options) => {
     return options.filter((row) => {
         if ($props.filterOptions.length) {
             return $props.filterOptions.some((prop) => {
-                const passRules = $props.filterRules
-                .filter(rule=>typeof rule === 'object')
-                .every(rule=>{
-                    const propExists = Object.keys(rule).includes(prop);
-                    if(!propExists) return false;
-                    return eval(prop.concat(rule[prop]))
-                });
                 const propValue = String(deepFind(row,prop)).toLowerCase();
-                if(passRules)
                 return propValue.includes(search);
             });
         }

From 20835471a3a1c392b080f51295e0bf49c92a71cf Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 15 Jan 2024 09:14:42 +0100
Subject: [PATCH 029/111] refs #6280 feat: handle option selected from 
 VnLocation

---
 src/components/common/VnLocation.vue  |  4 ++--
 src/pages/Customer/CustomerCreate.vue | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 5c41144ac..e91c78430 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -98,9 +98,8 @@ function showLabel(data){
         v-model="value"
         :options="postcodesOptions"
         :label="t('Location')"
-        option-value="geoFk"
         :option-label="showLabel"
-        :placeholder="t('Min. 3 char')"
+        :placeholder="t('Search by postalCode or town (at least 3 characters')"
         v-bind="$attrs"
         emit-value
         map-options
@@ -138,4 +137,5 @@ function showLabel(data){
 <i18n>
 es:
     Location: Ubicación
+    Search by postalCode or town (at least 3 characters): Buscar por código postal o nombre ( al menos 3 letras)
 </i18n>
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index f6ac6a165..3afda7fac 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -36,9 +36,13 @@ const provincesLocationOptions = ref([]);
 const countriesOptions = ref([]);
 const postcodesOptions = ref([]);
 
-const onPostcodeCreated = async () => {
-    postcodeFetchDataRef.value.fetch();
-};
+
+function handleLocation(data, { city, postcode, provinceFk, countryFk }) {
+    data.postcode = postcode;
+    data.city = city;
+    data.provinceFk = provinceFk;
+    data.countryFk = countryFk;
+}
 </script>
 
 <template>
@@ -133,10 +137,14 @@ const onPostcodeCreated = async () => {
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
                         <VnLocation
+                            :rules="validate('Worker.postcode')"
+                            :roles-allowed-to-create="['deliveryAssistant']"
                             :options="postcodesOptions"
                             v-model="data.location"
-                        @update:model-value="(data)=> console.log(data)"
-                            >
+                            @update:model-value="
+                                (location) => handleLocation(data, location)
+                            "
+                        >
                         </VnLocation>
                     </div>
                 </VnRow>

From 84b53131c7de09dc3ab204eba3c246f920321ee6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 15 Jan 2024 09:22:01 +0100
Subject: [PATCH 030/111] refs #6280 feat: deepFind as composable

---
 src/components/common/VnSelectFilter.vue | 14 +-------------
 src/composables/deepFind.js              | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 13 deletions(-)
 create mode 100644 src/composables/deepFind.js

diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index ad0a0ec38..c197f17ea 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -1,4 +1,5 @@
 <script setup>
+import { deepFind } from 'src/composables/deepFind';
 import { ref, toRefs, computed, watch } from 'vue';
 const emit = defineEmits(['update:modelValue', 'update:options']);
 
@@ -51,20 +52,7 @@ function setOptions(data) {
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
 }
-function deepFind(obj, path) {
-  var paths = path.split('.')
-    , current = obj
-    , i;
 
-  for (i = 0; i < paths.length; ++i) {
-    if (current[paths[i]] == undefined) {
-      return undefined;
-    } else {
-      current = current[paths[i]];
-    }
-  }
-  return current;
-}
 setOptions(options.value);
 const filter = (val, options) => {
     const search = val.toString().toLowerCase();
diff --git a/src/composables/deepFind.js b/src/composables/deepFind.js
new file mode 100644
index 000000000..ec28fe387
--- /dev/null
+++ b/src/composables/deepFind.js
@@ -0,0 +1,14 @@
+export async function deepFind(obj, path) {
+    const keys = path.split('.');
+    let current = obj;
+
+    for (const key of keys) {
+        if (current[key] !== undefined) {
+            current = current[key];
+        } else {
+            return undefined;
+        }
+    }
+
+    return current;
+}

From 972c340fad8043f67cfc33861d3dcc2f3052643d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 15 Jan 2024 14:44:38 +0100
Subject: [PATCH 031/111] refs #6704: fix1

---
 src/components/ui/VnPaginate.vue | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 1aa99ea0c..ecebf8933 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -1,10 +1,12 @@
 <script setup>
-import { onMounted, ref, watch } from 'vue';
+import { onMounted, ref, watch, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
+import { useRoute } from 'vue-router';
 
 const { t } = useI18n();
 
+const route = useRoute();
 const props = defineProps({
     dataKey: {
         type: String,
@@ -79,14 +81,27 @@ const store = arrayData.store;
 onMounted(() => {
     if (props.autoLoad) fetch();
 });
-
+onUnmounted(async ()=>{
+   arrayData.destroy()
+});
 watch(
     () => props.data,
     () => {
+        // store.skip = 0;
         store.data = props.data;
     }
 );
 
+// watch(
+//     () => route.path,
+//     async (newId, oldId) => {
+//         if (newId!==oldId) {
+//             // arrayData.hasMoreData.value = [];
+//             arrayData.store.clear()
+//                         }
+//         }
+//     );
+
 async function fetch() {
     await arrayData.fetch({ append: false });
     if (!arrayData.hasMoreData.value) {

From e480b17edc5b212b71f564c8f2a7095eae73b460 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 16 Jan 2024 07:24:41 +0100
Subject: [PATCH 032/111] refs #6704: fix2

---
 src/composables/useArrayData.js   | 14 +++++++++++++-
 src/pages/Worker/WorkerCreate.vue |  4 ++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 9f66a0e89..d5c564373 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -142,10 +142,21 @@ export function useArrayData(key, userOptions) {
         userParams = sanitizerParams(userParams, store?.exprBuilder);
 
         store.userParams = userParams;
-
+        store.skip = 0;
         await fetch({ append: false });
         return { filter, params };
     }
+    async function removeFilter({ filter, params }) {
+        if (filter) store.userFilter = Object.assign(store.userFilter, filter);
+
+        let userParams = Object.assign({}, store.userParams, params);
+        userParams = sanitizerParams(userParams, store?.exprBuilder);
+
+        store.userParams = userParams;
+        store.skip = 0;
+        await loadMore({ append: false });
+        return { filter, params };
+    }
 
     function sanitizerParams(params, exprBuilder) {
         for (const param in params) {
@@ -200,6 +211,7 @@ export function useArrayData(key, userOptions) {
         fetch,
         applyFilter,
         addFilter,
+        removeFilter,
         refresh,
         destroy,
         loadMore,
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index accac7cf2..a476632bb 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -9,7 +9,7 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
-import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
@@ -189,7 +189,7 @@ onMounted(async () => {
                             hide-selected
                         >
                             <template #form>
-                                <CustomerCreateNewPostcode
+                                <CreateNewPostcode
                                     @on-data-saved="onPostcodeCreated($event)"
                                 />
                             </template>

From 9daffdfa22d95949065044b4d3e48758fea62546 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 16 Jan 2024 08:40:03 +0100
Subject: [PATCH 033/111] refs #6704: posible fix

---
 src/components/ui/VnFilterPanel.vue | 37 ++++++++++++++++-------------
 src/components/ui/VnPaginate.vue    | 11 ++++-----
 src/composables/useArrayData.js     |  8 +++++--
 src/stores/useArrayDataStore.js     |  2 ++
 4 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 0a306dc5f..9cb558467 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -65,18 +65,6 @@ onMounted(() => {
 
 const isLoading = ref(false);
 
-async function search() {
-    isLoading.value = true;
-    const params = { ...userParams.value };
-    const { params: newParams } = await arrayData.addFilter({ params });
-    userParams.value = newParams;
-
-    if (!props.showAll && !Object.values(params).length) store.data = [];
-
-    isLoading.value = false;
-    emit('search');
-}
-
 async function reload() {
     isLoading.value = true;
     const params = Object.values(userParams.value).filter((param) => param);
@@ -87,6 +75,25 @@ async function reload() {
     emit('refresh');
 }
 
+async function search() {
+    isLoading.value = true;
+    const params = { ...userParams.value };
+    store.pagination = true;
+    store.filter.skip = 0;
+    store.skip = 0;
+    const { params: newParams } = await arrayData.addFilter({ params });
+    userParams.value = newParams;
+
+    if (!props.showAll && !Object.values(params).length) store.data = [];
+
+    isLoading.value = false;
+    emit('search');
+}
+async function remove(key) {
+    userParams.value[key] = null;
+    await search();
+    emit('remove', key);
+}
 async function clearFilters() {
     isLoading.value = true;
 
@@ -126,11 +133,7 @@ const customTags = computed(() =>
     tagsList.value.filter((tag) => (props.customTags || []).includes(tag.label))
 );
 
-async function remove(key) {
-    userParams.value[key] = null;
-    await search();
-    emit('remove', key);
-}
+
 
 function formatValue(value) {
     if (typeof value === 'boolean') {
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index ecebf8933..ea52a2943 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -81,14 +81,13 @@ const store = arrayData.store;
 onMounted(() => {
     if (props.autoLoad) fetch();
 });
-onUnmounted(async ()=>{
-   arrayData.destroy()
-});
-watch(
-    () => props.data,
+
+watch(()=>[props.data, store],
     () => {
         // store.skip = 0;
         store.data = props.data;
+        if(store.pagination)
+        paginate()
     }
 );
 
@@ -187,7 +186,7 @@ async function onLoad(...params) {
         v-if="store.data"
         @load="onLoad"
         :offset="offset"
-        class="full-width full-height overflow-auto"
+        class="full-width full-height"
     >
         <slot name="body" :rows="store.data"></slot>
         <div v-if="isLoading" class="info-row q-pa-md text-center">
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index d5c564373..7ed15baf3 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -99,7 +99,10 @@ export function useArrayData(key, userOptions) {
         const { limit } = filter;
 
         hasMoreData.value = response.data.length === limit;
-
+        if (store.pagination) {
+            // await loadMore();
+            store.pagination = false;
+        }
         if (append) {
             if (!store.data) store.data = [];
             for (const row of response.data) store.data.push(row);
@@ -143,7 +146,8 @@ export function useArrayData(key, userOptions) {
 
         store.userParams = userParams;
         store.skip = 0;
-        await fetch({ append: false });
+        store.filter.skip = 0;
+        await fetch({ append: false, loadMore: true });
         return { filter, params };
     }
     async function removeFilter({ filter, params }) {
diff --git a/src/stores/useArrayDataStore.js b/src/stores/useArrayDataStore.js
index 223406a33..94e772a87 100644
--- a/src/stores/useArrayDataStore.js
+++ b/src/stores/useArrayDataStore.js
@@ -19,6 +19,8 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
             order: '',
             data: ref(),
             isLoading: false,
+            loadMore: false,
+            pagination: false,
             exprBuilder: null,
         };
     }

From b58f9bee2eac2d5c2a3b675a334aadfd447fb141 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 16 Jan 2024 11:24:28 +0100
Subject: [PATCH 034/111] refs #6704: fix bug

---
 src/components/ui/VnFilterPanel.vue |  6 ++++-
 src/components/ui/VnPaginate.vue    | 42 ++++++++++++++++++++++++-----
 src/composables/useArrayData.js     | 17 ++++++++----
 src/stores/useArrayDataStore.js     |  1 +
 4 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 9cb558467..6b6960243 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -79,6 +79,7 @@ async function search() {
     isLoading.value = true;
     const params = { ...userParams.value };
     store.pagination = true;
+    store.userParamsChanged = true;
     store.filter.skip = 0;
     store.skip = 0;
     const { params: newParams } = await arrayData.addFilter({ params });
@@ -87,6 +88,8 @@ async function search() {
     if (!props.showAll && !Object.values(params).length) store.data = [];
 
     isLoading.value = false;
+    // store.pagination = false;
+
     emit('search');
 }
 async function remove(key) {
@@ -96,10 +99,11 @@ async function remove(key) {
 }
 async function clearFilters() {
     isLoading.value = true;
+    store.userParamsChanged = true;
 
     // Filtrar los params no removibles
     const removableFilters = Object.keys(userParams.value).filter((param) =>
-        props.unremovableParams.includes(param)
+    props.unremovableParams.includes(param)
     );
     const newParams = {};
     // Conservar solo los params que no son removibles
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index ea52a2943..dfb19ed88 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -1,5 +1,12 @@
 <script setup>
-import { onMounted, ref, watch, onUnmounted } from 'vue';
+import {
+    onMounted,
+    ref,
+    watch,
+    onUnmounted,
+    onRenderTriggered,
+    onRenderTracked,
+} from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import { useRoute } from 'vue-router';
@@ -57,7 +64,7 @@ const props = defineProps({
         default: null,
     },
 });
-
+const infiniteScrollRef = ref();
 const emit = defineEmits(['onFetch', 'onPaginate']);
 defineExpose({ fetch });
 const isLoading = ref(false);
@@ -82,12 +89,19 @@ onMounted(() => {
     if (props.autoLoad) fetch();
 });
 
-watch(()=>[props.data, store],
+// onRenderTracked((e)=>{
+// console.log(e)
+// });
+// onRenderTracked((e)=>{
+// console.log(e)
+// });
+
+watch(
+    () => [props.data, store],
     () => {
         // store.skip = 0;
         store.data = props.data;
-        if(store.pagination)
-        paginate()
+        if (store.pagination) paginate();
     }
 );
 
@@ -115,9 +129,14 @@ async function paginate() {
     if (!props.url) return;
 
     isLoading.value = true;
+    // infiniteScrollRef.value.resume()
     await arrayData.loadMore();
 
     if (!arrayData.hasMoreData.value) {
+        // infiniteScrollRef.value.resume()
+        if (store.userParamsChanged) arrayData.hasMoreData.value = true;
+        store.userParamsChanged = false;
+
         isLoading.value = false;
         return;
     }
@@ -135,6 +154,7 @@ async function paginate() {
 }
 
 async function onLoad(...params) {
+    console.log('ENTRA');
     if (!store.data) return;
 
     const done = params[1];
@@ -143,9 +163,16 @@ async function onLoad(...params) {
     pagination.value.page = pagination.value.page + 1;
 
     await paginate();
+    let isDone = false;
+    if (store.userParamsChanged) isDone = !arrayData.hasMoreData.value;
+    // console.error('isDone', isDone);
+    // if(isDone){
+    //     // infiniteScrollRef.value.trigger()
+    //     console.error('VnPaginate', isDone, arrayData.store.pagination)
 
-    const endOfPages = !arrayData.hasMoreData.value;
-    done(endOfPages);
+    // }
+    // done(false);
+    done(isDone);
 }
 </script>
 
@@ -183,6 +210,7 @@ async function onLoad(...params) {
         </div>
     </div>
     <QInfiniteScroll
+        ref="infiniteScrollRef"
         v-if="store.data"
         @load="onLoad"
         :offset="offset"
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 7ed15baf3..b0ba5a836 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -98,11 +98,17 @@ export function useArrayData(key, userOptions) {
 
         const { limit } = filter;
 
-        hasMoreData.value = response.data.length === limit;
-        if (store.pagination) {
-            // await loadMore();
-            store.pagination = false;
+        /*if (Object.keys(store.userParams).length > 0) {
+            hasMoreData.value = true;
+        } else if(store.userParamsChanged){
+            hasMoreData.value = false;
         }
+        else */hasMoreData.value = response.data.length === limit;
+        // if (store.pagination) {
+        //     console.error('Before-ArrayData', store.pagination, hasMoreData.value)
+        //     hasMoreData.value = true;
+        //     console.error('After-ArrayData', store.pagination, hasMoreData.value)
+        // }
         if (append) {
             if (!store.data) store.data = [];
             for (const row of response.data) store.data.push(row);
@@ -182,6 +188,7 @@ export function useArrayData(key, userOptions) {
 
     async function loadMore() {
         if (!hasMoreData.value) return;
+        console.error('loadMore', hasMoreData.value);
 
         store.skip = store.limit * page.value;
         page.value += 1;
@@ -200,7 +207,7 @@ export function useArrayData(key, userOptions) {
         if (store.skip) query.skip = store.skip;
         if (store.userParams && Object.keys(store.userParams).length !== 0)
             query.params = JSON.stringify(store.userParams);
-
+        // hasMoreData.value = true;
         if (router)
             router.replace({
                 path: route.path,
diff --git a/src/stores/useArrayDataStore.js b/src/stores/useArrayDataStore.js
index 94e772a87..c8cd349e0 100644
--- a/src/stores/useArrayDataStore.js
+++ b/src/stores/useArrayDataStore.js
@@ -21,6 +21,7 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
             isLoading: false,
             loadMore: false,
             pagination: false,
+            userParamsChanged: true,
             exprBuilder: null,
         };
     }

From a94fb6026a9bd20a295bb7c69e8b3230fe0b7379 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 16 Jan 2024 12:14:48 +0100
Subject: [PATCH 035/111] refs #6704: remove bad code

---
 src/components/ui/VnFilterPanel.vue | 47 ++++++++++++++---------------
 src/components/ui/VnPaginate.vue    | 46 ++--------------------------
 src/composables/useArrayData.js     | 30 +++---------------
 src/pages/Claim/Card/ClaimNotes.vue |  2 +-
 src/stores/useArrayDataStore.js     |  2 --
 5 files changed, 30 insertions(+), 97 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 6b6960243..dfe0e57ab 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -64,6 +64,20 @@ onMounted(() => {
 });
 
 const isLoading = ref(false);
+async function search() {
+    isLoading.value = true;
+    const params = { ...userParams.value };
+    store.userParamsChanged = true;
+    store.filter.skip = 0;
+    store.skip = 0;
+    const { params: newParams } = await arrayData.addFilter({ params });
+    userParams.value = newParams;
+
+    if (!props.showAll && !Object.values(params).length) store.data = [];
+
+    isLoading.value = false;
+    emit('search');
+}
 
 async function reload() {
     isLoading.value = true;
@@ -75,35 +89,14 @@ async function reload() {
     emit('refresh');
 }
 
-async function search() {
-    isLoading.value = true;
-    const params = { ...userParams.value };
-    store.pagination = true;
-    store.userParamsChanged = true;
-    store.filter.skip = 0;
-    store.skip = 0;
-    const { params: newParams } = await arrayData.addFilter({ params });
-    userParams.value = newParams;
-
-    if (!props.showAll && !Object.values(params).length) store.data = [];
-
-    isLoading.value = false;
-    // store.pagination = false;
-
-    emit('search');
-}
-async function remove(key) {
-    userParams.value[key] = null;
-    await search();
-    emit('remove', key);
-}
 async function clearFilters() {
     isLoading.value = true;
     store.userParamsChanged = true;
-
+    store.filter.skip = 0;
+    store.skip = 0;
     // Filtrar los params no removibles
     const removableFilters = Object.keys(userParams.value).filter((param) =>
-    props.unremovableParams.includes(param)
+        props.unremovableParams.includes(param)
     );
     const newParams = {};
     // Conservar solo los params que no son removibles
@@ -137,7 +130,11 @@ const customTags = computed(() =>
     tagsList.value.filter((tag) => (props.customTags || []).includes(tag.label))
 );
 
-
+async function remove(key) {
+    userParams.value[key] = null;
+    await search();
+    emit('remove', key);
+}
 
 function formatValue(value) {
     if (typeof value === 'boolean') {
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index dfb19ed88..4c38c1c1a 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -1,19 +1,10 @@
 <script setup>
-import {
-    onMounted,
-    ref,
-    watch,
-    onUnmounted,
-    onRenderTriggered,
-    onRenderTracked,
-} from 'vue';
+import { onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
-import { useRoute } from 'vue-router';
 
 const { t } = useI18n();
 
-const route = useRoute();
 const props = defineProps({
     dataKey: {
         type: String,
@@ -64,7 +55,7 @@ const props = defineProps({
         default: null,
     },
 });
-const infiniteScrollRef = ref();
+
 const emit = defineEmits(['onFetch', 'onPaginate']);
 defineExpose({ fetch });
 const isLoading = ref(false);
@@ -89,32 +80,13 @@ onMounted(() => {
     if (props.autoLoad) fetch();
 });
 
-// onRenderTracked((e)=>{
-// console.log(e)
-// });
-// onRenderTracked((e)=>{
-// console.log(e)
-// });
-
 watch(
-    () => [props.data, store],
+    () => props.data,
     () => {
-        // store.skip = 0;
         store.data = props.data;
-        if (store.pagination) paginate();
     }
 );
 
-// watch(
-//     () => route.path,
-//     async (newId, oldId) => {
-//         if (newId!==oldId) {
-//             // arrayData.hasMoreData.value = [];
-//             arrayData.store.clear()
-//                         }
-//         }
-//     );
-
 async function fetch() {
     await arrayData.fetch({ append: false });
     if (!arrayData.hasMoreData.value) {
@@ -129,14 +101,11 @@ async function paginate() {
     if (!props.url) return;
 
     isLoading.value = true;
-    // infiniteScrollRef.value.resume()
     await arrayData.loadMore();
 
     if (!arrayData.hasMoreData.value) {
-        // infiniteScrollRef.value.resume()
         if (store.userParamsChanged) arrayData.hasMoreData.value = true;
         store.userParamsChanged = false;
-
         isLoading.value = false;
         return;
     }
@@ -154,7 +123,6 @@ async function paginate() {
 }
 
 async function onLoad(...params) {
-    console.log('ENTRA');
     if (!store.data) return;
 
     const done = params[1];
@@ -165,13 +133,6 @@ async function onLoad(...params) {
     await paginate();
     let isDone = false;
     if (store.userParamsChanged) isDone = !arrayData.hasMoreData.value;
-    // console.error('isDone', isDone);
-    // if(isDone){
-    //     // infiniteScrollRef.value.trigger()
-    //     console.error('VnPaginate', isDone, arrayData.store.pagination)
-
-    // }
-    // done(false);
     done(isDone);
 }
 </script>
@@ -210,7 +171,6 @@ async function onLoad(...params) {
         </div>
     </div>
     <QInfiniteScroll
-        ref="infiniteScrollRef"
         v-if="store.data"
         @load="onLoad"
         :offset="offset"
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index b0ba5a836..3f031f1d1 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -98,17 +98,8 @@ export function useArrayData(key, userOptions) {
 
         const { limit } = filter;
 
-        /*if (Object.keys(store.userParams).length > 0) {
-            hasMoreData.value = true;
-        } else if(store.userParamsChanged){
-            hasMoreData.value = false;
-        }
-        else */hasMoreData.value = response.data.length === limit;
-        // if (store.pagination) {
-        //     console.error('Before-ArrayData', store.pagination, hasMoreData.value)
-        //     hasMoreData.value = true;
-        //     console.error('After-ArrayData', store.pagination, hasMoreData.value)
-        // }
+        hasMoreData.value = response.data.length === limit;
+
         if (append) {
             if (!store.data) store.data = [];
             for (const row of response.data) store.data.push(row);
@@ -153,18 +144,7 @@ export function useArrayData(key, userOptions) {
         store.userParams = userParams;
         store.skip = 0;
         store.filter.skip = 0;
-        await fetch({ append: false, loadMore: true });
-        return { filter, params };
-    }
-    async function removeFilter({ filter, params }) {
-        if (filter) store.userFilter = Object.assign(store.userFilter, filter);
-
-        let userParams = Object.assign({}, store.userParams, params);
-        userParams = sanitizerParams(userParams, store?.exprBuilder);
-
-        store.userParams = userParams;
-        store.skip = 0;
-        await loadMore({ append: false });
+        await fetch({ append: false });
         return { filter, params };
     }
 
@@ -188,7 +168,6 @@ export function useArrayData(key, userOptions) {
 
     async function loadMore() {
         if (!hasMoreData.value) return;
-        console.error('loadMore', hasMoreData.value);
 
         store.skip = store.limit * page.value;
         page.value += 1;
@@ -207,7 +186,7 @@ export function useArrayData(key, userOptions) {
         if (store.skip) query.skip = store.skip;
         if (store.userParams && Object.keys(store.userParams).length !== 0)
             query.params = JSON.stringify(store.userParams);
-        // hasMoreData.value = true;
+
         if (router)
             router.replace({
                 path: route.path,
@@ -222,7 +201,6 @@ export function useArrayData(key, userOptions) {
         fetch,
         applyFilter,
         addFilter,
-        removeFilter,
         refresh,
         destroy,
         loadMore,
diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index 35ecb0451..eeaffc85a 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -30,7 +30,7 @@ const body = {
 </script>
 <template>
     <div class="column items-center">
-        <VnNotes
+        <VnNotes style="overflow-y: scroll;"
             :add-note="$props.addNote"
             :id="id"
             url="claimObservations"
diff --git a/src/stores/useArrayDataStore.js b/src/stores/useArrayDataStore.js
index c8cd349e0..805e8bc53 100644
--- a/src/stores/useArrayDataStore.js
+++ b/src/stores/useArrayDataStore.js
@@ -19,8 +19,6 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
             order: '',
             data: ref(),
             isLoading: false,
-            loadMore: false,
-            pagination: false,
             userParamsChanged: true,
             exprBuilder: null,
         };

From 4d0a552dbf44dc728f7cbe34c53f9d964be53434 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 16 Jan 2024 12:15:08 +0100
Subject: [PATCH 036/111] refs #6704 test: fix

---
 test/vitest/__tests__/components/Paginate.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/vitest/__tests__/components/Paginate.spec.js b/test/vitest/__tests__/components/Paginate.spec.js
index af9fb41a1..2a22ce438 100644
--- a/test/vitest/__tests__/components/Paginate.spec.js
+++ b/test/vitest/__tests__/components/Paginate.spec.js
@@ -119,7 +119,7 @@ describe('VnPaginate', () => {
             await vm.onLoad(index, done);
 
             expect(vm.pagination.page).toEqual(2);
-            expect(done).toHaveBeenCalledWith(true);
+            expect(done).toHaveBeenCalledWith(false);
         });
     });
 });

From 7a7622023cd5abcb98717068944b63703e46ce2d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 17 Jan 2024 08:29:51 +0100
Subject: [PATCH 037/111] refs #6694 perf: remove unnecessary api calls

---
 src/pages/Customer/CustomerCreate.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 3afda7fac..b20554ee9 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -51,18 +51,18 @@ function handleLocation(data, { city, postcode, provinceFk, countryFk }) {
         auto-load
         url="Workers/search?departmentCodes"
     />
-    <FetchData
+    <!-- <FetchData
         ref="postcodeFetchDataRef"
         url="Postcodes/location"
         @on-fetch="(data) => (postcodesOptions = data)"
         auto-load
-    />
+    /> -->
     <FetchData
         @on-fetch="(data) => (businessTypesOptions = data)"
         auto-load
         url="BusinessTypes"
     />
-    <FetchData
+    <!-- <FetchData
         @on-fetch="(data) => (citiesLocationOptions = data)"
         auto-load
         url="Towns/location"
@@ -76,7 +76,7 @@ function handleLocation(data, { city, postcode, provinceFk, countryFk }) {
         @on-fetch="(data) => (countriesOptions = data)"
         auto-load
         url="Countries"
-    />
+    />-->
     <QPage>
         <VnSubToolbar />
         <FormModel

From c0005c0544deb57c6004f1b3a62d154b73356efa Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 17 Jan 2024 08:30:05 +0100
Subject: [PATCH 038/111] refs #6694 perf: add function for optionLabel

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

diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index c197f17ea..5b91caa1a 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -13,7 +13,7 @@ const $props = defineProps({
         default: () => [],
     },
     optionLabel: {
-        type: String,
+        type: [String, Function],
         default: '',
     },
     filterOptions: {

From 817a4e9e3f8ccb58a07e6f00d6e432e49c3a1592 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 17 Jan 2024 08:30:23 +0100
Subject: [PATCH 039/111] refs #6694 feat call new method for filter

---
 src/components/common/VnLocation.vue | 88 ++++++++++++++++++++--------
 1 file changed, 63 insertions(+), 25 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index e91c78430..db6f49469 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -7,11 +7,12 @@ const emit = defineEmits(['update:modelValue', 'update:options']);
 import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
-const citiesLocationOptions = ref([]);
-const provincesLocationOptions = ref([]);
-const countriesOptions = ref([]);
+// const citiesLocationOptions = ref([]);
+// const provincesLocationOptions = ref([]);
+// const countriesOptions = ref([]);
+// const townsRef = ref([]);
 const postcodesOptions = ref([]);
-const postcodeFetchDataRef = ref(null);
+const postcodesRef = ref(null);
 
 const $props = defineProps({
     modelValue: {
@@ -66,25 +67,61 @@ watch(options, (newValue) => {
     setOptions(newValue);
 });
 
-function showLabel(data){
-    return `${data.code} - ${data.town.name}(${data.town.province.name}), ${data.town.province.country.country}`;
+function showLabel(data) {
+       return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
 
-</script>
+function locationFilter(value) {
+    // if(value==='') return [];
+    let where = { limit: 30 };
+    const params = { value };
+    postcodesRef.value.fetch({ where: Object.assign(where, params) });
+//     postcodesRef.value.fetch({
+//   where: {
+//     or: [
+//       { code: { like: '%4660%' } },
+//       { 'town.name': { like: '%Alz%' } }
+//     ]
+//   }});
+    // const townParams = { name: { like: `%${val}%` } };
 
-<template>
-    <FetchData
-        ref="postcodeFetchDataRef"
-        url="Postcodes/location"
-        @on-fetch="(data) => (postcodesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        @on-fetch="(data) => (citiesLocationOptions = data)"
+    // townsRef.value.fetch({ where: Object.assign(where, townParams) });
+}
+function handleFetch( data) {
+//     if (from === 'towns') {
+//         data = data.reduce((acc, town) => {
+//             for (const postcode of town.postcodes) {
+//                 console.log(postcode);
+//                 acc.push({ ...postcode, town:{name: town.name, province: town.province} });
+//             }
+
+//             return acc;
+//         }, []);
+//     }
+//     console.log(from, data);
+     postcodesOptions.value = data;
+}
+</script>
+<!-- let where = { limit: 30 };
+
+const params = { 'town': false, 'townsFk': {like: ``}  };
+where = Object.assign(where, params);
+postcodesRef.value.fetch({ where});
+} -->
+<!-- <FetchData
+        ref="townsRef"
+        @on-fetch="(data) => handleFetch('towns', data)"
         auto-load
         url="Towns/location"
-    />
+    /> -->
+<template>
     <FetchData
+        ref="postcodesRef"
+        url="Postcodes/filter"
+        @on-fetch="(data) =>handleFetch(data)"
+        auto-load
+    />
+    <!--  <FetchData
         @on-fetch="(data) => (provincesLocationOptions = data)"
         auto-load
         url="Provinces/location"
@@ -93,23 +130,26 @@ function showLabel(data){
         @on-fetch="(data) => (countriesOptions = data)"
         auto-load
         url="Countries"
-    />
+    /> -->
+    <!-- :filter-options="['code','town.name']"
+    :filter-rules="['val.length>2']" -->
     <VnSelectCreate
+        v-if="postcodesRef"
         v-model="value"
         :options="postcodesOptions"
         :label="t('Location')"
         :option-label="showLabel"
-        :placeholder="t('Search by postalCode or town (at least 3 characters')"
+        :placeholder="t('Search by postalCode, town, province or country')"
         v-bind="$attrs"
         emit-value
         map-options
         use-input
-        :filter-options="['code','town.name']"
-        :filter-rules="['val.length>2']"
         clearable
         hide-selected
         fill-input
         :class="{ required: $attrs.required }"
+        @input-value="locationFilter"
+        :default-filter="false"
     >
         <template #form>
             <CreateNewPostcode @on-data-saved="onPostcodeCreated($event)" />
@@ -118,9 +158,7 @@ function showLabel(data){
             <QItem v-bind="scope.itemProps">
                 <QItemSection v-if="scope.opt">
                     <QItemLabel>{{ scope.opt.code }}</QItemLabel>
-                    <QItemLabel caption
-                        >{{ showLabel(scope.opt)}}</QItemLabel
-                    >
+                    <QItemLabel caption>{{ showLabel(scope.opt) }}</QItemLabel>
                 </QItemSection>
             </QItem>
         </template>
@@ -137,5 +175,5 @@ function showLabel(data){
 <i18n>
 es:
     Location: Ubicación
-    Search by postalCode or town (at least 3 characters): Buscar por código postal o nombre ( al menos 3 letras)
+    Search by postalCode, town, province or country: Buscar por código postal, ciudad o país
 </i18n>

From d8e7f3acaa3b4b2ea6fcb190225f96c4e6d5a236 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 17 Jan 2024 08:31:28 +0100
Subject: [PATCH 040/111] refs #6694 perf: remove comments

---
 src/components/common/VnLocation.vue | 50 ----------------------------
 1 file changed, 50 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index db6f49469..b321b731a 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -7,10 +7,6 @@ const emit = defineEmits(['update:modelValue', 'update:options']);
 import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
-// const citiesLocationOptions = ref([]);
-// const provincesLocationOptions = ref([]);
-// const countriesOptions = ref([]);
-// const townsRef = ref([]);
 const postcodesOptions = ref([]);
 const postcodesRef = ref(null);
 
@@ -72,48 +68,14 @@ function showLabel(data) {
 }
 
 function locationFilter(value) {
-    // if(value==='') return [];
     let where = { limit: 30 };
     const params = { value };
     postcodesRef.value.fetch({ where: Object.assign(where, params) });
-//     postcodesRef.value.fetch({
-//   where: {
-//     or: [
-//       { code: { like: '%4660%' } },
-//       { 'town.name': { like: '%Alz%' } }
-//     ]
-//   }});
-    // const townParams = { name: { like: `%${val}%` } };
-
-    // townsRef.value.fetch({ where: Object.assign(where, townParams) });
 }
 function handleFetch( data) {
-//     if (from === 'towns') {
-//         data = data.reduce((acc, town) => {
-//             for (const postcode of town.postcodes) {
-//                 console.log(postcode);
-//                 acc.push({ ...postcode, town:{name: town.name, province: town.province} });
-//             }
-
-//             return acc;
-//         }, []);
-//     }
-//     console.log(from, data);
      postcodesOptions.value = data;
 }
 </script>
-<!-- let where = { limit: 30 };
-
-const params = { 'town': false, 'townsFk': {like: ``}  };
-where = Object.assign(where, params);
-postcodesRef.value.fetch({ where});
-} -->
-<!-- <FetchData
-        ref="townsRef"
-        @on-fetch="(data) => handleFetch('towns', data)"
-        auto-load
-        url="Towns/location"
-    /> -->
 <template>
     <FetchData
         ref="postcodesRef"
@@ -121,18 +83,6 @@ postcodesRef.value.fetch({ where});
         @on-fetch="(data) =>handleFetch(data)"
         auto-load
     />
-    <!--  <FetchData
-        @on-fetch="(data) => (provincesLocationOptions = data)"
-        auto-load
-        url="Provinces/location"
-    />
-    <FetchData
-        @on-fetch="(data) => (countriesOptions = data)"
-        auto-load
-        url="Countries"
-    /> -->
-    <!-- :filter-options="['code','town.name']"
-    :filter-rules="['val.length>2']" -->
     <VnSelectCreate
         v-if="postcodesRef"
         v-model="value"

From c584eaf72363ac27bc919a60727287f6650bd91b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 17 Jan 2024 14:59:16 +0100
Subject: [PATCH 041/111] refs #6694 feat change request params filters

---
 src/components/common/VnLocation.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index b321b731a..add5ff19b 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -67,10 +67,10 @@ function showLabel(data) {
        return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
 
-function locationFilter(value) {
+function locationFilter(search) {
     let where = { limit: 30 };
-    const params = { value };
-    postcodesRef.value.fetch({ where: Object.assign(where, params) });
+    const params = { search };
+    postcodesRef.value.fetch({ where, args: params });
 }
 function handleFetch( data) {
      postcodesOptions.value = data;

From 655c8210751f819ad4aff1480f94e57f73e22931 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 17 Jan 2024 15:01:31 +0100
Subject: [PATCH 042/111] refs #6694 feat input-debounce

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

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index add5ff19b..072b08094 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -100,6 +100,7 @@ function handleFetch( data) {
         :class="{ required: $attrs.required }"
         @input-value="locationFilter"
         :default-filter="false"
+        :input-debounce="100"
     >
         <template #form>
             <CreateNewPostcode @on-data-saved="onPostcodeCreated($event)" />

From 0e506910327d341f9bd7bb762afd8c3f739a32b3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 18 Jan 2024 07:32:04 +0100
Subject: [PATCH 043/111] refs #6694 perf: order VnLocation attrs

---
 src/components/common/VnLocation.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 072b08094..82dfd6d53 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -90,6 +90,10 @@ function handleFetch( data) {
         :label="t('Location')"
         :option-label="showLabel"
         :placeholder="t('Search by postalCode, town, province or country')"
+        @input-value="locationFilter"
+        :default-filter="false"
+        :input-debounce="100"
+        :class="{ required: $attrs.required }"
         v-bind="$attrs"
         emit-value
         map-options
@@ -97,19 +101,15 @@ function handleFetch( data) {
         clearable
         hide-selected
         fill-input
-        :class="{ required: $attrs.required }"
-        @input-value="locationFilter"
-        :default-filter="false"
-        :input-debounce="100"
     >
         <template #form>
             <CreateNewPostcode @on-data-saved="onPostcodeCreated($event)" />
         </template>
-        <template #option="scope">
-            <QItem v-bind="scope.itemProps">
-                <QItemSection v-if="scope.opt">
-                    <QItemLabel>{{ scope.opt.code }}</QItemLabel>
-                    <QItemLabel caption>{{ showLabel(scope.opt) }}</QItemLabel>
+        <template #option="{itemProps, opt}">
+            <QItem v-bind="itemProps">
+                <QItemSection v-if="opt">
+                    <QItemLabel>{{ opt.code }}</QItemLabel>
+                    <QItemLabel caption>{{ showLabel(opt) }}</QItemLabel>
                 </QItemSection>
             </QItem>
         </template>

From 4e1f4a184608b8cbb68e043744dd01af7a477b93 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 18 Jan 2024 07:32:24 +0100
Subject: [PATCH 044/111] add new rule for eslintrc.js

---
 .eslintrc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index c8bdecb1a..1d09a896f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -58,7 +58,7 @@ module.exports = {
     rules: {
         'prefer-promise-reject-errors': 'off',
         'no-unused-vars': 'warn',
-
+        "vue/no-multiple-template-root": "off" ,
         // allow debugger during development only
         'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     },

From 94fb073d3f280cd2a1f0a16974d789ad03c7a3e9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 18 Jan 2024 07:43:00 +0100
Subject: [PATCH 045/111] refs #6694 perf: remove comments

---
 src/pages/Customer/CustomerCreate.vue | 25 -------------------------
 1 file changed, 25 deletions(-)

diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index b20554ee9..4ce4b4520 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -28,12 +28,8 @@ const newClientForm = reactive({
     isEqualizated: false,
 });
 
-const postcodeFetchDataRef = ref(null);
 const workersOptions = ref([]);
 const businessTypesOptions = ref([]);
-const citiesLocationOptions = ref([]);
-const provincesLocationOptions = ref([]);
-const countriesOptions = ref([]);
 const postcodesOptions = ref([]);
 
 
@@ -51,32 +47,11 @@ function handleLocation(data, { city, postcode, provinceFk, countryFk }) {
         auto-load
         url="Workers/search?departmentCodes"
     />
-    <!-- <FetchData
-        ref="postcodeFetchDataRef"
-        url="Postcodes/location"
-        @on-fetch="(data) => (postcodesOptions = data)"
-        auto-load
-    /> -->
     <FetchData
         @on-fetch="(data) => (businessTypesOptions = data)"
         auto-load
         url="BusinessTypes"
     />
-    <!-- <FetchData
-        @on-fetch="(data) => (citiesLocationOptions = data)"
-        auto-load
-        url="Towns/location"
-    />
-    <FetchData
-        @on-fetch="(data) => (provincesLocationOptions = data)"
-        auto-load
-        url="Provinces/location"
-    />
-    <FetchData
-        @on-fetch="(data) => (countriesOptions = data)"
-        auto-load
-        url="Countries"
-    />-->
     <QPage>
         <VnSubToolbar />
         <FormModel

From 4e66f3c65d85b3a058620d4a695d32494203bc79 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 18 Jan 2024 07:43:30 +0100
Subject: [PATCH 046/111] refs #6694 feat: handle when postcodecreated

---
 src/components/common/VnLocation.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 82dfd6d53..d650211ad 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -73,8 +73,11 @@ function locationFilter(search) {
     postcodesRef.value.fetch({ where, args: params });
 }
 function handleFetch( data) {
-     postcodesOptions.value = data;
+    postcodesOptions.value = data;
 }
+async function onPostcodeCreated(){
+    postcodesRef.value.fetch();
+};
 </script>
 <template>
     <FetchData

From c38e76de88eea9f49ccad3dcad6a1d05b57a5abc Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 18 Jan 2024 07:45:17 +0100
Subject: [PATCH 047/111] refs #6694 feat: use VnLocation for WorkerCreate

---
 src/components/common/VnLocation.vue |   2 +-
 src/pages/Worker/WorkerCreate.vue    | 114 ++++-----------------------
 2 files changed, 17 insertions(+), 99 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index d650211ad..6720e3920 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -129,5 +129,5 @@ async function onPostcodeCreated(){
 <i18n>
 es:
     Location: Ubicación
-    Search by postalCode, town, province or country: Buscar por código postal, ciudad o país
+    Search by postalcode, town, province or country: Buscar por código postal, ciudad o país
 </i18n>
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index accac7cf2..667111c6a 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -9,7 +9,7 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
-import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+import VnLocation from 'src/components/common/VnLocation.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
@@ -21,14 +21,6 @@ const workerConfigFilter = {
     field: ['payMethodFk'],
 };
 
-const provincesFilter = {
-    fields: ['id', 'name', 'countryFk'],
-};
-
-const townsFilter = {
-    fields: ['id', 'name', 'provinceFk'],
-};
-
 const newWorkerForm = ref({
     companyFk: null,
     payMethodFk: null,
@@ -49,9 +41,6 @@ const newWorkerForm = ref({
     bankEntityFk: null,
 });
 
-const postcodeFetchDataRef = ref(null);
-const provincesOptions = ref([]);
-const townsOptions = ref([]);
 const companiesOptions = ref([]);
 const workersOptions = ref([]);
 const payMethodsOptions = ref([]);
@@ -66,9 +55,13 @@ const onBankEntityCreated = (data) => {
     bankEntitiesOptions.value.push(data);
 };
 
-const onPostcodeCreated = async () => {
-    postcodeFetchDataRef.value.fetch();
-};
+
+function handleLocation(data, { city, postcode, provinceFk, countryFk }) {
+    data.postcode = postcode;
+    data.city = city;
+    data.provinceFk = provinceFk;
+    data.countryFk = countryFk;
+}
 
 onMounted(async () => {
     const userInfo = await useUserConfig().fetch();
@@ -83,24 +76,7 @@ onMounted(async () => {
         :filter="workerConfigFilter"
         auto-load
     />
-    <FetchData
-        ref="postcodeFetchDataRef"
-        url="Postcodes/location"
-        @on-fetch="(data) => (postcodesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Provinces/location"
-        @on-fetch="(data) => (provincesOptions = data)"
-        :filter="provincesFilter"
-        auto-load
-    />
-    <FetchData
-        url="Towns/location"
-        @on-fetch="(data) => (townsOptions = data)"
-        :filter="townsFilter"
-        auto-load
-    />
+
     <FetchData
         url="Companies"
         @on-fetch="(data) => (companiesOptions = data)"
@@ -178,77 +154,19 @@ onMounted(async () => {
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
-                        <VnSelectCreate
-                            v-model="data.postcode"
-                            :label="t('worker.create.postcode')"
+                        <VnLocation
                             :rules="validate('Worker.postcode')"
                             :roles-allowed-to-create="['deliveryAssistant']"
                             :options="postcodesOptions"
-                            option-label="code"
-                            option-value="code"
-                            hide-selected
-                        >
-                            <template #form>
-                                <CustomerCreateNewPostcode
-                                    @on-data-saved="onPostcodeCreated($event)"
-                                />
-                            </template>
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection v-if="scope.opt">
-                                        <QItemLabel>{{ scope.opt.code }}</QItemLabel>
-                                        <QItemLabel caption
-                                            >{{ scope.opt.code }} -
-                                            {{ scope.opt.town.name }} ({{
-                                                scope.opt.town.province.name
-                                            }},
-                                            {{
-                                                scope.opt.town.province.country.country
-                                            }})</QItemLabel
-                                        >
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectCreate>
-                    </div>
-                    <div class="col">
-                        <VnSelectFilter
-                            :label="t('worker.create.province')"
-                            v-model="data.provinceFk"
-                            :options="provincesOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            :rules="validate('Worker.provinceFk')"
-                        />
+                            v-model="data.location"
+                            @update:model-value="
+                                    (location) => handleLocation(data, location)
+                                    "
+                            >
+                        </VnLocation>
                     </div>
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
-                    <div class="col">
-                        <VnSelectFilter
-                            :label="t('worker.create.city')"
-                            v-model="data.city"
-                            :options="townsOptions"
-                            option-value="name"
-                            option-label="name"
-                            hide-selected
-                            :rules="validate('Worker.city')"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ scope.opt.name }}</QItemLabel>
-                                        <QItemLabel caption
-                                            >{{ scope.opt.name }},
-                                            {{ scope.opt.province.name }} ({{
-                                                scope.opt.province.country.country
-                                            }})</QItemLabel
-                                        >
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectFilter>
-                    </div>
                     <div class="col">
                         <VnInput
                             :label="t('worker.create.street')"

From 339d6609aacbc3aa0bec3582db435576c99c8727 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 18 Jan 2024 13:33:14 +0100
Subject: [PATCH 048/111] refs #6339 clipboard

---
 src/components/ui/VnLv.vue                    | 25 +++++++++++++++++++
 src/i18n/en/index.js                          |  3 +++
 src/i18n/es/index.js                          |  3 +++
 src/pages/Customer/Card/CustomerSummary.vue   |  2 +-
 .../Department/Card/DepartmentDescriptor.vue  |  6 ++---
 src/pages/Worker/Card/WorkerDescriptor.vue    |  2 +-
 src/pages/Worker/Card/WorkerSummary.vue       |  2 +-
 7 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue
index 665404afc..6edfb8526 100644
--- a/src/components/ui/VnLv.vue
+++ b/src/components/ui/VnLv.vue
@@ -1,6 +1,8 @@
 <script setup>
 import { computed } from 'vue';
 import { dashIfEmpty } from 'src/filters';
+import { useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
 
 const $props = defineProps({
     label: { type: String, default: null },
@@ -10,8 +12,20 @@ const $props = defineProps({
     },
     info: { type: String, default: null },
     dash: { type: Boolean, default: true },
+    copy: { type: Boolean, default: false },
 });
+const { t } = useI18n();
 const isBooleanValue = computed(() => typeof $props.value === 'boolean');
+const quasar = useQuasar();
+function copyText() {
+    navigator.clipboard.writeText($props.value);
+    quasar.notify({
+        type: 'positive',
+        message: t('components.VnLv.copyText', {
+            copyValue: $props.value,
+        }),
+    });
+}
 </script>
 <style scoped>
 .label,
@@ -48,5 +62,16 @@ const isBooleanValue = computed(() => typeof $props.value === 'boolean');
                 </QTooltip>
             </QIcon>
         </div>
+        <div class="copy" v-if="$props.copy && $props.value" @click="copyText()">
+            <QIcon name="Content_Copy" color="primary" />
+        </div>
     </div>
 </template>
+
+<style lang="scss" scoped>
+.copy {
+    &:hover {
+        cursor: pointer;
+    }
+}
+</style>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 139977e32..0f380a968 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -936,5 +936,8 @@ export default {
             addToPinned: 'Add to pinned',
             removeFromPinned: 'Remove from pinned',
         },
+        VnLv: {
+            copyText: '{copyValue} has been copied to the clipboard',
+        },
     },
 };
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 43f624cb3..b145958de 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -935,5 +935,8 @@ export default {
             addToPinned: 'Añadir a fijados',
             removeFromPinned: 'Eliminar de fijados',
         },
+        VnLv: {
+            copyText: '{copyValue} se ha copiado al portapepeles',
+        },
     },
 };
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 4ebd6efab..c46b8a8de 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -81,7 +81,7 @@ const creditWarning = computed(() => {
                         <VnLinkPhone :phone-number="entity.mobile" />
                     </template>
                 </VnLv>
-                <VnLv :label="t('customer.summary.email')" :value="entity.email" />
+                <VnLv :label="t('customer.summary.email')" :value="entity.email" copy />
                 <VnLv
                     :label="t('customer.summary.salesPerson')"
                     :value="entity?.salesPersonUser?.name"
diff --git a/src/pages/Department/Card/DepartmentDescriptor.vue b/src/pages/Department/Card/DepartmentDescriptor.vue
index 1f7e6dcbb..bd96812c9 100644
--- a/src/pages/Department/Card/DepartmentDescriptor.vue
+++ b/src/pages/Department/Card/DepartmentDescriptor.vue
@@ -90,17 +90,15 @@ const removeDepartment = () => {
             </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('department.chat')" :value="entity.chatName" dash />
-            <VnLv :label="t('department.email')" :value="entity.notificationEmail" dash />
+            <VnLv :label="t('department.chat')" :value="entity.chatName" />
+            <VnLv :label="t('department.email')" :value="entity.notificationEmail" copy />
             <VnLv
                 :label="t('department.selfConsumptionCustomer')"
                 :value="entity.client?.name"
-                dash
             />
             <VnLv
                 :label="t('department.bossDepartment')"
                 :value="entity.worker?.user?.name"
-                dash
             />
         </template>
         <template #actions>
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index f089c0022..bec56bee7 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -101,7 +101,7 @@ const setData = (entity) => {
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('worker.card.name')" :value="entity.user?.nickname" />
-            <VnLv :label="t('worker.card.email')" :value="entity.user?.email"> </VnLv>
+            <VnLv :label="t('worker.card.email')" :value="entity.user?.email" copy />
             <VnLv
                 :label="t('worker.list.department')"
                 :value="entity.department ? entity.department.department.name : null"
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 26328b9cd..176d9adf4 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -80,7 +80,7 @@ const filter = {
                     :label="t('worker.list.department')"
                     :value="worker.department.department.name"
                 />
-                <VnLv :label="t('worker.list.email')" :value="worker.user.email" />
+                <VnLv :label="t('worker.list.email')" :value="worker.user.email" copy />
                 <VnLv :label="t('worker.summary.boss')" link>
                     <template #value>
                         <VnUserLink

From 259902a7ea9c7cd57cde572a791a66296f05e3b4 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 18 Jan 2024 14:59:51 +0100
Subject: [PATCH 049/111] refs #6339 composable

---
 src/components/UserPanel.vue    | 36 ++++++++++++++++-----------------
 src/components/ui/VnLv.vue      | 20 +++++++++---------
 src/composables/useClipboard.js | 17 ++++++++++++++++
 3 files changed, 44 insertions(+), 29 deletions(-)
 create mode 100644 src/composables/useClipboard.js

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index f512ac4c4..e0b6b86ed 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -1,19 +1,19 @@
 <script setup>
 import { onMounted, computed } from 'vue';
-import { Dark, Quasar, useQuasar } from 'quasar';
+import { Dark, Quasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import axios from 'axios';
 import { useState } from 'src/composables/useState';
 import { useSession } from 'src/composables/useSession';
-import { localeEquivalence } from "src/i18n/index";
+import { localeEquivalence } from 'src/i18n/index';
 
 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
-const quasar = useQuasar();
-
+import { useClipboard } from 'src/composables/useClipboard';
+const { copyText } = useClipboard();
 const userLocale = computed({
     get() {
         return locale.value;
@@ -21,14 +21,14 @@ const userLocale = computed({
     set(value) {
         locale.value = value;
 
-        value = localeEquivalence[value] ?? value
+        value = localeEquivalence[value] ?? value;
 
         try {
             /* @vite-ignore */
             import(`../../node_modules/quasar/lang/${value}.mjs`).then((lang) => {
                 Quasar.lang.set(lang.default);
             });
-       } catch (error) {
+        } catch (error) {
             //
         }
     },
@@ -81,12 +81,8 @@ function logout() {
     router.push('/login');
 }
 
-function copyUserToken(){
-    navigator.clipboard.writeText(session.getToken());
-    quasar.notify({
-        type: 'positive',
-        message: t('components.userPanel.copyToken'),
-    });
+function copyUserToken() {
+    copyText(session.getToken(), { label: 'components.userPanel.copyToken' });
 }
 </script>
 
@@ -129,8 +125,12 @@ function copyUserToken(){
                 <div class="text-subtitle1 q-mt-md">
                     <strong>{{ user.nickname }}</strong>
                 </div>
-                <div class="text-subtitle3 text-grey-7 q-mb-xs copyUserToken" @click="copyUserToken()" >@{{ user.name }}
-            </div>
+                <div
+                    class="text-subtitle3 text-grey-7 q-mb-xs copyText"
+                    @click="copyUserToken()"
+                >
+                    @{{ user.name }}
+                </div>
 
                 <QBtn
                     id="logout"
@@ -152,9 +152,9 @@ function copyUserToken(){
     width: 150px;
 }
 
-.copyUserToken {
-   &:hover{
-    cursor: alias;
-   }
+.copyText {
+    &:hover {
+        cursor: alias;
+    }
 }
 </style>
diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue
index 6edfb8526..0e4a055eb 100644
--- a/src/components/ui/VnLv.vue
+++ b/src/components/ui/VnLv.vue
@@ -1,9 +1,8 @@
 <script setup>
 import { computed } from 'vue';
 import { dashIfEmpty } from 'src/filters';
-import { useQuasar } from 'quasar';
-import { useI18n } from 'vue-i18n';
 
+import { useClipboard } from 'src/composables/useClipboard';
 const $props = defineProps({
     label: { type: String, default: null },
     value: {
@@ -14,16 +13,15 @@ const $props = defineProps({
     dash: { type: Boolean, default: true },
     copy: { type: Boolean, default: false },
 });
-const { t } = useI18n();
 const isBooleanValue = computed(() => typeof $props.value === 'boolean');
-const quasar = useQuasar();
-function copyText() {
-    navigator.clipboard.writeText($props.value);
-    quasar.notify({
-        type: 'positive',
-        message: t('components.VnLv.copyText', {
+
+const { copyText } = useClipboard();
+
+function copyValueText() {
+    copyText($props.value, {
+        component: {
             copyValue: $props.value,
-        }),
+        },
     });
 }
 </script>
@@ -62,7 +60,7 @@ function copyText() {
                 </QTooltip>
             </QIcon>
         </div>
-        <div class="copy" v-if="$props.copy && $props.value" @click="copyText()">
+        <div class="copy" v-if="$props.copy && $props.value" @click="copyValueText()">
             <QIcon name="Content_Copy" color="primary" />
         </div>
     </div>
diff --git a/src/composables/useClipboard.js b/src/composables/useClipboard.js
new file mode 100644
index 000000000..008c24fa1
--- /dev/null
+++ b/src/composables/useClipboard.js
@@ -0,0 +1,17 @@
+import { useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
+
+export function useClipboard() {
+    const quasar = useQuasar();
+    const { t } = useI18n();
+    /**
+     *
+     * @param {String} value Value to send to clipboardAPI
+     * @param {Object} {label, component} Refer to Quasar notify configuration. Label is the text to translate
+     */
+    function copyText(value, { label = 'components.VnLv.copyText', component = {} }) {
+        navigator.clipboard.writeText(value);
+        quasar.notify({ type: 'positive', message: t(label, component) });
+    }
+    return { copyText };
+}

From b3fc865c18f07a43d3b73baf735203e5400f7308 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 18 Jan 2024 15:45:44 +0100
Subject: [PATCH 050/111] refs #6718 fix: useArrayDataStore

---
 src/stores/useArrayDataStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/useArrayDataStore.js b/src/stores/useArrayDataStore.js
index 805e8bc53..115c161dd 100644
--- a/src/stores/useArrayDataStore.js
+++ b/src/stores/useArrayDataStore.js
@@ -19,7 +19,7 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
             order: '',
             data: ref(),
             isLoading: false,
-            userParamsChanged: true,
+            userParamsChanged: false,
             exprBuilder: null,
         };
     }

From b226e59228086363d0e4b7fcd361597dd80c0876 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 22 Jan 2024 11:39:13 +0100
Subject: [PATCH 051/111] refs #6339 tests

---
 src/i18n/en/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 0f380a968..93672d10e 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -913,6 +913,7 @@ export default {
             totalEntries: 'Total entries',
         },
     },
+
     components: {
         topbar: {},
         userPanel: {

From 0df15b2d8898e02c7830e4af1d528cfce68c48c3 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 22 Jan 2024 12:45:07 +0100
Subject: [PATCH 052/111] refs #6733 remove alert

---
 src/components/FormModel.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index a5560dfc0..405b895e7 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -176,13 +176,6 @@ watch(formUrl, async () => {
 });
 </script>
 <template>
-    <QBanner
-        v-if="$props.observeFormChanges && hasChanges"
-        class="text-white bg-warning full-width"
-    >
-        <QIcon name="warning" size="md" class="q-mr-md" />
-        <span>{{ t('globals.changesToSave') }}</span>
-    </QBanner>
     <div class="column items-center full-width">
         <QForm
             v-if="formData"

From 676b178892cc1e7d000b6f276060b3b48350f703 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 22 Jan 2024 14:24:01 +0100
Subject: [PATCH 053/111] refs #6655 remove clickStop

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

diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index df9af4743..a11e1e886 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -87,7 +87,7 @@ function viewSummary(id) {
                         v-for="row of rows"
                     >
                         <template #list-items>
-                            <VnLv :label="t('claim.list.customer')" @click.stop>
+                            <VnLv :label="t('claim.list.customer')">
                                 <template #value>
                                     <span class="link" @click.stop>
                                         {{ row.clientName }}

From 6809e9bddb37ba812c3e56a8f62f3beb255a051d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 23 Jan 2024 11:27:13 +0100
Subject: [PATCH 054/111] refs #6280 perf: same value as searchDelay in salix

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

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 6720e3920..827afe9ca 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -95,7 +95,7 @@ async function onPostcodeCreated(){
         :placeholder="t('Search by postalCode, town, province or country')"
         @input-value="locationFilter"
         :default-filter="false"
-        :input-debounce="100"
+        :input-debounce="300"
         :class="{ required: $attrs.required }"
         v-bind="$attrs"
         emit-value

From 5d888a29778f04d264352cfae6d97f98f5442c4d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 23 Jan 2024 11:33:34 +0100
Subject: [PATCH 055/111] refs #6280 perf: remove deepFind unused code

---
 src/components/common/VnSelectFilter.vue |  3 +--
 src/composables/deepFind.js              | 14 --------------
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 src/composables/deepFind.js

diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 5b91caa1a..a7ac4a7cd 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -1,5 +1,4 @@
 <script setup>
-import { deepFind } from 'src/composables/deepFind';
 import { ref, toRefs, computed, watch } from 'vue';
 const emit = defineEmits(['update:modelValue', 'update:options']);
 
@@ -69,7 +68,7 @@ const filter = (val, options) => {
     return options.filter((row) => {
         if ($props.filterOptions.length) {
             return $props.filterOptions.some((prop) => {
-                const propValue = String(deepFind(row,prop)).toLowerCase();
+                const propValue = String(row[prop]).toLowerCase();
                 return propValue.includes(search);
             });
         }
diff --git a/src/composables/deepFind.js b/src/composables/deepFind.js
deleted file mode 100644
index ec28fe387..000000000
--- a/src/composables/deepFind.js
+++ /dev/null
@@ -1,14 +0,0 @@
-export async function deepFind(obj, path) {
-    const keys = path.split('.');
-    let current = obj;
-
-    for (const key of keys) {
-        if (current[key] !== undefined) {
-            current = current[key];
-        } else {
-            return undefined;
-        }
-    }
-
-    return current;
-}

From 37859892faad87197d25aa7488d588f4e18bbdf3 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 23 Jan 2024 12:53:21 +0100
Subject: [PATCH 056/111] refs #6280 perf: call locationFilter

---
 src/components/common/VnLocation.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 827afe9ca..ee879a62c 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, toRefs, computed, watch } from 'vue';
+import { ref, toRefs, computed, watch, onMounted } from 'vue';
 import CreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectCreate from 'components/common/VnSelectCreate.vue';
 import FetchData from 'components/FetchData.vue';
@@ -67,16 +67,19 @@ function showLabel(data) {
        return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
 
+
+onMounted(() => {
+    locationFilter()
+})
 function locationFilter(search) {
-    let where = { limit: 30 };
-    const params = { search };
-    postcodesRef.value.fetch({ where, args: params });
+    let where = { search };
+    postcodesRef.value.fetch({ where, limit: 30});
 }
 function handleFetch( data) {
     postcodesOptions.value = data;
 }
 async function onPostcodeCreated(){
-    postcodesRef.value.fetch();
+    locationFilter()
 };
 </script>
 <template>
@@ -84,7 +87,6 @@ async function onPostcodeCreated(){
         ref="postcodesRef"
         url="Postcodes/filter"
         @on-fetch="(data) =>handleFetch(data)"
-        auto-load
     />
     <VnSelectCreate
         v-if="postcodesRef"

From 5ebeb7fe472c9bca7b29e9460732341716d40c84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Segarra=20Mart=C3=ADnez?= <jsegarra@verdnatura.es>
Date: Tue, 23 Jan 2024 23:23:51 +0100
Subject: [PATCH 057/111] refs #6280 perf locationFilter

---
 src/components/common/VnLocation.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index ee879a62c..674784849 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -72,8 +72,8 @@ onMounted(() => {
     locationFilter()
 })
 function locationFilter(search) {
-    let where = { search };
-    postcodesRef.value.fetch({ where, limit: 30});
+    let args = { filter:{limit: 30}, search};
+    postcodesRef.value.fetch({args});
 }
 function handleFetch( data) {
     postcodesOptions.value = data;

From 45dc9c355f4ab6342a82bb8e597a81cea2b96318 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 24 Jan 2024 08:30:09 +0100
Subject: [PATCH 058/111] refs #6280 perf: improve component

---
 src/components/common/VnLocation.vue        | 15 ++++++----
 src/pages/Customer/CustomerCreate.vue       |  7 +++--
 src/pages/Worker/WorkerCreate.vue           |  7 +++--
 test/cypress/integration/VnLocation.spec.js | 32 +++++++++++++++++++++
 4 files changed, 49 insertions(+), 12 deletions(-)
 create mode 100644 test/cypress/integration/VnLocation.spec.js

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 674784849..a7a58e2b8 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -54,11 +54,16 @@ const value = computed({
     },
 });
 
+onMounted(() => {
+    locationFilter()
+});
+
 function setOptions(data) {
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
 }
 setOptions(options.value);
+
 watch(options, (newValue) => {
     setOptions(newValue);
 });
@@ -67,17 +72,15 @@ function showLabel(data) {
        return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
 }
 
-
-onMounted(() => {
-    locationFilter()
-})
 function locationFilter(search) {
-    let args = { filter:{limit: 30}, search};
-    postcodesRef.value.fetch({args});
+    let where = { search };
+    postcodesRef.value.fetch({filter:{ where}, limit: 30});
 }
+
 function handleFetch( data) {
     postcodesOptions.value = data;
 }
+
 async function onPostcodeCreated(){
     locationFilter()
 };
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 4ce4b4520..800279326 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -33,9 +33,10 @@ const businessTypesOptions = ref([]);
 const postcodesOptions = ref([]);
 
 
-function handleLocation(data, { city, postcode, provinceFk, countryFk }) {
-    data.postcode = postcode;
-    data.city = city;
+function handleLocation(data, location ) {
+    const { town, code, provinceFk, countryFk } = location ?? {}
+    data.postcode = code;
+    data.city = town;
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;
 }
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 490fd2086..3ded85584 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -57,9 +57,10 @@ const onBankEntityCreated = (data) => {
 };
 
 
-function handleLocation(data, { city, postcode, provinceFk, countryFk }) {
-    data.postcode = postcode;
-    data.city = city;
+function handleLocation(data, location ) {
+    const { town, postcode: code, provinceFk, countryFk } = location ?? {}
+    data.postcode = code;
+    data.city = town;
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;
 }
diff --git a/test/cypress/integration/VnLocation.spec.js b/test/cypress/integration/VnLocation.spec.js
new file mode 100644
index 000000000..20b18700f
--- /dev/null
+++ b/test/cypress/integration/VnLocation.spec.js
@@ -0,0 +1,32 @@
+const inputLocation = ':nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control';
+const locationOptions ='[role="listbox"] > div.q-virtual-scroll__content > .q-item'
+describe('VnLocation', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit('/#/worker/create');
+        cy.waitForElement('.q-card');
+    });
+
+    // it('Show all options', function() {
+    //   cy.get(inputLocation).click();
+    //   cy.get(locationOptions).should('have.length',5)
+    //   // cy.get(':nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon').click()
+    // });
+
+    // it('input filter location as "al"', function() {
+    //     cy.get(inputLocation).click();
+    //     cy.get(inputLocation).clear();
+    //     cy.get(inputLocation).type('al');
+    //     cy.get(locationOptions).should('have.length',3);
+    // });
+    it('input filter location as "ecuador"', function() {
+        cy.get(inputLocation).click();
+        cy.get(inputLocation).clear();
+        cy.get(inputLocation).type('ecuador');
+        cy.get(locationOptions).should('have.length',1);
+        cy.get(`${locationOptions}:nth-child(1)`).click();
+        cy.get(':nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon').click();
+
+    });
+})

From 8f870f8d6714dbbfcfc2bb76b35c6fb30f545d80 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 24 Jan 2024 08:43:50 +0100
Subject: [PATCH 059/111] refs #6677 dataRef

---
 src/components/common/VnSelectFilter.vue      | 17 +++++++++++++++++
 .../InvoiceIn/Card/InvoiceInBasicData.vue     | 19 ++++++++-----------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 244fb50bb..a50ce1236 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -1,6 +1,8 @@
 <script setup>
+import FetchData from 'src/components/FetchData.vue';
 import { ref, toRefs, computed, watch } from 'vue';
 const emit = defineEmits(['update:modelValue', 'update:options']);
+const dataRef = ref();
 
 const $props = defineProps({
     modelValue: {
@@ -15,6 +17,14 @@ const $props = defineProps({
         type: String,
         default: '',
     },
+    optionValue: {
+        type: String,
+        default: '',
+    },
+    url: {
+        type: String,
+        default: '',
+    },
     filterOptions: {
         type: Array,
         default: () => [],
@@ -89,7 +99,14 @@ watch(options, (newValue) => {
 </script>
 
 <template>
+    <FetchData
+        ref="dataRef"
+        :url="$props.url"
+        @on-fetch="(data) => (dataRef = data)"
+        auto-load
+    />
     <QSelect
+        v-if="dataRef"
         v-model="value"
         :options="myOptions"
         :option-label="optionLabel"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index a46978458..55884cd04 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -6,7 +6,6 @@ import { useQuasar } from 'quasar';
 import { useArrayData } from 'src/composables/useArrayData';
 
 import { downloadFile } from 'src/composables/downloadFile';
-import FetchData from 'src/components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import axios from 'axios';
@@ -146,12 +145,12 @@ function supplierRefFilter(val) {
 }
 </script>
 <template>
-    <FetchData
+    <!-- <FetchData
         ref="suppliersRef"
         url="Suppliers"
         @on-fetch="(data) => (suppliers = data)"
-    />
-    <FetchData
+    /> -->
+    <!-- <FetchData
         ref="currenciesRef"
         url="Currencies"
         :filter="{ fields: ['id', 'code'] }"
@@ -193,21 +192,19 @@ function supplierRefFilter(val) {
         url="UserConfigs/getUserConfig"
         @on-fetch="(data) => (userConfig = data)"
         auto-load
-    />
+    /> -->
     <FormModel v-if="invoiceIn" :url="`InvoiceIns/${route.params.id}`" model="invoiceIn">
         <template #form="{ data }">
             <div class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <VnSelectFilter
-                        v-if="suppliersRef"
                         :label="t('supplierFk')"
                         v-model="data.supplierFk"
-                        :options="suppliers"
                         option-value="id"
                         option-label="nickname"
-                        :input-debounce="100"
-                        @input-value="supplierRefFilter"
-                        :default-filter="false"
+                        url="Suppliers"
+                        :filter="{ fields: ['id', 'code'], order: 'code' }"
+                        @update-options="(data) => (suppliersRef = data)"
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
@@ -418,7 +415,7 @@ function supplierRefFilter(val) {
             <div class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <VnSelectFilter
-                        v-if="currenciesRef"
+                        url="Currencies"
                         :label="t('Currency')"
                         v-model="data.currencyFk"
                         :options="currencies"

From e47561df868d9da935d9b69975948e7017212399 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 24 Jan 2024 13:50:04 +0100
Subject: [PATCH 060/111] refs #6664 disable

---
 src/pages/Claim/Card/ClaimAction.vue | 37 ++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index 76f76903c..b2c99bcb6 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -232,10 +232,10 @@ async function importToNewRefundTicket() {
         show-if-above
         v-if="claim"
     >
-        <QCard class="totalClaim vn-card q-my-md q-pa-sm">
+        <QCard class="totalClaim q-my-md q-pa-sm no-box-shadow">
             {{ `${t('Total claimed')}: ${toCurrency(totalClaimed)}` }}
         </QCard>
-        <QCard class="vn-card q-mb-md q-pa-sm">
+        <QCard class="q-mb-md q-pa-sm no-box-shadow">
             <QItem class="justify-between">
                 <QItemLabel class="slider-container">
                     <p class="text-primary">
@@ -256,13 +256,31 @@ async function importToNewRefundTicket() {
                 </QItemLabel>
             </QItem>
         </QCard>
-        <QItemLabel class="mana q-mb-md">
-            <QCheckbox
-                v-model="claim.isChargedToMana"
-                @update:model-value="(value) => save({ isChargedToMana: value })"
+        <QCard class="q-mb-md q-pa-sm no-box-shadow" style="margin-bottom: 1em">
+            <QItemLabel class="mana q-mb-md">
+                <QCheckbox
+                    v-model="claim.isChargedToMana"
+                    @update:model-value="(value) => save({ isChargedToMana: value })"
+                />
+                <span>{{ t('mana') }}</span>
+            </QItemLabel>
+        </QCard>
+        <QCard class="q-mb-md q-pa-sm no-box-shadow" style="position: static">
+            <QInput
+                :label="t('confirmGreuges')"
+                class="q-field__native text-grey-2"
+                type="number"
+                placeholder="0"
+                id="multiplicatorValue"
+                name="multiplicatorValue"
+                min="0"
+                max="50"
+                disable="
+                    claim.value.responsibility >=
+                    Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2
+                "
             />
-            <span>{{ t('mana') }}</span>
-        </QItemLabel>
+        </QCard>
     </QDrawer>
     <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()"> </Teleport>
     <CrudModel
@@ -470,6 +488,9 @@ async function importToNewRefundTicket() {
 .mana {
     float: inline-start;
 }
+.vn-card {
+    background-color: blue($color: #000000);
+}
 </style>
 <i18n>
 en:

From 899633171d0e8830e71481fa165b92ad925269cc Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 24 Jan 2024 10:47:48 -0300
Subject: [PATCH 061/111] Suppliers corrections

---
 src/pages/Supplier/Card/SupplierBasicData.vue |  12 ++
 .../Supplier/Card/SupplierBillingData.vue     |  11 +-
 .../Supplier/Card/SupplierConsumption.vue     |  35 ++---
 .../Card/SupplierConsumptionFilter.vue        |  17 +--
 .../Supplier/Card/SupplierDescriptor.vue      |  72 ++++++++++-
 src/pages/Supplier/SupplierCreate.vue         |   8 ++
 src/pages/Supplier/SupplierList.vue           |  14 +-
 src/pages/Supplier/SupplierListFilter.vue     | 122 ++++++++++++++++++
 8 files changed, 259 insertions(+), 32 deletions(-)
 create mode 100644 src/pages/Supplier/SupplierListFilter.vue

diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index b73ce9346..747784943 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -48,6 +48,13 @@ const workersOptions = ref([]);
                         map-options
                         :rules="validate('supplier.workerFk')"
                     >
+                        <template #append>
+                            <QIcon name="info" class="cursor-pointer">
+                                <QTooltip>{{
+                                    t('Responsible for approving invoices')
+                                }}</QTooltip>
+                            </QIcon>
+                        </template>
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
                                 <QItemSection>
@@ -95,3 +102,8 @@ const workersOptions = ref([]);
         </template>
     </FormModel>
 </template>
+
+<i18n>
+es:
+    Responsible for approving invoices: Responsable de aprobar las facturas
+</i18n>
diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
index 1237a0403..bf5ccb115 100644
--- a/src/pages/Supplier/Card/SupplierBillingData.vue
+++ b/src/pages/Supplier/Card/SupplierBillingData.vue
@@ -13,6 +13,13 @@ const { t } = useI18n();
 
 const paymethodsOptions = ref([]);
 const payDemsOptions = ref([]);
+
+const formatPayDems = (data) => {
+    payDemsOptions.value = data.map(({ id, payDem }) => ({
+        id: id,
+        payDem: payDem || '0',
+    }));
+};
 </script>
 <template>
     <FetchData
@@ -20,7 +27,7 @@ const payDemsOptions = ref([]);
         @on-fetch="(data) => (paymethodsOptions = data)"
         auto-load
     />
-    <FetchData url="PayDems" @on-fetch="(data) => (payDemsOptions = data)" auto-load />
+    <FetchData url="PayDems" @on-fetch="(data) => formatPayDems(data)" auto-load />
     <FormModel
         :url="`Suppliers/${route.params.id}`"
         :url-update="`Suppliers/${route.params.id}`"
@@ -37,7 +44,6 @@ const payDemsOptions = ref([]);
                         option-value="id"
                         option-label="name"
                         hide-selected
-                        map-options
                         :rules="validate('supplier.payMethodFk')"
                     />
                 </div>
@@ -49,7 +55,6 @@ const payDemsOptions = ref([]);
                         option-value="id"
                         option-label="payDem"
                         hide-selected
-                        map-options
                         :rules="validate('supplier.payDemFk')"
                     />
                 </div>
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 0cf66fe25..7baa8ded5 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -8,7 +8,7 @@ import FetchedTags from 'components/ui/FetchedTags.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import SupplierConsumptionFilter from './SupplierConsumptionFilter.vue';
 
-import { toDate, toDateString } from 'src/filters';
+import { toDate } from 'src/filters';
 import { dashIfEmpty } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
 import useNotify from 'src/composables/useNotify.js';
@@ -31,23 +31,26 @@ const arrayData = useArrayData('SupplierConsumption', {
 
 const store = arrayData.store;
 
-const userParams = computed(() => {
-    const minDate = Date.vnNew();
-    minDate.setHours(0, 0, 0, 0);
-    minDate.setMonth(minDate.getMonth() - 2);
-
-    const maxDate = Date.vnNew();
-    maxDate.setHours(23, 59, 59, 59);
-
-    return {
-        from: toDateString(minDate),
-        to: toDateString(maxDate),
+const dateRanges = computed(() => {
+    const ranges = {
+        from: null,
+        to: null,
     };
+
+    if (route.query && route.query.params) {
+        const params = JSON.parse(route.query.params);
+        if (params.from && params.to) {
+            ranges.from = params.from;
+            ranges.to = params.to;
+        }
+    }
+
+    return ranges;
 });
 
 const reportParams = computed(() => ({
     recipientId: Number(route.params.id),
-    ...userParams.value,
+    ...dateRanges.value,
 }));
 
 async function getSupplierConsumptionData() {
@@ -113,10 +116,10 @@ onMounted(async () => {
 </script>
 
 <template>
-    <QToolbar class="bg-vn-dark justify-end">
+    <QToolbar v-if="rows && rows.length > 0" class="bg-vn-dark justify-end">
         <div id="st-data">
             <QBtn
-                v-if="userParams.from && userParams.to"
+                :disabled="!dateRanges.from && !dateRanges.to"
                 color="primary"
                 icon-right="picture_as_pdf"
                 no-caps
@@ -128,7 +131,7 @@ onMounted(async () => {
                 </QTooltip>
             </QBtn>
             <QBtn
-                v-if="userParams.from && userParams.to"
+                :disabled="!dateRanges.from && !dateRanges.to"
                 color="primary"
                 icon-right="email"
                 no-caps
diff --git a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
index 4835b7663..339a9d0d9 100644
--- a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
+++ b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
@@ -50,18 +50,14 @@ const itemCategoriesOptions = ref([]);
         @on-fetch="(data) => (itemCategoriesOptions = data)"
         auto-load
     />
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :search-button="true"
-        :unremovable-params="['supplierFk']"
-    >
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params }">
+        <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -85,6 +81,7 @@ const itemCategoriesOptions = ref([]);
                     <VnSelectFilter
                         :label="t('params.buyerId')"
                         v-model="params.buyerId"
+                        @update:model-value="searchFn()"
                         :options="buyersOptions"
                         option-value="id"
                         option-label="nickname"
@@ -100,6 +97,7 @@ const itemCategoriesOptions = ref([]);
                     <VnSelectFilter
                         :label="t('params.typeId')"
                         v-model="params.typeId"
+                        @update:model-value="searchFn()"
                         :options="itemTypesOptions"
                         option-value="id"
                         option-label="name"
@@ -126,6 +124,7 @@ const itemCategoriesOptions = ref([]);
                     <VnSelectFilter
                         :label="t('params.categoryId')"
                         v-model="params.categoryId"
+                        @update:model-value="searchFn()"
                         :options="itemCategoriesOptions"
                         option-value="id"
                         option-label="name"
@@ -140,8 +139,9 @@ const itemCategoriesOptions = ref([]);
                 <QItemSection>
                     <VnInputDate
                         :label="t('params.from')"
-                        is-outlined
                         v-model="params.from"
+                        @update:model-value="searchFn()"
+                        is-outlined
                     />
                 </QItemSection>
             </QItem>
@@ -149,8 +149,9 @@ const itemCategoriesOptions = ref([]);
                 <QItemSection>
                     <VnInputDate
                         :label="t('params.to')"
-                        is-outlined
                         v-model="params.to"
+                        @update:model-value="searchFn()"
+                        is-outlined
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 43857fd1e..5187708e4 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -1,10 +1,14 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
+
+import { toDateString } from 'src/filters';
 import useCardDescription from 'src/composables/useCardDescription';
+import { getUrl } from 'src/composables/getUrl';
 
 const $props = defineProps({
     id: {
@@ -16,6 +20,7 @@ const $props = defineProps({
 
 const route = useRoute();
 const { t } = useI18n();
+const url = ref();
 
 const filter = {
     fields: [
@@ -53,6 +58,10 @@ const filter = {
     ],
 };
 
+onMounted(async () => {
+    url.value = await getUrl('');
+});
+
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
@@ -61,6 +70,27 @@ const data = ref(useCardDescription());
 const setData = (entity) => {
     data.value = useCardDescription(entity.ref, entity.id);
 };
+
+const getEntryQueryParams = (supplier) => {
+    if (!supplier) return null;
+
+    const date = Date.vnNew();
+    date.setHours(0, 0, 0, 0);
+
+    const from = new Date(date.getTime());
+    from.setDate(from.getDate() - 10);
+
+    const to = new Date(date.getTime());
+    to.setDate(to.getDate() + 10);
+
+    const params = {
+        supplierFk: supplier.id,
+        from: toDateString(from),
+        to: toDateString(to),
+    };
+
+    return params;
+};
 </script>
 
 <template>
@@ -87,8 +117,46 @@ const setData = (entity) => {
             <VnLv :label="t('supplier.summary.payDay')" :value="entity.payDay" />
             <VnLv :label="t('supplier.summary.account')" :value="entity.account" />
         </template>
+        <template #actions="{ entity }">
+            <QCardActions>
+                <QBtn
+                    :to="{
+                        name: 'EntryList',
+                        query: { params: JSON.stringify(getEntryQueryParams(entity)) },
+                    }"
+                    size="md"
+                    icon="vn:entry"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('All entries with current supplier') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    :to="{
+                        name: 'CustomerCard',
+                        params: { id: entity.client?.id },
+                    }"
+                    size="md"
+                    icon="vn:Person"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Go to client') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    :href="`${url}invoice-in/create`"
+                    size="md"
+                    icon="vn:invoice-in-create"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Create invoiceIn') }}</QTooltip>
+                </QBtn>
+            </QCardActions>
+        </template>
     </CardDescriptor>
 </template>
-<i18n>
 
+<i18n>
+es:
+    All entries with current supplier: Todas las entradas con proveedor actual
+    Go to client: Ir a cliente
+    Create invoiceIn: Crear factura recibida
 </i18n>
diff --git a/src/pages/Supplier/SupplierCreate.vue b/src/pages/Supplier/SupplierCreate.vue
index ebe0518f2..8424ae68c 100644
--- a/src/pages/Supplier/SupplierCreate.vue
+++ b/src/pages/Supplier/SupplierCreate.vue
@@ -1,6 +1,8 @@
 <script setup>
 import { reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
@@ -9,12 +11,17 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 
+const router = useRouter();
 const { t } = useI18n();
 const stateStore = useStateStore();
 
 const newSupplierForm = reactive({
     name: null,
 });
+
+const redirectToSupplierFiscalData = (_, responseData) => {
+    router.push({ name: 'SupplierFiscalData', params: { id: responseData.id } });
+};
 </script>
 
 <template>
@@ -34,6 +41,7 @@ const newSupplierForm = reactive({
             url-create="Suppliers/newSupplier"
             model="supplier"
             :form-initial-data="newSupplierForm"
+            @on-data-saved="redirectToSupplierFiscalData"
         >
             <template #form="{ data }">
                 <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index d504e127a..f4875fc99 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -1,13 +1,16 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
+import { useQuasar } from 'quasar';
 import { useRouter } from 'vue-router';
+
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import { useQuasar } from 'quasar';
 import SupplierSummaryDialog from './Card/SupplierSummaryDialog.vue';
+import SupplierListFilter from './SupplierListFilter.vue';
+
+import { useStateStore } from 'stores/useStateStore';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -44,6 +47,11 @@ const viewSummary = (id) => {
     </template>
 
     <QPage class="column items-center q-pa-md">
+        <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+            <QScrollArea class="fit text-grey-8">
+                <SupplierListFilter data-key="SuppliersList" />
+            </QScrollArea>
+        </QDrawer>
         <div class="vn-card-list">
             <VnPaginate data-key="SuppliersList" url="Suppliers/filter" auto-load>
                 <template #body="{ rows }">
@@ -56,7 +64,7 @@ const viewSummary = (id) => {
                     >
                         <template #list-items>
                             <VnLv label="NIF/CIF" :value="row.nif" />
-                            <VnLv label="Alias" :value="row.nickname" />
+                            <VnLv label="Alias" :value="row.alias" />
                             <VnLv
                                 :label="t('supplier.list.payMethod')"
                                 :value="row.payMethod"
diff --git a/src/pages/Supplier/SupplierListFilter.vue b/src/pages/Supplier/SupplierListFilter.vue
new file mode 100644
index 000000000..ff90df6e1
--- /dev/null
+++ b/src/pages/Supplier/SupplierListFilter.vue
@@ -0,0 +1,122 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FetchData from 'components/FetchData.vue';
+
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const { t } = useI18n();
+
+const provincesOptions = ref([]);
+const countriesOptions = ref([]);
+</script>
+
+<template>
+    <FetchData
+        url="Provinces"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
+        @on-fetch="(data) => (provincesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="countries"
+        :filter="{ fields: ['id', 'country'], order: 'country ASC', limit: 30 }"
+        @on-fetch="(data) => (countriesOptions = data)"
+        auto-load
+    />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :unremovable-params="['supplierFk']"
+    >
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params, searchFn }">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.search"
+                        :label="t('params.search')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.nickname"
+                        :label="t('params.nickname')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput v-model="params.nif" :label="t('params.nif')" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.provinceFk')"
+                        v-model="params.provinceFk"
+                        @update:model-value="searchFn()"
+                        :options="provincesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.countryFk')"
+                        v-model="params.countryFk"
+                        @update:model-value="searchFn()"
+                        :options="countriesOptions"
+                        option-value="id"
+                        option-label="country"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    params:
+        search: General search
+        nickname: Alias
+        nif: Tax number
+        provinceFk: Province
+        countryFk: Country
+es:
+    params:
+        search: Búsqueda general
+        nickname: Alias
+        nif: NIF/CIF
+        provinceFk: Provincia
+        countryFk: País
+</i18n>

From 8ae7756e9abf61a5b96a8d0f131dd86d2f300526 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 24 Jan 2024 14:58:33 +0100
Subject: [PATCH 062/111] refs #6664 btn

---
 src/pages/Claim/Card/ClaimAction.vue | 40 +++++++++++++++-------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index b2c99bcb6..85a30600c 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -135,21 +135,21 @@ async function regularizeClaim() {
         message: t('globals.dataSaved'),
         type: 'positive',
     });
-    if (claim.value.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2) {
-        quasar
-            .dialog({
-                component: VnConfirm,
-                componentProps: {
-                    title: t('confirmGreuges'),
-                    message: `
-                    <input class="q-field__native text-grey-2" type="number" placeholder="1" id="multiplicatorValue" name="multiplicatorValue" min="0" max="50"/>
-                     `,
-                    data: { inputId: 'multiplicatorValue' },
-                    promise: onUpdateGreugeAccept,
-                },
-            })
-            .onOk(async () => await onUpdateGreugeAccept());
-    }
+    // if (claim.value.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2) {
+    //     quasar
+    //         .dialog({
+    //             component: VnConfirm,
+    //             componentProps: {
+    //                 title: t('confirmGreuges'),
+    //                 message: `
+    //                 <input class="q-field__native text-grey-2" type="number" placeholder="1" id="multiplicatorValue" name="multiplicatorValue" min="0" max="50"/>
+    //                  `,
+    //                 data: { inputId: 'multiplicatorValue' },
+    //                 promise: onUpdateGreugeAccept,
+    //             },
+    //         })
+    //         .onOk(async () => await onUpdateGreugeAccept());
+    // }
 }
 
 async function onUpdateGreugeAccept({ return: multiplicatorValue }) {
@@ -275,11 +275,12 @@ async function importToNewRefundTicket() {
                 name="multiplicatorValue"
                 min="0"
                 max="50"
-                disable="
-                    claim.value.responsibility >=
-                    Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2
-                "
+                v-model="multiplicatorValue"
             />
+            <QBtn
+                @click="onUpdateGreugeAccept(multiplicatorValue)"
+                :label="t('Apply Greuges')"
+            ></QBtn>
         </QCard>
     </QDrawer>
     <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()"> </Teleport>
@@ -521,4 +522,5 @@ es:
     Id item: Id artículo
     confirmGreuges: ¿Desea insertar greuges?
     confirmGreugesMessage: Insertar greuges en la ficha del cliente
+    Apply Greuges: Aplicar Greuges
 </i18n>

From 47fd0b2dfde8874374d2956da8b436cbe0d4d744 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 25 Jan 2024 08:46:51 +0100
Subject: [PATCH 063/111] refs #6745 fix(claimDescriptor= claimRatio label.
 fix(TicketSummary): state can be null

---
 src/pages/Claim/Card/ClaimDescriptor.vue | 8 +++++++-
 src/pages/Ticket/Card/TicketSummary.vue  | 6 +++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index afd22c340..deaed94f8 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -145,7 +145,7 @@ const setData = (entity) => {
             />
             <VnLv :label="t('claim.card.zone')" :value="entity.ticket?.zone?.name" />
             <VnLv
-                :label="t('claim.card.zone')"
+                :label="t('claimRate')"
                 :value="toPercentage(entity.client?.claimsRatio?.claimingRate)"
             />
         </template>
@@ -176,3 +176,9 @@ const setData = (entity) => {
     margin-top: 0;
 }
 </style>
+<i18n>
+    en:
+        claimRate: Claming rate
+    es:
+        claimRate: Ratio de reclamación
+</i18n>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 65523bb82..fe7dcee9a 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -58,7 +58,7 @@ function formattedAddress() {
 
 function isEditable() {
     try {
-        return !ticket.value.ticketState.state.alertLevel;
+        return !ticket.value.ticketState?.state?.alertLevel;
     } catch (e) {
         console.error(e);
     }
@@ -153,8 +153,8 @@ async function changeState(value) {
                 </a>
                 <VnLv :label="t('ticket.summary.state')">
                     <template #value>
-                        <QChip :color="ticket.ticketState.state.classColor ?? 'dark'">
-                            {{ ticket.ticketState.state.name }}
+                        <QChip :color="ticket.ticketState?.state?.classColor ?? 'dark'">
+                            {{ ticket.ticketState?.state?.name }}
                         </QChip>
                     </template>
                 </VnLv>

From 33332a5c044ec597da5485d8275954e60424fd33 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 25 Jan 2024 12:21:41 +0100
Subject: [PATCH 064/111] refs #6677 url

---
 src/components/common/VnSelectFilter.vue        | 5 +++--
 src/pages/InvoiceIn/Card/InvoiceInBasicData.vue | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index a50ce1236..182ec8e16 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -81,6 +81,7 @@ const filter = (val, options) => {
 const filterHandler = (val, update) => {
     update(
         () => {
+            if ($props.url) return;
             if ($props.defaultFilter)
                 myOptions.value = filter(val, myOptionsOriginal.value);
         },
@@ -100,13 +101,13 @@ watch(options, (newValue) => {
 
 <template>
     <FetchData
+        v-if="$props.url"
         ref="dataRef"
         :url="$props.url"
-        @on-fetch="(data) => (dataRef = data)"
+        @on-fetch="(data) => setOptions(data)"
         auto-load
     />
     <QSelect
-        v-if="dataRef"
         v-model="value"
         :options="myOptions"
         :option-label="optionLabel"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 55884cd04..75c93694d 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -200,7 +200,8 @@ function supplierRefFilter(val) {
                     <VnSelectFilter
                         :label="t('supplierFk')"
                         v-model="data.supplierFk"
-                        option-value="id"
+                        option-value="id
+                        "
                         option-label="nickname"
                         url="Suppliers"
                         :filter="{ fields: ['id', 'code'], order: 'code' }"

From 35aa0ba20a769006396747d6a58ef10f41d480ec Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 25 Jan 2024 13:48:42 +0100
Subject: [PATCH 065/111] refs #6664 claimPortes

---
 src/pages/Claim/Card/ClaimAction.vue          | 29 +++++--------------
 .../integration/claim/claimAction.spec.js     |  1 -
 2 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index 85a30600c..371cb015f 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -37,7 +37,7 @@ const marker_labels = [
     { value: DEFAULT_MIN_RESPONSABILITY, label: t('claim.summary.company') },
     { value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.summary.person') },
 ];
-const portesMultiplicator = ref();
+const multiplicatorValue = ref();
 
 const columns = computed(() => [
     {
@@ -135,24 +135,10 @@ async function regularizeClaim() {
         message: t('globals.dataSaved'),
         type: 'positive',
     });
-    // if (claim.value.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2) {
-    //     quasar
-    //         .dialog({
-    //             component: VnConfirm,
-    //             componentProps: {
-    //                 title: t('confirmGreuges'),
-    //                 message: `
-    //                 <input class="q-field__native text-grey-2" type="number" placeholder="1" id="multiplicatorValue" name="multiplicatorValue" min="0" max="50"/>
-    //                  `,
-    //                 data: { inputId: 'multiplicatorValue' },
-    //                 promise: onUpdateGreugeAccept,
-    //             },
-    //         })
-    //         .onOk(async () => await onUpdateGreugeAccept());
-    // }
+    await onUpdateGreugeAccept();
 }
 
-async function onUpdateGreugeAccept({ return: multiplicatorValue }) {
+async function onUpdateGreugeAccept() {
     const greugeTypeFreightId = (
         await axios.get(`GreugeTypes/findOne`, {
             filter: { where: { code: 'freightPickUp' } },
@@ -160,7 +146,7 @@ async function onUpdateGreugeAccept({ return: multiplicatorValue }) {
     ).data.id;
     const freightPickUpPrice =
         (await axios.get(`GreugeConfigs/findOne`)).data.freightPickUpPrice *
-        +multiplicatorValue;
+        +multiplicatorValue.value;
     console.log(freightPickUpPrice);
     await axios.post(`Greuges`, {
         clientFk: claim.value.clientFk,
@@ -267,6 +253,9 @@ async function importToNewRefundTicket() {
         </QCard>
         <QCard class="q-mb-md q-pa-sm no-box-shadow" style="position: static">
             <QInput
+                :disable="
+                    !(claim.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2)
+                "
                 :label="t('confirmGreuges')"
                 class="q-field__native text-grey-2"
                 type="number"
@@ -277,10 +266,6 @@ async function importToNewRefundTicket() {
                 max="50"
                 v-model="multiplicatorValue"
             />
-            <QBtn
-                @click="onUpdateGreugeAccept(multiplicatorValue)"
-                :label="t('Apply Greuges')"
-            ></QBtn>
         </QCard>
     </QDrawer>
     <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()"> </Teleport>
diff --git a/test/cypress/integration/claim/claimAction.spec.js b/test/cypress/integration/claim/claimAction.spec.js
index f181722fa..685e120ce 100644
--- a/test/cypress/integration/claim/claimAction.spec.js
+++ b/test/cypress/integration/claim/claimAction.spec.js
@@ -31,7 +31,6 @@ describe('ClaimAction', () => {
 
     it('should regularize', () => {
         cy.get('[title="Regularize"]').click();
-        cy.clickConfirm();
     });
 
     it('should remove the line', () => {

From 67d95f9ad0d296b9704ccaa63a0ef7989da0af22 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 25 Jan 2024 14:44:41 +0100
Subject: [PATCH 066/111] refs #6664 vnConfirm og

---
 src/components/ui/VnConfirm.vue | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/components/ui/VnConfirm.vue b/src/components/ui/VnConfirm.vue
index 0ce18cadb..f8715f685 100644
--- a/src/components/ui/VnConfirm.vue
+++ b/src/components/ui/VnConfirm.vue
@@ -2,7 +2,6 @@
 import { ref } from 'vue';
 import { useDialogPluginComponent } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { onMounted } from 'vue';
 
 const { t } = useI18n();
 
@@ -29,7 +28,6 @@ const props = defineProps({
         required: false,
         default: null,
     },
-    callbackFn: Function,
 });
 
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);
@@ -39,17 +37,12 @@ const { dialogRef, onDialogOK } = useDialogPluginComponent();
 const title = props.title || t('Confirm');
 const message = props.message || t('Are you sure you want to continue?');
 const isLoading = ref(false);
-onMounted(() => {
-    if (props.callbackFn) props.callbackFn();
-});
+
 async function confirm() {
-    let html = null;
-    html = document.getElementById(props.data.inputId);
     isLoading.value = true;
     if (props.promise) {
         try {
-            if (html) await props.promise({ ...props.data, return: html.value });
-            else await props.promise(props.data);
+            await props.promise(props.data);
         } finally {
             isLoading.value = false;
         }
@@ -72,8 +65,8 @@ async function confirm() {
                 <QSpace />
                 <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
             </QCardSection>
-            <QCardSection class="row justify-center items-center">
-                <span id="spanHTML" v-html="message"></span>
+            <QCardSection class="row items-center">
+                <span v-html="message"></span>
             </QCardSection>
             <QCardActions align="right">
                 <QBtn

From 9f9835b7ab8d1a1d21945c82ff94ae2eb7e33352 Mon Sep 17 00:00:00 2001
From: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Date: Fri, 26 Jan 2024 07:56:41 +0000
Subject: [PATCH 067/111] refs #6280: remove related code to filter-rules

---
 src/components/common/VnSelectFilter.vue | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index a7ac4a7cd..7f10f5efe 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -12,15 +12,11 @@ const $props = defineProps({
         default: () => [],
     },
     optionLabel: {
-        type: [String, Function],
+        type: [String],
         default: '',
     },
     filterOptions: {
-        type: [Array, Function],
-        default: () => [],
-    },
-    filterRules: {
-        type: [Array, Function],
+        type: [Array],
         default: () => [],
     },
     isClearable: {
@@ -57,13 +53,6 @@ const filter = (val, options) => {
     const search = val.toString().toLowerCase();
 
     if (!search) return options;
-    if($props.filterRules.length) {
-        const passSomeRule = $props.filterRules.some((rule) => {
-            const cond = eval(rule)
-            return cond;
-        });
-        if(!passSomeRule) return options
-    }
 
     return options.filter((row) => {
         if ($props.filterOptions.length) {

From c731b5b9893bc5443cb8b48c106c19a049f3fcc4 Mon Sep 17 00:00:00 2001
From: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Date: Fri, 26 Jan 2024 08:04:08 +0000
Subject: [PATCH 068/111] refs #6280: replace function event

---
 src/components/common/VnLocation.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index a7a58e2b8..0b30faaa7 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -81,9 +81,6 @@ function handleFetch( data) {
     postcodesOptions.value = data;
 }
 
-async function onPostcodeCreated(){
-    locationFilter()
-};
 </script>
 <template>
     <FetchData
@@ -111,7 +108,7 @@ async function onPostcodeCreated(){
         fill-input
     >
         <template #form>
-            <CreateNewPostcode @on-data-saved="onPostcodeCreated($event)" />
+            <CreateNewPostcode @on-data-saved="locationFilter()" />
         </template>
         <template #option="{itemProps, opt}">
             <QItem v-bind="itemProps">

From d86ac6f31bbe2a91e34ea5b23911d626ba201cdc Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 26 Jan 2024 16:08:49 +0100
Subject: [PATCH 069/111] feat: refs #6654 sticky class

---
 src/components/ui/VnSubToolbar.vue            | 20 +++++++++++++++----
 .../Customer/Defaulter/CustomerDefaulter.vue  | 12 +++++------
 .../ExtendedList/CustomerExtendedList.vue     | 12 +++++------
 src/pages/InvoiceOut/InvoiceOutList.vue       |  9 +++++----
 src/pages/Travel/ExtraCommunity.vue           | 11 +++++-----
 5 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index 81a1820f1..7f30c9921 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -1,6 +1,7 @@
 <script setup>
-import { onMounted, onUnmounted, ref } from 'vue';
+import { onMounted, onUnmounted } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
+
 const stateStore = useStateStore();
 
 onMounted(() => {
@@ -13,9 +14,20 @@ onUnmounted(() => {
 </script>
 
 <template>
-    <QToolbar class="bg-vn-dark justify-end">
-        <div id="st-data"></div>
+    <QToolbar class="bg-vn-dark justify-end sticky">
+        <slot name="st-data">
+            <div id="st-data"></div>
+        </slot>
         <QSpace />
-        <div id="st-actions"></div>
+        <slot name="st-actions">
+            <div id="st-actions"></div>
+        </slot>
     </QToolbar>
 </template>
+<style scoped>
+.sticky {
+    position: sticky;
+    top: 60px;
+    z-index: 1;
+}
+</style>
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index d54d5df35..3ab1cfa66 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -12,6 +12,7 @@ import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
 import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -188,14 +189,11 @@ const selectWorkerId = (id) => {
             <CustomerNotificationsFilter data-key="CustomerDefaulter" />
         </QScrollArea>
     </QDrawer>
-
-    <QToolbar class="bg-vn-dark">
-        <div id="st-data">
+    <VnSubToolbar>
+        <template #st-data>
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />
-        </div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
+        </template>
+    </VnSubToolbar>
 
     <QPage class="column items-center q-pa-md">
         <QTable
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
index caee06d60..993b84022 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@@ -9,6 +9,7 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
 import CustomerExtendedListActions from './CustomerExtendedListActions.vue';
 import CustomerExtendedListFilter from './CustomerExtendedListFilter.vue';
 import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
@@ -500,9 +501,8 @@ const selectSalesPersonId = (id) => {
             />
         </QScrollArea>
     </QDrawer>
-
-    <QToolbar class="bg-vn-dark">
-        <div id="st-data">
+    <VnSubToolbar>
+        <template #st-actions>
             <TableVisibleColumns
                 :all-columns="allColumnNames"
                 table-code="clientsDetail"
@@ -511,10 +511,8 @@ const selectSalesPersonId = (id) => {
                     visibleColumns = ['customerStatus', ...$event, 'actions']
                 "
             />
-        </div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
+        </template>
+    </VnSubToolbar>
 
     <QPage class="column items-center q-pa-md">
         <QTable
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 292fa2e0a..974847dff 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -11,6 +11,7 @@ import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import InvoiceOutFilter from './InvoiceOutFilter.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 const selectedCards = ref(new Map());
@@ -129,8 +130,8 @@ const downloadCsv = () => {
             url="InvoiceOuts/filter"
         >
             <template #body="{ rows }">
-                <QToolbar class="bg-vn-dark justify-end">
-                    <div id="st-actions">
+                <VnSubToolbar class="bg-vn-dark justify-end">
+                    <template #st-actions>
                         <QBtn
                             @click="downloadCsv()"
                             class="q-mr-xl"
@@ -178,8 +179,8 @@ const downloadCsv = () => {
                             :model-value="selectedCards.size === rows.length"
                             class="q-mr-md"
                         />
-                    </div>
-                </QToolbar>
+                    </template>
+                </VnSubToolbar>
                 <div class="flex flex-center q-pa-md">
                     <div class="card-list">
                         <CardList
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index 62292f115..99a97bb5d 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -16,6 +16,7 @@ import { useArrayData } from 'composables/useArrayData';
 import { toDate } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
 import travelService from 'src/services/travel.service';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const router = useRouter();
 const stateStore = useStateStore();
@@ -258,13 +259,11 @@ onMounted(async () => {
             />
         </Teleport>
     </template>
-    <QToolbar class="bg-vn-dark justify-end">
-        <div id="st-data"></div>
-        <QSpace />
-        <div id="st-actions">
+    <VnSubToolbar>
+        <template #st-actions>
             <QBtn color="primary" icon-right="archive" no-caps @click="openReportPdf()" />
-        </div>
-    </QToolbar>
+        </template>
+    </VnSubToolbar>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <ExtraCommunityFilter data-key="ExtraCommunity" />

From 9a23bb2ed24b984e4fd000964a3878fbc96b6e20 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Fri, 26 Jan 2024 11:08:45 -0500
Subject: [PATCH 070/111] Se corrige comentario 39968

---
 .../Customer/Card/CustomerBillingData.vue     | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index a455e6db2..1543eac7a 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -18,18 +18,28 @@ const route = useRoute();
 
 const payMethods = ref([]);
 const bankEntitiesOptions = ref([]);
+const bankEntitiesRef = ref(null);
 
-onMounted(() => getBankEntities());
+const filter = {
+    fields: ['id', 'bic', 'name'],
+    order: 'bic ASC',
+    limit: 30,
+};
 
-const getBankEntities = async () => {
-    const filter = { fields: ['id', 'bic', 'name'], order: 'bic ASC', limit: 30 };
-    const { data } = await axios.get('BankEntities', { filter });
-    bankEntitiesOptions.value = data;
+const getBankEntities = () => {
+    bankEntitiesRef.value.fetch();
 };
 </script>
 
 <template>
     <fetch-data @on-fetch="(data) => (payMethods = data)" auto-load url="PayMethods" />
+    <fetch-data
+        ref="bankEntitiesRef"
+        @on-fetch="(data) => (bankEntitiesOptions = data)"
+        :filter="filter"
+        auto-load
+        url="BankEntities"
+    />
 
     <FormModel
         :url-update="`Clients/${route.params.id}`"

From 4fae8e633b91f17dc5d74529d45990cd91aba208 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 26 Jan 2024 16:36:27 -0300
Subject: [PATCH 071/111] Create items module base structure, item descriptor
 and add it to supplier consumption

---
 src/components/RegularizeStockForm.vue        |  81 ++++++
 src/composables/useState.js                   |   2 +
 src/composables/useUserConfig.js              |   1 +
 src/i18n/en/index.js                          |  19 ++
 src/i18n/es/index.js                          |  19 ++
 src/pages/Item/Card/ItemCard.vue              |  25 ++
 src/pages/Item/Card/ItemDescriptor.vue        | 260 ++++++++++++++++++
 src/pages/Item/Card/ItemDescriptorProxy.vue   |  26 ++
 src/pages/Item/Card/ItemDiary.vue             |   1 +
 src/pages/Item/Card/ItemSummary.vue           |   1 +
 src/pages/Item/Card/ItemSummaryDialog.vue     |   5 +
 src/pages/Item/Card/ItemTags.vue              |   1 +
 src/pages/Item/ItemList.vue                   |   1 +
 src/pages/Item/ItemMain.vue                   |  18 ++
 .../Supplier/Card/SupplierConsumption.vue     |   6 +-
 src/router/modules/index.js                   |   2 +
 src/router/modules/item.js                    |  70 +++++
 src/router/routes.js                          |   2 +
 src/stores/useNavigationStore.js              |  20 +-
 19 files changed, 549 insertions(+), 11 deletions(-)
 create mode 100644 src/components/RegularizeStockForm.vue
 create mode 100644 src/pages/Item/Card/ItemCard.vue
 create mode 100644 src/pages/Item/Card/ItemDescriptor.vue
 create mode 100644 src/pages/Item/Card/ItemDescriptorProxy.vue
 create mode 100644 src/pages/Item/Card/ItemDiary.vue
 create mode 100644 src/pages/Item/Card/ItemSummary.vue
 create mode 100644 src/pages/Item/Card/ItemSummaryDialog.vue
 create mode 100644 src/pages/Item/Card/ItemTags.vue
 create mode 100644 src/pages/Item/ItemList.vue
 create mode 100644 src/pages/Item/ItemMain.vue
 create mode 100644 src/router/modules/item.js

diff --git a/src/components/RegularizeStockForm.vue b/src/components/RegularizeStockForm.vue
new file mode 100644
index 000000000..28236be17
--- /dev/null
+++ b/src/components/RegularizeStockForm.vue
@@ -0,0 +1,81 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from './FormModelPopup.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const props = defineProps({
+    itemFk: {
+        type: Number,
+        default: null,
+    },
+    warehouseFk: {
+        type: Boolean,
+        default: null,
+    },
+});
+
+const { t } = useI18n();
+
+const regularizeFormData = reactive({
+    itemFk: props.itemFk,
+    warehouseFk: props.warehouseFk,
+    quantity: null,
+});
+
+const warehousesOptions = ref([]);
+
+const onDataSaved = (data) => {
+    emit('onDataSaved', data);
+};
+</script>
+
+<template>
+    <FetchData
+        url="Warehouses"
+        @on-fetch="(data) => (warehousesOptions = data)"
+        auto-load
+    />
+    <FormModelPopup
+        url-create="Items/regularize"
+        model="Items"
+        :title="t('Regularize stock')"
+        :form-initial-data="regularizeFormData"
+        @on-data-saved="onDataSaved($event)"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QInput
+                        :label="t('Type the visible quantity')"
+                        v-model.number="data.quantity"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Warehouse')"
+                        v-model="data.warehouseFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    Warehouse: Almacén
+    Type the visible quantity: Introduce la cantidad visible
+    Regularize stock: Regularizar stock
+</i18n>
diff --git a/src/composables/useState.js b/src/composables/useState.js
index 1c797e992..6ad8eb22c 100644
--- a/src/composables/useState.js
+++ b/src/composables/useState.js
@@ -25,6 +25,7 @@ export function useState() {
                 lang: user.value.lang,
                 darkMode: user.value.darkMode,
                 companyFk: user.value.companyFk,
+                warehouseFk: user.value.warehouseFk,
             };
         });
     }
@@ -37,6 +38,7 @@ export function useState() {
             lang: data.lang,
             darkMode: data.darkMode,
             companyFk: data.companyFk,
+            warehouseFk: data.warehouseFk,
         };
     }
 
diff --git a/src/composables/useUserConfig.js b/src/composables/useUserConfig.js
index e05d7fb5c..a33779be7 100644
--- a/src/composables/useUserConfig.js
+++ b/src/composables/useUserConfig.js
@@ -12,6 +12,7 @@ export function useUserConfig() {
             const user = state.getUser().value;
             user.darkMode = data.darkMode;
             user.companyFk = data.companyFk;
+            user.warehouseFk = data.warehouseFk;
             state.setUser(user);
 
             return data;
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 1a7a4c27e..ea8769c58 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -1060,6 +1060,25 @@ export default {
             totalEntries: 'Total entries',
         },
     },
+    item: {
+        pageTitles: {
+            items: 'Items',
+            list: 'List',
+            diary: 'Diary',
+            tags: 'Tags',
+        },
+        descriptor: {
+            item: 'Item',
+            buyer: 'Buyer',
+            color: 'Color',
+            category: 'Category',
+            stems: 'Stems',
+            visible: 'Visible',
+            available: 'Available',
+            warehouseText: 'Calculated on the warehouse of { warehouseName }',
+            itemDiary: 'Item diary',
+        },
+    },
     components: {
         topbar: {},
         userPanel: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 83de42ee0..9f407ab0b 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -1060,6 +1060,25 @@ export default {
             totalEntries: 'Ent. totales',
         },
     },
+    item: {
+        pageTitles: {
+            items: 'Artículos',
+            list: 'Listado',
+            diary: 'Histórico',
+            tags: 'Etiquetas',
+        },
+        descriptor: {
+            item: 'Artículo',
+            buyer: 'Comprador',
+            color: 'Color',
+            category: 'Categoría',
+            stems: 'Tallos',
+            visible: 'Visible',
+            available: 'Disponible',
+            warehouseText: 'Calculado sobre el almacén de { warehouseName }',
+            itemDiary: 'Registro de compra-venta',
+        },
+    },
     components: {
         topbar: {},
         userPanel: {
diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue
new file mode 100644
index 000000000..57c3a434d
--- /dev/null
+++ b/src/pages/Item/Card/ItemCard.vue
@@ -0,0 +1,25 @@
+<script setup>
+import LeftMenu from 'components/LeftMenu.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import ItemDescriptor from './ItemDescriptor.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+
+const stateStore = useStateStore();
+</script>
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <ItemDescriptor />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <VnSubToolbar />
+
+            <div class="q-pa-md"><RouterView></RouterView></div>
+        </QPage>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
new file mode 100644
index 000000000..e5183779b
--- /dev/null
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -0,0 +1,260 @@
+<script setup>
+import { computed, ref, onMounted } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+
+import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import RegularizeStockForm from 'components/RegularizeStockForm.vue';
+
+import { useState } from 'src/composables/useState';
+import useCardDescription from 'src/composables/useCardDescription';
+import { useSession } from 'src/composables/useSession';
+import axios from 'axios';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+    summary: {
+        type: Object,
+        default: null,
+    },
+    dated: {
+        type: String,
+        default: null,
+    },
+});
+
+const quasar = useQuasar();
+const route = useRoute();
+const router = useRouter();
+const { t } = useI18n();
+const { getToken } = useSession();
+const state = useState();
+const user = state.getUser();
+
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+const regularizeStockFormDialog = ref(null);
+const item = ref(null);
+const available = ref(null);
+const visible = ref(null);
+const _warehouseFk = ref(null);
+const warehouseText = ref(null);
+const warehouseFk = computed({
+    get() {
+        return _warehouseFk.value;
+    },
+    set(val) {
+        _warehouseFk.value = val;
+        if (val) {
+            updateStock();
+            getWarehouseName(val);
+        }
+    },
+});
+const showWarehouseIconTooltip = ref(true);
+
+onMounted(() => {
+    warehouseFk.value = user.value.warehouseFk;
+});
+
+function getItemAvatar() {
+    const token = getToken();
+    return `/api/Images/catalog/200x200/${entityId.value}/download?access_token=${token}`;
+}
+
+const data = ref(useCardDescription());
+const setData = (entity) => {
+    if (!entity) return;
+    data.value = useCardDescription(entity.name, entity.id);
+};
+
+const getWarehouseName = async (warehouseFk) => {
+    try {
+        showWarehouseIconTooltip.value = false;
+
+        const filter = {
+            where: { id: warehouseFk },
+        };
+
+        const { data } = await axios.get('Warehouses/findOne', { filter });
+
+        warehouseText.value = t('item.descriptor.warehouseText', {
+            warehouseName: data.name,
+        });
+
+        showWarehouseIconTooltip.value = true;
+    } catch (err) {
+        console.error('Error finding warehouse');
+    }
+};
+
+const updateStock = async () => {
+    try {
+        available.value = null;
+        visible.value = null;
+
+        const params = {
+            warehouseFk: warehouseFk.value,
+            dated: $props.dated,
+        };
+
+        const { data } = await axios.get(`Items/${entityId.value}/getVisibleAvailable`, {
+            params,
+        });
+
+        available.value = data.available;
+        visible.value = data.visible;
+    } catch (err) {
+        console.error('Error updating stock');
+    }
+};
+
+const openRegularizeStockForm = () => {
+    regularizeStockFormDialog.value.show();
+};
+
+const cloneItem = async () => {
+    try {
+        const { data } = await axios.post(`Items/${entityId.value}/clone`);
+        router.push({ name: 'ItemTags', params: { id: data.id } });
+    } catch (err) {
+        console.error('Error cloning item');
+    }
+};
+
+const openCloneDialog = async () => {
+    quasar
+        .dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t("All it's properties will be copied"),
+                message: t('Do you want to clone this item?'),
+            },
+        })
+        .onOk(async () => {
+            await cloneItem();
+        });
+};
+</script>
+
+<template>
+    <CardDescriptor
+        data-key="ItemData"
+        module="Item"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        :summary="$props.summary"
+        :url="`Items/${entityId}/getCard`"
+        @on-fetch="
+            (data) => {
+                item = data;
+                setData(data);
+            }
+        "
+    >
+        <template #menu="{}">
+            <QItem v-ripple clickable @click="openRegularizeStockForm()">
+                <QItemSection>
+                    {{ t('Regularize stock') }}
+                    <QDialog ref="regularizeStockFormDialog">
+                        <RegularizeStockForm
+                            :item-fk="entityId"
+                            :warehouse-fk="warehouseFk"
+                            @on-data-saved="updateStock()"
+                        />
+                    </QDialog>
+                </QItemSection>
+            </QItem>
+            <QItem v-ripple clickable @click="openCloneDialog()">
+                <QItemSection>
+                    {{ t('Clone') }}
+                </QItemSection>
+            </QItem>
+        </template>
+        <template #before>
+            <QImg :src="getItemAvatar()" class="photo">
+                <template #error>
+                    <div
+                        class="absolute-full picture text-center q-pa-md flex flex-center"
+                    >
+                        <div>
+                            <div class="text-grey-5" style="opacity: 0.4; font-size: 5vh">
+                                <QIcon name="vn:item" />
+                            </div>
+                            <div class="text-grey-5" style="opacity: 0.4">
+                                {{ t('item.descriptor.item') }}
+                            </div>
+                        </div>
+                    </div>
+                </template>
+            </QImg>
+            <div class="row justify-between full-width bg-primary">
+                <div class="col column items-center">
+                    <span class="text-uppercase">
+                        {{ t('item.descriptor.visible') }}
+                    </span>
+                    <span class="text-weight-bold text-h5">{{ visible }}</span>
+                </div>
+                <div class="col column items-center">
+                    <span class="text-uppercase">
+                        {{ t('item.descriptor.available') }}
+                    </span>
+                    <span class="text-weight-bold text-h5">{{ available }}</span>
+                </div>
+                <div class="col column items-center justify-center">
+                    <QIcon name="info" class="cursor-pointer" size="md">
+                        <QTooltip>{{ warehouseText }}</QTooltip>
+                    </QIcon>
+                </div>
+            </div>
+        </template>
+        <template #body="{ entity }">
+            <VnLv :label="t('item.descriptor.buyer')">
+                <template #value>
+                    <span class="link">
+                        {{ t('item.descriptor.buyer') }}
+                        <WorkerDescriptorProxy :id="entity.itemType?.worker?.id" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv :label="t('item.descriptor.color')" :value="entity.value5"> </VnLv>
+            <VnLv :label="t('item.descriptor.color')" :value="entity.value6" />
+            <VnLv :label="t('item.descriptor.stems')" :value="entity.value7" />
+        </template>
+        <template #actions="{}">
+            <QCardActions>
+                <QBtn
+                    :to="{ name: 'ItemDiary' }"
+                    size="md"
+                    icon="vn:transaction"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('item.descriptor.itemDiary') }}</QTooltip>
+                </QBtn>
+            </QCardActions>
+        </template>
+    </CardDescriptor>
+</template>
+
+<i18n>
+es:
+    Regularize stock: Regularizar stock
+    Clone: Clonar
+    All it's properties will be copied: Todas sus propiedades serán copiadas
+    Do you want to clone this item?: ¿Desea clonar este artículo?
+</i18n>
+
+<style lang="scss" scoped>
+.photo {
+    height: 256px;
+}
+</style>
diff --git a/src/pages/Item/Card/ItemDescriptorProxy.vue b/src/pages/Item/Card/ItemDescriptorProxy.vue
new file mode 100644
index 000000000..58471dc83
--- /dev/null
+++ b/src/pages/Item/Card/ItemDescriptorProxy.vue
@@ -0,0 +1,26 @@
+<script setup>
+import ItemDescriptor from './ItemDescriptor.vue';
+import ItemSummaryDialog from './ItemSummaryDialog.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+    dated: {
+        type: String,
+        default: null,
+    },
+});
+</script>
+
+<template>
+    <QPopupProxy>
+        <ItemDescriptor
+            v-if="$props.id"
+            :id="$props.id"
+            :summary="ItemSummaryDialog"
+            :dated="dated"
+        />
+    </QPopupProxy>
+</template>
diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
new file mode 100644
index 000000000..21249349f
--- /dev/null
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -0,0 +1 @@
+<template>Item diary (CREAR CUANDO SE DESARROLLE EL MODULO DE ITEMS)</template>
diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
new file mode 100644
index 000000000..567fbf32b
--- /dev/null
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -0,0 +1 @@
+<template>Item summary</template>
diff --git a/src/pages/Item/Card/ItemSummaryDialog.vue b/src/pages/Item/Card/ItemSummaryDialog.vue
new file mode 100644
index 000000000..4af617fd9
--- /dev/null
+++ b/src/pages/Item/Card/ItemSummaryDialog.vue
@@ -0,0 +1,5 @@
+<template>
+    <QDialog
+        >Item summary dialog (A DESARROLLAR CUANDO SE CREE EL MODULO DE ITEMS)</QDialog
+    >
+</template>
diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
new file mode 100644
index 000000000..95f4380e4
--- /dev/null
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -0,0 +1 @@
+<template>Item tags (CREAR CUANDO SE DESARROLLE EL MODULO DE ITEMS)</template>
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
new file mode 100644
index 000000000..49a5dbb64
--- /dev/null
+++ b/src/pages/Item/ItemList.vue
@@ -0,0 +1 @@
+<template>Item list</template>
diff --git a/src/pages/Item/ItemMain.vue b/src/pages/Item/ItemMain.vue
new file mode 100644
index 000000000..c1f2a31db
--- /dev/null
+++ b/src/pages/Item/ItemMain.vue
@@ -0,0 +1,18 @@
+<script setup>
+import LeftMenu from 'src/components/LeftMenu.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+
+const stateStore = useStateStore();
+</script>
+
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit text-grey-8">
+            <LeftMenu />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <RouterView></RouterView>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 7baa8ded5..06438349b 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -7,6 +7,7 @@ import { useQuasar } from 'quasar';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import SupplierConsumptionFilter from './SupplierConsumptionFilter.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
 import { toDate } from 'src/filters';
 import { dashIfEmpty } from 'src/filters';
@@ -174,7 +175,10 @@ onMounted(async () => {
                     <QTd no-hover>{{ row.invoiceNumber }}</QTd>
                 </QTr>
                 <QTr v-for="(buy, index) in row.buys" :key="index">
-                    <QTd no-hover> {{ buy.itemName }}</QTd>
+                    <QTd no-hover>
+                        <QBtn flat color="blue" dense>{{ buy.itemName }}</QBtn>
+                        <ItemDescriptorProxy :id="buy.itemFk" />
+                    </QTd>
 
                     <QTd no-hover>
                         <span>{{ buy.subName }}</span>
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index cc5034959..84a26798d 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -1,3 +1,4 @@
+import Item from './item';
 import Customer from './customer';
 import Ticket from './ticket';
 import Claim from './claim';
@@ -14,6 +15,7 @@ import Department from './department';
 import Entry from './entry';
 
 export default [
+    Item,
     Customer,
     Ticket,
     Claim,
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
new file mode 100644
index 000000000..d3462e15c
--- /dev/null
+++ b/src/router/modules/item.js
@@ -0,0 +1,70 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/item',
+    name: 'Item',
+    meta: {
+        title: 'items',
+        icon: 'vn:item',
+    },
+    component: RouterView,
+    redirect: { name: 'ItemMain' },
+    menus: {
+        main: [],
+        card: [],
+    },
+    children: [
+        {
+            path: '',
+            name: 'ItemMain',
+            component: () => import('src/pages/Item/ItemMain.vue'),
+            redirect: { name: 'Itemlist' },
+            children: [
+                {
+                    path: 'list',
+                    name: 'ItemList',
+                    meta: {
+                        title: 'list',
+                        icon: 'view_list',
+                    },
+                    component: () => import('src/pages/Item/ItemList.vue'),
+                },
+            ],
+        },
+        {
+            name: 'ItemCard',
+            path: ':id',
+            component: () => import('src/pages/Item/Card/ItemCard.vue'),
+            redirect: { name: 'ItemSummary' },
+            children: [
+                {
+                    name: 'ItemSummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'launch',
+                    },
+                    component: () => import('src/pages/Item/Card/ItemSummary.vue'),
+                },
+                {
+                    path: 'diary',
+                    name: 'ItemDiary',
+                    meta: {
+                        title: 'diary',
+                        icon: 'vn:transaction',
+                    },
+                    component: () => import('src/pages/Item/Card/ItemDiary.vue'),
+                },
+                {
+                    path: 'tags',
+                    name: 'ItemTags',
+                    meta: {
+                        title: 'Tags',
+                        icon: 'vn:tags',
+                    },
+                    component: () => import('src/pages/Item/Card/ItemTags.vue'),
+                },
+            ],
+        },
+    ],
+};
diff --git a/src/router/routes.js b/src/router/routes.js
index 6a2fa6a97..d1027955f 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -1,3 +1,4 @@
+import item from './modules/item';
 import customer from './modules/customer';
 import ticket from './modules/ticket';
 import claim from './modules/claim';
@@ -51,6 +52,7 @@ const routes = [
                 component: () => import('../pages/Dashboard/DashboardMain.vue'),
             },
             // Module routes
+            item,
             customer,
             ticket,
             claim,
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 2eda6f686..568063d1d 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -7,19 +7,19 @@ import routes from 'src/router/modules';
 
 export const useNavigationStore = defineStore('navigationStore', () => {
     const modules = [
-        'customer',
-        'claim',
-        'ticket',
-        'invoiceOut',
-        'invoiceIn',
-        'worker',
         'shelving',
         'order',
-        'wagon',
-        'route',
-        'supplier',
-        'travel',
+        'customer',
         'entry',
+        'travel',
+        'invoiceOut',
+        'invoiceIn',
+        'supplier',
+        'claim',
+        'route',
+        'ticket',
+        'worker',
+        'wagon',
     ];
     const pinnedModules = ref([]);
     const role = useRole();

From 9d90a3808f0c4e41b71e474791e0b9c24e763f6b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 26 Jan 2024 16:40:59 -0300
Subject: [PATCH 072/111] apply item descriptor in OrderCatalogItem

---
 src/pages/Order/Card/OrderCatalogItem.vue | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogItem.vue b/src/pages/Order/Card/OrderCatalogItem.vue
index 140a4c349..5056e0523 100644
--- a/src/pages/Order/Card/OrderCatalogItem.vue
+++ b/src/pages/Order/Card/OrderCatalogItem.vue
@@ -1,10 +1,13 @@
 <script setup>
-import { useSession } from 'composables/useSession';
-import VnLv from 'components/ui/VnLv.vue';
-import { useI18n } from 'vue-i18n';
-import OrderCatalogItemDialog from 'pages/Order/Card/OrderCatalogItemDialog.vue';
-import toCurrency from '../../../filters/toCurrency';
 import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnLv from 'components/ui/VnLv.vue';
+import OrderCatalogItemDialog from 'pages/Order/Card/OrderCatalogItemDialog.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+
+import { useSession } from 'composables/useSession';
+import toCurrency from '../../../filters/toCurrency';
 
 const DEFAULT_PRICE_KG = 0;
 
@@ -42,7 +45,10 @@ const dialog = ref(null);
                 </div>
             </div>
             <div class="content">
-                <span class="link">{{ item.name }}</span>
+                <span class="link">
+                    {{ item.name }}
+                    <ItemDescriptorProxy :id="item.id" />
+                </span>
                 <p class="subName">{{ item.subName }}</p>
                 <template v-for="index in 4" :key="`tag-${index}`">
                     <VnLv
@@ -72,7 +78,8 @@ const dialog = ref(null);
                         </QIcon>
                     </div>
                     <p v-if="item.priceKg" class="price-kg">
-                        {{ t('price-kg') }} {{ toCurrency(item.priceKg) || DEFAULT_PRICE_KG }}
+                        {{ t('price-kg') }}
+                        {{ toCurrency(item.priceKg) || DEFAULT_PRICE_KG }}
                     </p>
                 </div>
             </div>

From 8c9db8b3ae320127aa2eac99bb7571c6481d79fc Mon Sep 17 00:00:00 2001
From: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Date: Mon, 29 Jan 2024 07:16:39 +0000
Subject: [PATCH 073/111] refs #6280 test: remove comments

---
 test/cypress/integration/VnLocation.spec.js | 22 ++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/cypress/integration/VnLocation.spec.js b/test/cypress/integration/VnLocation.spec.js
index 20b18700f..15226b166 100644
--- a/test/cypress/integration/VnLocation.spec.js
+++ b/test/cypress/integration/VnLocation.spec.js
@@ -8,18 +8,18 @@ describe('VnLocation', () => {
         cy.waitForElement('.q-card');
     });
 
-    // it('Show all options', function() {
-    //   cy.get(inputLocation).click();
-    //   cy.get(locationOptions).should('have.length',5)
-    //   // cy.get(':nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon').click()
-    // });
+    it('Show all options', function() {
+      cy.get(inputLocation).click();
+      cy.get(locationOptions).should('have.length',5)
+      // cy.get(':nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon').click()
+    });
 
-    // it('input filter location as "al"', function() {
-    //     cy.get(inputLocation).click();
-    //     cy.get(inputLocation).clear();
-    //     cy.get(inputLocation).type('al');
-    //     cy.get(locationOptions).should('have.length',3);
-    // });
+    it('input filter location as "al"', function() {
+        cy.get(inputLocation).click();
+        cy.get(inputLocation).clear();
+        cy.get(inputLocation).type('al');
+        cy.get(locationOptions).should('have.length',3);
+    });
     it('input filter location as "ecuador"', function() {
         cy.get(inputLocation).click();
         cy.get(inputLocation).clear();

From a02b534cfa6ff64ba69aa711aa6eb35ab5859736 Mon Sep 17 00:00:00 2001
From: JAVIER SEGARRA MARTINEZ <jsegarra@verdnatura.es>
Date: Mon, 29 Jan 2024 07:20:40 +0000
Subject: [PATCH 074/111] refs #6280 test: remove comments

---
 test/cypress/integration/VnLocation.spec.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/cypress/integration/VnLocation.spec.js b/test/cypress/integration/VnLocation.spec.js
index 15226b166..fe0ecee68 100644
--- a/test/cypress/integration/VnLocation.spec.js
+++ b/test/cypress/integration/VnLocation.spec.js
@@ -10,8 +10,7 @@ describe('VnLocation', () => {
 
     it('Show all options', function() {
       cy.get(inputLocation).click();
-      cy.get(locationOptions).should('have.length',5)
-      // cy.get(':nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(2) > .q-icon').click()
+      cy.get(locationOptions).should('have.length',5);
     });
 
     it('input filter location as "al"', function() {

From 70e912fc924e2a8260807b74968f509ea3dbea26 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 29 Jan 2024 08:38:55 +0100
Subject: [PATCH 076/111] refs #6681 try fix jenkins

---
 Jenkinsfile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 437332c4e..f6382d62b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,7 @@ pipeline {
                 NODE_ENV = ""
             }
             steps {
-                nodejs('node-v18') {
+                nodejs('node-v20') {
                     sh 'npm install --no-audit --prefer-offline'
                 }
             }
@@ -47,7 +47,7 @@ pipeline {
             parallel {
                 stage('Frontend') {
                     steps {
-                        nodejs('node-v18') {
+                        nodejs('node-v20') {
                             sh 'npm run test:unit:ci'
                         }
                     }
@@ -63,7 +63,7 @@ pipeline {
                 CREDENTIALS = credentials('docker-registry')
             }
             steps {
-                nodejs('node-v18') {
+                nodejs('node-v20') {
                     sh 'quasar build'
                 }
                 dockerBuild()
@@ -96,4 +96,4 @@ pipeline {
             }
         }
     }
-}
\ No newline at end of file
+}

From 935211a71f4f7c3a41c0799e9b4ce8ae9880762d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 29 Jan 2024 08:41:38 +0100
Subject: [PATCH 077/111] refs #6681 try fix jenkins

---
 Jenkinsfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f6382d62b..9dd72ccc3 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -31,7 +31,7 @@ pipeline {
                 NODE_ENV = ""
             }
             steps {
-                nodejs('node-v20') {
+                nodejs('node-v18') {
                     sh 'npm install --no-audit --prefer-offline'
                 }
             }
@@ -47,7 +47,7 @@ pipeline {
             parallel {
                 stage('Frontend') {
                     steps {
-                        nodejs('node-v20') {
+                        nodejs('node-v18') {
                             sh 'npm run test:unit:ci'
                         }
                     }
@@ -63,7 +63,7 @@ pipeline {
                 CREDENTIALS = credentials('docker-registry')
             }
             steps {
-                nodejs('node-v20') {
+                nodejs('node-v18') {
                     sh 'quasar build'
                 }
                 dockerBuild()

From 0edfe24a8588b982136c4c66c09b880b66c80270 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 29 Jan 2024 10:25:59 +0100
Subject: [PATCH 078/111] fix: refs #6654 fix css

---
 src/components/ui/VnSubToolbar.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index 7f30c9921..ba5705122 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -24,10 +24,15 @@ onUnmounted(() => {
         </slot>
     </QToolbar>
 </template>
-<style scoped>
+<style lang="scss" scoped>
 .sticky {
     position: sticky;
-    top: 60px;
+    top: 62px;
     z-index: 1;
 }
+@media (max-width: $breakpoint-xs) {
+    .sticky {
+        top: 90px;
+    }
+}
 </style>

From a89748827f45f621afae11f63345640a6ba427c3 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 29 Jan 2024 11:42:08 +0100
Subject: [PATCH 079/111] refs #6677 url

---
 src/components/FetchData.vue                  |  3 +-
 src/components/common/VnSelectFilter.vue      | 72 +++++++++++++++----
 src/pages/Claim/Card/ClaimDevelopment.vue     |  4 +-
 .../InvoiceIn/Card/InvoiceInBasicData.vue     | 45 ++++--------
 4 files changed, 75 insertions(+), 49 deletions(-)

diff --git a/src/components/FetchData.vue b/src/components/FetchData.vue
index 137f751db..4f5d7a57d 100644
--- a/src/components/FetchData.vue
+++ b/src/components/FetchData.vue
@@ -45,7 +45,7 @@ onMounted(async () => {
 async function fetch(fetchFilter = {}) {
     try {
         const filter = Object.assign(fetchFilter, $props.filter); // eslint-disable-line vue/no-dupe-keys
-        if ($props.where) filter.where = $props.where;
+        if ($props.where && !fetchFilter.where) filter.where = $props.where;
         if ($props.sortBy) filter.order = $props.sortBy;
         if ($props.limit) filter.limit = $props.limit;
 
@@ -54,6 +54,7 @@ async function fetch(fetchFilter = {}) {
         });
 
         emit('onFetch', data);
+        return data;
     } catch (e) {
         //
     }
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 182ec8e16..5735bf370 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -1,8 +1,8 @@
 <script setup>
 import FetchData from 'src/components/FetchData.vue';
+import { onMounted } from 'vue';
 import { ref, toRefs, computed, watch } from 'vue';
 const emit = defineEmits(['update:modelValue', 'update:options']);
-const dataRef = ref();
 
 const $props = defineProps({
     modelValue: {
@@ -37,12 +37,29 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    fields: {
+        type: Array,
+        default: null,
+    },
+    where: {
+        type: Object,
+        default: null,
+    },
+    sortBy: {
+        type: String,
+        default: null,
+    },
+    limit: {
+        type: Number,
+        default: 30,
+    },
 });
 
-const { optionLabel, options } = toRefs($props);
+const { optionLabel, optionValue, options, modelValue } = toRefs($props);
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
+const dataRef = ref();
 
 const value = computed({
     get() {
@@ -57,8 +74,12 @@ function setOptions(data) {
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
 }
-setOptions(options.value);
-const filter = (val, options) => {
+onMounted(() => {
+    setOptions(options.value);
+    if ($props.url && $props.modelValue) fetchFilter($props.modelValue);
+});
+
+async function filter(val, options) {
     const search = val.toString().toLowerCase();
 
     if (!search) return options;
@@ -76,14 +97,30 @@ const filter = (val, options) => {
 
         return id == search || optionLabel.includes(search);
     });
-};
+}
 
-const filterHandler = (val, update) => {
+async function fetchFilter(val) {
+    console.log('ENTRY PA', dataRef.value);
+    if (!$props.url || !dataRef.value) return;
+
+    const { fields, sortBy, limit } = $props;
+    let key = optionLabel.value;
+
+    if (new RegExp(/\d/g).test(val)) key = optionValue.value;
+
+    const where = { [key]: { like: `%${val}%` } };
+    return dataRef.value.fetch({ fields, where, order: sortBy, limit });
+}
+
+async function filterHandler(val, update) {
     update(
-        () => {
-            if ($props.url) return;
-            if ($props.defaultFilter)
-                myOptions.value = filter(val, myOptionsOriginal.value);
+        async () => {
+            if (!$props.defaultFilter) return;
+            if ($props.url) {
+                myOptions.value = await fetchFilter(val);
+                return;
+            }
+            myOptions.value = await filter(val, myOptionsOriginal.value);
         },
         (ref) => {
             if (val !== '' && ref.options.length > 0) {
@@ -92,25 +129,34 @@ const filterHandler = (val, update) => {
             }
         }
     );
-};
+}
 
 watch(options, (newValue) => {
+    console.log(newValue);
     setOptions(newValue);
 });
+
+watch(modelValue, (newValue) => {
+    if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
+        fetchFilter(newValue);
+});
 </script>
 
 <template>
     <FetchData
-        v-if="$props.url"
         ref="dataRef"
         :url="$props.url"
         @on-fetch="(data) => setOptions(data)"
-        auto-load
+        :where="where || { [optionValue]: value }"
+        :limit="limit || 30"
+        :order-by="orderBy"
+        :fields="fields"
     />
     <QSelect
         v-model="value"
         :options="myOptions"
         :option-label="optionLabel"
+        :option-value="optionValue"
         v-bind="$attrs"
         emit-value
         map-options
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index 0b740cf64..d5a20b89f 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -182,8 +182,8 @@ const columns = computed(() => [
                                         </QItemLabel>
                                     </QItemSection>
                                 </QItem>
-                            </template>
-                        </VnSelectFilter>
+                            </template> </VnSelectFilter
+                        >s
                     </QTd>
                 </template>
                 <template #item="props">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 75c93694d..2f8435166 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -4,10 +4,12 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'src/composables/useArrayData';
-
 import { downloadFile } from 'src/composables/downloadFile';
+
 import FormModel from 'components/FormModel.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import FetchData from 'src/components/FetchData.vue';
+
 import axios from 'axios';
 
 const quasar = useQuasar();
@@ -20,9 +22,6 @@ const arrayData = useArrayData('InvoiceIn');
 const invoiceIn = computed(() => arrayData.store.data);
 const userConfig = ref(null);
 
-const suppliers = ref([]);
-const suppliersRef = ref();
-const suppliersRefFilter = ref({ fields: ['id', 'nickname'], limit: 30 });
 const currencies = ref([]);
 const currenciesRef = ref();
 const companies = ref([]);
@@ -130,31 +129,13 @@ async function upsert() {
         });
     }
 }
-
-function supplierRefFilter(val) {
-    let where = { limit: 30 };
-    let params = {};
-    let key = 'nickname';
-
-    if (new RegExp(/\d/g).test(val)) {
-        key = 'id';
-    }
-    params = { [key]: { like: `%${val}%` } };
-    where = Object.assign(where, params);
-    suppliersRef.value.fetch({ where });
-}
 </script>
 <template>
-    <!-- <FetchData
-        ref="suppliersRef"
-        url="Suppliers"
-        @on-fetch="(data) => (suppliers = data)"
-    /> -->
-    <!-- <FetchData
+    <FetchData
         ref="currenciesRef"
         url="Currencies"
         :filter="{ fields: ['id', 'code'] }"
-        order="code"
+        sort-by="code"
         @on-fetch="(data) => (currencies = data)"
         auto-load
     />
@@ -162,7 +143,7 @@ function supplierRefFilter(val) {
         ref="companiesRef"
         url="Companies"
         :filter="{ fields: ['id', 'code'] }"
-        order="code"
+        sort-by="code"
         @on-fetch="(data) => (companies = data)"
         auto-load
     />
@@ -170,7 +151,7 @@ function supplierRefFilter(val) {
         ref="dmsTypesRef"
         url="DmsTypes"
         :filter="{ fields: ['id', 'name'] }"
-        order="name"
+        sort-by="name"
         @on-fetch="(data) => (dmsTypes = data)"
         auto-load
     />
@@ -178,7 +159,7 @@ function supplierRefFilter(val) {
         ref="warehousesRef"
         url="Warehouses"
         :filter="{ fields: ['id', 'name'] }"
-        order="name"
+        sort-by="name"
         @on-fetch="(data) => (warehouses = data)"
         auto-load
     />
@@ -192,7 +173,7 @@ function supplierRefFilter(val) {
         url="UserConfigs/getUserConfig"
         @on-fetch="(data) => (userConfig = data)"
         auto-load
-    /> -->
+    />
     <FormModel v-if="invoiceIn" :url="`InvoiceIns/${route.params.id}`" model="invoiceIn">
         <template #form="{ data }">
             <div class="row q-gutter-md q-mb-md">
@@ -200,12 +181,11 @@ function supplierRefFilter(val) {
                     <VnSelectFilter
                         :label="t('supplierFk')"
                         v-model="data.supplierFk"
-                        option-value="id
-                        "
+                        option-value="id"
                         option-label="nickname"
                         url="Suppliers"
-                        :filter="{ fields: ['id', 'code'], order: 'code' }"
-                        @update-options="(data) => (suppliersRef = data)"
+                        :fields="['id', 'nickname']"
+                        sort-by="nickname"
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
@@ -416,7 +396,6 @@ function supplierRefFilter(val) {
             <div class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <VnSelectFilter
-                        url="Currencies"
                         :label="t('Currency')"
                         v-model="data.currencyFk"
                         :options="currencies"

From 324d6da3a3320d5167593b8e4608699daa0a6fc2 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 29 Jan 2024 11:48:18 +0100
Subject: [PATCH 080/111] refs #6664 claimfix

---
 src/pages/Claim/Card/ClaimAction.vue | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index 371cb015f..59409e432 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -146,8 +146,7 @@ async function onUpdateGreugeAccept() {
     ).data.id;
     const freightPickUpPrice =
         (await axios.get(`GreugeConfigs/findOne`)).data.freightPickUpPrice *
-        +multiplicatorValue.value;
-    console.log(freightPickUpPrice);
+        multiplicatorValue.value;
     await axios.post(`Greuges`, {
         clientFk: claim.value.clientFk,
         description: `${t('ClaimGreugeDescription')} ${claimId}`.toUpperCase(),
@@ -474,9 +473,6 @@ async function importToNewRefundTicket() {
 .mana {
     float: inline-start;
 }
-.vn-card {
-    background-color: blue($color: #000000);
-}
 </style>
 <i18n>
 en:

From 5e296869a1a91668402dda8d6e5853fb7666362b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 29 Jan 2024 08:59:20 -0300
Subject: [PATCH 081/111] More improvements

---
 src/components/ui/CardDescriptor.vue          |  3 ++-
 .../Supplier/Card/SupplierDescriptor.vue      | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 9571c742e..238c12df5 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -81,6 +81,7 @@ function viewSummary(id) {
     <div class="descriptor">
         <template v-if="entity">
             <div class="header bg-primary q-pa-sm justify-between">
+                <slot name="header-extra-action" />
                 <QBtn
                     @click.stop="viewSummary(entity.id)"
                     round
@@ -118,7 +119,7 @@ function viewSummary(id) {
                     icon="more_vert"
                     round
                     size="md"
-                    v-if="slots.menu"
+                    :class="{ invisible: !slots.menu }"
                 >
                     <QTooltip>
                         {{ t('components.cardDescriptor.moreOptions') }}
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 5187708e4..104dad661 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -103,6 +103,22 @@ const getEntryQueryParams = (supplier) => {
         @on-fetch="setData"
         data-key="Supplier"
     >
+        <template #header-extra-action>
+            <QBtn
+                round
+                flat
+                dense
+                size="md"
+                icon="vn:supplier"
+                color="white"
+                class="link"
+                :to="{ name: 'SupplierList' }"
+            >
+                <QTooltip>
+                    {{ t('Go to module index') }}
+                </QTooltip>
+            </QBtn>
+        </template>
         <template #body="{ entity }">
             <VnLv :label="t('supplier.summary.taxNumber')" :value="entity.nif" />
             <VnLv label="Alias" :value="entity.nickname" />
@@ -142,7 +158,7 @@ const getEntryQueryParams = (supplier) => {
                     <QTooltip>{{ t('Go to client') }}</QTooltip>
                 </QBtn>
                 <QBtn
-                    :href="`${url}invoice-in/create`"
+                    :href="`${url}invoice-in/create?supplierFk=${entity.id}`"
                     size="md"
                     icon="vn:invoice-in-create"
                     color="primary"
@@ -159,4 +175,5 @@ es:
     All entries with current supplier: Todas las entradas con proveedor actual
     Go to client: Ir a cliente
     Create invoiceIn: Crear factura recibida
+    Go to module index: Ir al índice del módulo
 </i18n>

From 5c87cfc671306be30b26887c0d04da6b6e970531 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 29 Jan 2024 13:54:41 +0100
Subject: [PATCH 082/111] refs #6677 fix e2e

---
 test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
index 0013df343..7617a69d1 100644
--- a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
@@ -16,11 +16,12 @@ describe('InvoiceInBasicData', () => {
         cy.get(selects).eq(0).type('Bros');
         cy.get(selects).eq(0).type('{enter}');
 
+        cy.get('[title="Reset"]').click();
         cy.get(appendBtns).eq(0).click();
         cy.get('input').eq(2).type(4739);
         cy.saveCard();
 
-        cy.get(`${selects} input`).eq(0).invoke('val').should('eq', 'Bros nick');
+        cy.get(`${selects} input`).eq(0).invoke('val').should('eq', 'Plants nick');
         cy.get('input').eq(2).invoke('val').should('eq', '4739');
     });
 

From 66e119adc3e49a8f8f4a7c7f450514290cbdda8b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 30 Jan 2024 10:30:07 +0100
Subject: [PATCH 083/111] fix: refs #6654 btn responsive & replace toolbars

---
 src/components/ui/CardDescriptor.vue          |  2 -
 src/components/ui/VnSubToolbar.vue            |  4 +-
 src/composables/tMobile.js                    |  2 +-
 src/pages/Claim/Card/ClaimCard.vue            | 14 ----
 src/pages/Claim/Card/ClaimLines.vue           | 35 ++++-----
 src/pages/Route/RouteList.vue                 |  9 ++-
 .../Supplier/Card/SupplierConsumption.vue     | 73 +++++++++----------
 7 files changed, 58 insertions(+), 81 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 9571c742e..f33b33717 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -49,7 +49,6 @@ onMounted(async () => {
         () => $props.url,
         async (newUrl, lastUrl) => {
             if (newUrl == lastUrl) return;
-            entity.value = null;
             await getData();
         }
     );
@@ -62,7 +61,6 @@ async function getData() {
         skip: 0,
     });
     const { data } = await arrayData.fetch({ append: false, updateRouter: false });
-    entity.value = data;
     emit('onFetch', data);
 }
 const emit = defineEmits(['onFetch']);
diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index ba5705122..1a6549856 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -27,10 +27,10 @@ onUnmounted(() => {
 <style lang="scss" scoped>
 .sticky {
     position: sticky;
-    top: 62px;
+    top: 61px;
     z-index: 1;
 }
-@media (max-width: $breakpoint-xs) {
+@media (max-width: $breakpoint-sm) {
     .sticky {
         top: 90px;
     }
diff --git a/src/composables/tMobile.js b/src/composables/tMobile.js
index a6a000b81..61b8e87b4 100644
--- a/src/composables/tMobile.js
+++ b/src/composables/tMobile.js
@@ -4,5 +4,5 @@ import { useI18n } from 'vue-i18n';
 export function tMobile(...args) {
     const quasar = useQuasar();
     const { t } = useI18n();
-    if (!quasar.platform.is.mobile) return t(...args);
+    if (!quasar.screen.xs) return t(...args);
 }
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index b6c948c96..64cf736a9 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -1,27 +1,13 @@
 <script setup>
 import LeftMenu from 'components/LeftMenu.vue';
-import { getUrl } from 'composables/getUrl';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
-import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
 import ClaimDescriptor from './ClaimDescriptor.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
-const route = useRoute();
-const $props = defineProps({
-    id: {
-        type: Number,
-        required: false,
-        default: null,
-    },
-});
-const entityId = computed(() => {
-    return $props.id || route.params.id;
-});
 </script>
 <template>
     <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index e7f67bcc2..5190c9932 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -4,12 +4,11 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useRoute } from 'vue-router';
-import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
+import { useArrayData } from 'composables/useArrayData';
+import { toDate, toCurrency, toPercentage } from 'filters/index';
 import CrudModel from 'components/CrudModel.vue';
 import FetchData from 'components/FetchData.vue';
-
-import { toDate, toCurrency, toPercentage } from 'filters/index';
 import VnDiscount from 'components/common/vnDiscount.vue';
 import ClaimLinesImport from './ClaimLinesImport.vue';
 
@@ -158,23 +157,21 @@ function showImportDialog() {
 </script>
 <template>
     <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
-        <QToolbar>
-            <div class="row q-gutter-md">
-                <div>
-                    {{ t('Amount') }}
-                    <QChip :dense="$q.screen.lt.sm">
-                        {{ toCurrency(amount) }}
-                    </QChip>
-                </div>
-                <QSeparator dark vertical />
-                <div>
-                    {{ t('Amount Claimed') }}
-                    <QChip color="positive" :dense="$q.screen.lt.sm">
-                        {{ toCurrency(amountClaimed) }}
-                    </QChip>
-                </div>
+        <div class="row q-gutter-md">
+            <div>
+                {{ t('Amount') }}
+                <QChip :dense="$q.screen.lt.sm">
+                    {{ toCurrency(amount) }}
+                </QChip>
             </div>
-        </QToolbar>
+            <QSeparator dark vertical />
+            <div>
+                {{ t('Amount Claimed') }}
+                <QChip color="positive" :dense="$q.screen.lt.sm">
+                    {{ toCurrency(amountClaimed) }}
+                </QChip>
+            </div>
+        </div>
     </Teleport>
 
     <FetchData
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 591f723e9..2a72a8303 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -15,6 +15,7 @@ import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
 import { useQuasar } from 'quasar';
 import RouteSummaryDialog from 'pages/Route/Card/RouteSummaryDialog.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -228,8 +229,8 @@ function previewRoute(id) {
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencyList = data)" auto-load />
     <FetchData url="Vehicles" @on-fetch="(data) => (vehicleList = data)" auto-load />
     <QPage class="column items-center">
-        <QToolbar class="bg-vn-dark justify-end">
-            <div id="st-actions" class="q-pa-sm">
+        <VnSubToolbar class="bg-vn-dark justify-end">
+            <template #st-actions>
                 <QBtn
                     icon="vn:clone"
                     color="primary"
@@ -249,8 +250,8 @@ function previewRoute(id) {
                 >
                     <QTooltip>{{ t('Mark as served') }}</QTooltip>
                 </QBtn>
-            </div>
-        </QToolbar>
+            </template>
+        </VnSubToolbar>
         <div class="route-list">
             <VnPaginate
                 :key="refreshKey"
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 714499f63..e31a0e5cc 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -3,19 +3,19 @@ import { useRoute } from 'vue-router';
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-
+import axios from 'axios';
+import { useStateStore } from 'stores/useStateStore';
+import { usePrintService } from 'composables/usePrintService';
+import useNotify from 'src/composables/useNotify.js';
+import { toDate, toDateString } from 'src/filters';
+import { dashIfEmpty } from 'src/filters';
 import FetchData from 'components/FetchData.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 
-import { toDate, toDateString } from 'src/filters';
-import { dashIfEmpty } from 'src/filters';
-import { usePrintService } from 'composables/usePrintService';
-import useNotify from 'src/composables/useNotify.js';
-import axios from 'axios';
-
 const { t } = useI18n();
 const route = useRoute();
+const stateStore = useStateStore();
 const { openReport, sendEmail } = usePrintService();
 const quasar = useQuasar();
 const { notify } = useNotify();
@@ -88,9 +88,8 @@ const sendCampaignMetricsEmail = ({ address }) => {
     });
 };
 
-const calculateTotal = (buysArray) => {
-    return buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
-};
+const calculateTotal = (buysArray) =>
+    buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
 </script>
 
 <template>
@@ -104,35 +103,31 @@ const calculateTotal = (buysArray) => {
         :params="userParams"
         auto-load
     />
-    <QToolbar class="bg-vn-dark justify-end">
-        <div id="st-data">
-            <QBtn
-                v-if="userParams.from && userParams.to"
-                color="primary"
-                icon-right="picture_as_pdf"
-                no-caps
-                class="q-mr-md"
-                @click="openReportPdf()"
-            >
-                <QTooltip>
-                    {{ t('Open as PDF') }}
-                </QTooltip>
-            </QBtn>
-            <QBtn
-                v-if="userParams.from && userParams.to"
-                color="primary"
-                icon-right="email"
-                no-caps
-                @click="openSendEmailDialog()"
-            >
-                <QTooltip>
-                    {{ t('Send to email') }}
-                </QTooltip>
-            </QBtn>
-        </div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
+    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
+        <QBtn
+            v-if="userParams.from && userParams.to"
+            color="primary"
+            icon-right="picture_as_pdf"
+            no-caps
+            class="q-mr-md"
+            @click="openReportPdf()"
+        >
+            <QTooltip>
+                {{ t('Open as PDF') }}
+            </QTooltip>
+        </QBtn>
+        <QBtn
+            v-if="userParams.from && userParams.to"
+            color="primary"
+            icon-right="email"
+            no-caps
+            @click="openSendEmailDialog()"
+        >
+            <QTooltip>
+                {{ t('Send to email') }}
+            </QTooltip>
+        </QBtn>
+    </Teleport>
     <QPage class="column items-center q-pa-md">
         <QTable
             :rows="rows"

From adac3bc8953687b365d43706a1495382dba5ce8f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 30 Jan 2024 13:34:05 +0100
Subject: [PATCH 084/111] refs #6677 fix code

---
 src/components/common/VnSelectFilter.vue  | 4 +---
 src/pages/Claim/Card/ClaimDevelopment.vue | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 5735bf370..5b794d9e9 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -100,7 +100,6 @@ async function filter(val, options) {
 }
 
 async function fetchFilter(val) {
-    console.log('ENTRY PA', dataRef.value);
     if (!$props.url || !dataRef.value) return;
 
     const { fields, sortBy, limit } = $props;
@@ -132,7 +131,6 @@ async function filterHandler(val, update) {
 }
 
 watch(options, (newValue) => {
-    console.log(newValue);
     setOptions(newValue);
 });
 
@@ -148,7 +146,7 @@ watch(modelValue, (newValue) => {
         :url="$props.url"
         @on-fetch="(data) => setOptions(data)"
         :where="where || { [optionValue]: value }"
-        :limit="limit || 30"
+        :limit="limit"
         :order-by="orderBy"
         :fields="fields"
     />
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index d5a20b89f..0b740cf64 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -182,8 +182,8 @@ const columns = computed(() => [
                                         </QItemLabel>
                                     </QItemSection>
                                 </QItem>
-                            </template> </VnSelectFilter
-                        >s
+                            </template>
+                        </VnSelectFilter>
                     </QTd>
                 </template>
                 <template #item="props">

From 7e1fced429c112973fe0c5ff8d2ad9b217f3da4a Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 30 Jan 2024 10:20:40 -0300
Subject: [PATCH 085/111] WIP

---
 src/components/EditPictureForm.vue            | 82 +++++++++++++++++++
 src/pages/Item/Card/ItemDescriptor.vue        | 79 ++++++++++++++----
 .../Supplier/Card/SupplierDescriptor.vue      | 22 +++++
 3 files changed, 165 insertions(+), 18 deletions(-)
 create mode 100644 src/components/EditPictureForm.vue

diff --git a/src/components/EditPictureForm.vue b/src/components/EditPictureForm.vue
new file mode 100644
index 000000000..a1d994399
--- /dev/null
+++ b/src/components/EditPictureForm.vue
@@ -0,0 +1,82 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from './FormModelPopup.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const props = defineProps({});
+
+const { t } = useI18n();
+
+const editFormData = reactive({
+    uploadMethod: 'computer',
+    file: null,
+    quantity: null,
+});
+
+const options = [
+    { label: t('Select from computer'), value: 'computer' },
+    { label: t('Import from external URL'), value: 'URL' },
+];
+
+const onDataSaved = (data) => {
+    emit('onDataSaved', data);
+};
+</script>
+
+<template>
+    <!-- <FetchData
+        url="Warehouses"
+        @on-fetch="(data) => (warehousesOptions = data)"
+        auto-load
+    /> -->
+    <FormModelPopup
+        url-create="Items/regularize"
+        model="Items"
+        :title="t('Edit photo')"
+        :form-initial-data="editFormData"
+        @on-data-saved="onDataSaved($event)"
+    >
+        <template #form-inputs="{}">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QOptionGroup
+                        :options="options"
+                        type="radio"
+                        v-model="editFormData.uploadMethod"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QFile
+                        :label="t('entry.buys.file')"
+                        :multiple="false"
+                        v-model="editFormData.file"
+                        @update:model-value="onFileChange($event)"
+                        class="required"
+                    >
+                        <template #append>
+                            <QIcon name="vn:attach" class="cursor-pointer">
+                                <QTooltip>{{ t('Select a file') }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </QFile>
+                </div>
+            </VnRow>
+            <pre>{{ editFormData }}</pre>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    Edit photo: Editar foto
+    Select from computer: Seleccionar desde ordenador
+    Import from external URL: Importar desde URL externa
+</i18n>
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index e5183779b..f30104303 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -9,6 +9,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import RegularizeStockForm from 'components/RegularizeStockForm.vue';
+import EditPictureForm from 'components/EditPictureForm.vue';
 
 import { useState } from 'src/composables/useState';
 import useCardDescription from 'src/composables/useCardDescription';
@@ -43,6 +44,7 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 const regularizeStockFormDialog = ref(null);
+const editPhotoFormDialog = ref(null);
 const item = ref(null);
 const available = ref(null);
 const visible = ref(null);
@@ -122,6 +124,10 @@ const openRegularizeStockForm = () => {
     regularizeStockFormDialog.value.show();
 };
 
+const openEditPhotoForm = () => {
+    editPhotoFormDialog.value.show();
+};
+
 const cloneItem = async () => {
     try {
         const { data } = await axios.post(`Items/${entityId.value}/clone`);
@@ -181,30 +187,54 @@ const openCloneDialog = async () => {
             </QItem>
         </template>
         <template #before>
-            <QImg :src="getItemAvatar()" class="photo">
-                <template #error>
-                    <div
-                        class="absolute-full picture text-center q-pa-md flex flex-center"
-                    >
-                        <div>
-                            <div class="text-grey-5" style="opacity: 0.4; font-size: 5vh">
-                                <QIcon name="vn:item" />
-                            </div>
-                            <div class="text-grey-5" style="opacity: 0.4">
-                                {{ t('item.descriptor.item') }}
+            <div class="relative-position">
+                <QImg :src="getItemAvatar()" class="photo" style="position: relative">
+                    <template #error>
+                        <div
+                            class="absolute-full picture text-center q-pa-md flex flex-center"
+                        >
+                            <div>
+                                <div
+                                    class="text-grey-5"
+                                    style="opacity: 0.4; font-size: 5vh"
+                                >
+                                    <QIcon name="vn:item" />
+                                </div>
+                                <div class="text-grey-5" style="opacity: 0.4">
+                                    {{ t('item.descriptor.item') }}
+                                </div>
                             </div>
                         </div>
-                    </div>
-                </template>
-            </QImg>
-            <div class="row justify-between full-width bg-primary">
+                    </template>
+                </QImg>
+                <QBtn
+                    color="primary"
+                    size="lg"
+                    round
+                    class="edit-photo-btn"
+                    @click="openEditPhotoForm()"
+                >
+                    <QIcon name="edit" size="sm" />
+                    <QDialog ref="editPhotoFormDialog">
+                        <EditPictureForm />
+                    </QDialog>
+                </QBtn>
+            </div>
+
+            <div
+                class="row justify-between items-center full-width bg-primary"
+                style="height: 54px"
+            >
                 <div class="col column items-center">
-                    <span class="text-uppercase">
+                    <span class="text-uppercase" style="font-size: 11px">
                         {{ t('item.descriptor.visible') }}
                     </span>
                     <span class="text-weight-bold text-h5">{{ visible }}</span>
                 </div>
-                <div class="col column items-center">
+                <div
+                    class="col column items-center separation-borders"
+                    style="font-size: 11px"
+                >
                     <span class="text-uppercase">
                         {{ t('item.descriptor.available') }}
                     </span>
@@ -231,7 +261,7 @@ const openCloneDialog = async () => {
             <VnLv :label="t('item.descriptor.stems')" :value="entity.value7" />
         </template>
         <template #actions="{}">
-            <QCardActions>
+            <QCardActions class="row justify-center">
                 <QBtn
                     :to="{ name: 'ItemDiary' }"
                     size="md"
@@ -257,4 +287,17 @@ es:
 .photo {
     height: 256px;
 }
+
+.edit-photo-btn {
+    position: absolute;
+    right: 12px;
+    bottom: 12px;
+    z-index: 1;
+    cursor: pointer;
+}
+
+.separation-borders {
+    border-left: 1px solid #ffffff;
+    border-right: 1px solid #ffffff;
+}
 </style>
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 104dad661..83bad87d2 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -133,6 +133,26 @@ const getEntryQueryParams = (supplier) => {
             <VnLv :label="t('supplier.summary.payDay')" :value="entity.payDay" />
             <VnLv :label="t('supplier.summary.account')" :value="entity.account" />
         </template>
+        <template #icons="{ entity }">
+            <QCardActions class="q-gutter-x-md">
+                <QIcon
+                    v-if="!entity.isActive"
+                    name="vn:disabled"
+                    color="primary"
+                    size="xs"
+                >
+                    <QTooltip>{{ t('Inactive supplier') }}</QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="!entity.isSerious"
+                    name="vn:supplierfalse"
+                    color="primary"
+                    size="xs"
+                >
+                    <QTooltip>{{ t('Unverified supplier') }}</QTooltip>
+                </QIcon>
+            </QCardActions>
+        </template>
         <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
@@ -176,4 +196,6 @@ es:
     Go to client: Ir a cliente
     Create invoiceIn: Crear factura recibida
     Go to module index: Ir al índice del módulo
+    Inactive supplier: Proveedor inactivo
+    Unverified supplier: Proveedor no verificado
 </i18n>

From 3cfef87efb30cadf563bac79e5cfa99a11483bc8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 30 Jan 2024 21:54:14 -0300
Subject: [PATCH 086/111] upload file form WIP

---
 package-lock.json                  |   6 +
 package.json                       |   1 +
 src/components/EditPictureForm.vue | 344 +++++++++++++++++++++++++----
 src/i18n/en/index.js               |   3 +
 src/i18n/es/index.js               |   3 +
 5 files changed, 311 insertions(+), 46 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6a60c95c6..ce9c4d7c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,7 @@
                 "@quasar/extras": "^1.16.4",
                 "axios": "^1.4.0",
                 "chromium": "^3.0.3",
+                "croppie": "^2.6.5",
                 "pinia": "^2.1.3",
                 "quasar": "^2.12.0",
                 "validator": "^13.9.0",
@@ -3169,6 +3170,11 @@
                 "node": ">= 10"
             }
         },
+        "node_modules/croppie": {
+            "version": "2.6.5",
+            "resolved": "https://registry.npmjs.org/croppie/-/croppie-2.6.5.tgz",
+            "integrity": "sha512-IlChnVUGG5T3w2gRZIaQgBtlvyuYnlUWs2YZIXXR3H9KrlO1PtBT3j+ykxvy9eZIWhk+V5SpBmhCQz5UXKrEKQ=="
+        },
         "node_modules/cross-spawn": {
             "version": "7.0.3",
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
diff --git a/package.json b/package.json
index c4f5b828a..13297aaf4 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
         "@quasar/extras": "^1.16.4",
         "axios": "^1.4.0",
         "chromium": "^3.0.3",
+        "croppie": "^2.6.5",
         "pinia": "^2.1.3",
         "quasar": "^2.12.0",
         "validator": "^13.9.0",
diff --git a/src/components/EditPictureForm.vue b/src/components/EditPictureForm.vue
index a1d994399..d2b3df528 100644
--- a/src/components/EditPictureForm.vue
+++ b/src/components/EditPictureForm.vue
@@ -1,22 +1,38 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { reactive, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import FormModelPopup from './FormModelPopup.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
-const emit = defineEmits(['onDataSaved']);
+import Croppie from 'croppie/croppie';
+import 'croppie/croppie.css';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
 
 const props = defineProps({});
 
 const { t } = useI18n();
+const { notify } = useNotify();
 
-const editFormData = reactive({
+const editPhotoFormData = reactive({
     uploadMethod: 'computer',
     file: null,
-    quantity: null,
+    url: null,
+    viewportType: {
+        code: 'normal',
+        description: t('Normal'),
+        viewport: {
+            width: 400,
+            height: 400,
+        },
+        output: {
+            width: 1200,
+            height: 1200,
+        },
+    },
 });
 
 const options = [
@@ -24,59 +40,295 @@ const options = [
     { label: t('Import from external URL'), value: 'URL' },
 ];
 
-const onDataSaved = (data) => {
-    emit('onDataSaved', data);
+const viewportTypes = [
+    {
+        code: 'normal',
+        description: t('Normal'),
+        viewport: {
+            width: 400,
+            height: 400,
+        },
+        output: {
+            width: 1200,
+            height: 1200,
+        },
+    },
+    {
+        code: 'panoramic',
+        description: t('Panoramic'),
+        viewport: {
+            width: 675,
+            height: 450,
+        },
+        output: {
+            width: 1350,
+            height: 900,
+        },
+    },
+    {
+        code: 'vertical',
+        description: t('Vertical'),
+        viewport: {
+            width: 306.66,
+            height: 533.33,
+        },
+        output: {
+            width: 460,
+            height: 800,
+        },
+    },
+];
+
+const allowedContentTypes = ref('');
+const photoContainerRef = ref(null);
+const editor = ref(null);
+
+const displayEditor = () => {
+    const viewportType = editPhotoFormData.viewportType;
+    const viewport = viewportType.viewport;
+    const boundaryWidth = viewport.width + 200;
+    const boundaryHeight = viewport.height + 200;
+
+    if (editor.value) editor.value.destroy();
+    editor.value = new Croppie(photoContainerRef.value, {
+        viewport: { width: viewport.width, height: viewport.height },
+        boundary: { width: boundaryWidth, height: boundaryHeight },
+        enableOrientation: true,
+        showZoomer: true,
+    });
+};
+
+const viewportSelection = computed({
+    get() {
+        return editPhotoFormData.viewportType;
+    },
+    set(val) {
+        editPhotoFormData.viewportType = val;
+
+        const hasFile = editPhotoFormData.file || editPhotoFormData.url;
+        if (!val || !hasFile) return;
+
+        let file;
+        if (editPhotoFormData.uploadMethod == 'computer') file = editPhotoFormData.file;
+        else if (editPhotoFormData.uploadMethod == 'URL') file = editPhotoFormData.url;
+
+        updatePhotoPreview(file);
+    },
+});
+
+const updatePhotoPreview = (value) => {
+    if (value) {
+        displayEditor();
+        if (editPhotoFormData.uploadMethod == 'computer') {
+            editPhotoFormData.file = value;
+            const reader = new FileReader();
+            reader.onload = (e) => editor.value.bind({ url: e.target.result });
+            reader.readAsDataURL(value);
+        } else if (editPhotoFormData.uploadMethod == 'URL') {
+            const img = new Image();
+            img.crossOrigin = 'Anonymous';
+            img.src = value;
+            img.onload = () => editor.value.bind({ url: value });
+            img.onerror = () => {
+                notify(
+                    t("This photo provider doesn't allow remote downloads"),
+                    'negative'
+                );
+            };
+        }
+    }
+};
+
+const rotateLeft = () => {
+    editor.value.rotate(90);
+};
+
+const rotateRight = () => {
+    editor.value.rotate(-90);
+};
+
+const onUploadAccept = () => {
+    try {
+        if (!this.newPhoto.files) throw new Error(`Select an image`);
+
+        const options = {
+            type: 'blob',
+        };
+        return this.editor
+            .result(options)
+            .then((blob) => (this.newPhoto.blob = blob))
+            .then(() => this.makeRequest());
+    } catch (e) {
+        this.vnApp.showError(this.$t(e.message));
+        return false;
+    }
+};
+
+const makeRequest = async () => {
+    // const options = {
+    //     method: 'POST',
+    //     url: `Images/upload`,
+    //     params: this.newPhoto,
+    //     headers: { 'Content-Type': undefined },
+    //     timeout: this.canceler.promise,
+    //     transformRequest: ([file]) => {
+    //         const formData = new FormData();
+    //         const now = Date.vnNew();
+    //         const timestamp = now.getTime();
+    //         const fileName = `${file.name}_${timestamp}`;
+
+    //         formData.append('blob', this.newPhoto.blob, fileName);
+
+    //         return formData;
+    //     },
+    //     data: this.newPhoto.files,
+    // };
+
+    await axios.post('Images/upload');
+
+    this.$http(options)
+        .then(() => this.vnApp.showSuccess(this.$t('Data saved!')))
+        .then(() => this.emit('response'))
+        .finally(() => (this.canceler = null));
 };
 </script>
 
 <template>
-    <!-- <FetchData
-        url="Warehouses"
-        @on-fetch="(data) => (warehousesOptions = data)"
+    <FetchData
+        ref="allowTypesRef"
+        url="ImageContainers/allowedContentTypes"
+        @on-fetch="(data) => (allowedContentTypes = data.join(', '))"
         auto-load
-    /> -->
-    <FormModelPopup
-        url-create="Items/regularize"
-        model="Items"
-        :title="t('Edit photo')"
-        :form-initial-data="editFormData"
-        @on-data-saved="onDataSaved($event)"
-    >
-        <template #form-inputs="{}">
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QOptionGroup
-                        :options="options"
-                        type="radio"
-                        v-model="editFormData.uploadMethod"
-                    />
-                </div>
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QFile
-                        :label="t('entry.buys.file')"
-                        :multiple="false"
-                        v-model="editFormData.file"
-                        @update:model-value="onFileChange($event)"
-                        class="required"
+    />
+    <QForm class="all-pointer-events">
+        <QCard class="q-pa-lg">
+            <span ref="closeButton" class="close-icon" v-close-popup>
+                <QIcon name="close" size="sm" />
+            </span>
+            <h1 class="title">{{ t('Edit photo') }}</h1>
+            <div class="row q-gutter-lg">
+                <div
+                    v-show="editPhotoFormData.file || editPhotoFormData.url"
+                    class="row q-gutter-lg items-center"
+                >
+                    <QIcon
+                        name="rotate_left"
+                        size="sm"
+                        color="primary"
+                        class="cursor-pointer"
+                        @click="rotateLeft()"
                     >
-                        <template #append>
-                            <QIcon name="vn:attach" class="cursor-pointer">
-                                <QTooltip>{{ t('Select a file') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </QFile>
+                        <!-- <QTooltip class="no-pointer-events">
+                            {{ t('Rotate left') }}
+                        </QTooltip> -->
+                    </QIcon>
+                    <div>
+                        <div ref="photoContainerRef" />
+                    </div>
+                    <QIcon
+                        name="rotate_right"
+                        size="sm"
+                        color="primary"
+                        class="cursor-pointer"
+                        @click="rotateRight()"
+                    >
+                        <!-- <QTooltip class="no-pointer-events">
+                            {{ t('Rotate right') }}
+                        </QTooltip> -->
+                    </QIcon>
                 </div>
-            </VnRow>
-            <pre>{{ editFormData }}</pre>
-        </template>
-    </FormModelPopup>
+
+                <div class="column">
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <div class="col">
+                            <QOptionGroup
+                                :options="options"
+                                type="radio"
+                                v-model="editPhotoFormData.uploadMethod"
+                            />
+                        </div>
+                    </VnRow>
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <div class="col">
+                            <QFile
+                                v-if="editPhotoFormData.uploadMethod === 'computer'"
+                                :label="t('File')"
+                                :multiple="false"
+                                @update:model-value="updatePhotoPreview($event)"
+                                :accept="allowedContentTypes"
+                                class="required"
+                            >
+                                <template #append>
+                                    <QIcon
+                                        name="vn:attach"
+                                        class="cursor-pointer q-mr-sm"
+                                    >
+                                        <QTooltip>{{ t('Select a file') }}</QTooltip>
+                                    </QIcon>
+                                    <QIcon name="info" class="cursor-pointer">
+                                        <QTooltip>{{
+                                            t(
+                                                'components.editPictureForm.allowedFilesText',
+                                                {
+                                                    allowedContentTypes:
+                                                        allowedContentTypes,
+                                                }
+                                            )
+                                        }}</QTooltip>
+                                    </QIcon>
+                                </template>
+                            </QFile>
+                            <VnInput
+                                v-if="editPhotoFormData.uploadMethod === 'URL'"
+                                v-model="editPhotoFormData.url"
+                                @update:model-value="updatePhotoPreview($event)"
+                                placeholder="https://"
+                            />
+                        </div>
+                    </VnRow>
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <div class="col">
+                            <VnSelectFilter
+                                :label="t('Orientation')"
+                                :options="viewportTypes"
+                                hide-selected
+                                option-label="description"
+                                v-model="viewportSelection"
+                            />
+                        </div>
+                    </VnRow>
+                </div>
+            </div>
+        </QCard>
+    </QForm>
 </template>
 
+<style lang="scss" scoped>
+.title {
+    font-size: 17px;
+    font-weight: bold;
+    line-height: 20px;
+}
+
+.close-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    cursor: pointer;
+}
+</style>
+
 <i18n>
 es:
     Edit photo: Editar foto
     Select from computer: Seleccionar desde ordenador
     Import from external URL: Importar desde URL externa
+    Vertical: Vertical
+    Normal: Normal
+    Panoramic: Panorámica
+    Orientation: Orientación
+    File: Fichero
+    This photo provider doesn't allow remote downloads: Este proveedor de fotos no permite descargas remotas
+    Rotate left: Girar a la izquierda
+    Rotate right: Girar a la derecha
 </i18n>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index ea8769c58..e8d10e8b4 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -1102,5 +1102,8 @@ export default {
             addToPinned: 'Add to pinned',
             removeFromPinned: 'Remove from pinned',
         },
+        editPictureForm: {
+            allowedFilesText: 'Allowed file types: { allowedContentTypes }',
+        },
     },
 };
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 9f407ab0b..67e3a2c29 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -1102,5 +1102,8 @@ export default {
             addToPinned: 'Añadir a fijados',
             removeFromPinned: 'Eliminar de fijados',
         },
+        editPictureForm: {
+            allowedFilesText: 'Tipos de archivo permitidos: { allowedContentTypes }',
+        },
     },
 };

From 77f9cc1d805df3d787357c1f40ac10b99237fdab Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 30 Jan 2024 22:39:21 -0300
Subject: [PATCH 087/111] change white color

---
 src/pages/Item/Card/ItemDescriptor.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index f30104303..ae219cdee 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -297,7 +297,7 @@ es:
 }
 
 .separation-borders {
-    border-left: 1px solid #ffffff;
-    border-right: 1px solid #ffffff;
+    border-left: 1px solid var(--vn-text);
+    border-right: 1px solid var(--vn-text);
 }
 </style>

From 6fe6cd79e876a86a40636bfdbc3b885ba64d7730 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 31 Jan 2024 08:41:02 +0100
Subject: [PATCH 088/111] refs #5834 feat: add tooltip for iban input

---
 src/pages/Customer/Card/CustomerBillingData.vue | 11 ++++++++++-
 src/pages/Supplier/Card/SupplierAccounts.vue    | 13 +++++++++----
 src/pages/Worker/WorkerCreate.vue               | 10 +++++++++-
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index 1543eac7a..195783824 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -70,7 +70,16 @@ const getBankEntities = () => {
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnInput :label="t('IBAN')" v-model="data.iban" />
+                    <QIcon name="info" class="cursor-info">
+                        <QTooltip> asd</QTooltip>
+                    </QIcon>
+                    <VnInput :label="t('IBAN')" v-model="data.iban">
+                        <template #append>
+                            <QIcon name="info" class="cursor-info">
+                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
+                            </QIcon>
+                        </template></VnInput
+                    >
                 </div>
                 <div class="col">
                     <VnSelectCreate
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 30edfb2fd..eec958e00 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -99,10 +99,15 @@ onMounted(() => {
                     class="row q-gutter-md q-mb-md"
                 >
                     <div class="col">
-                        <VnInput
-                            :label="t('supplier.accounts.iban')"
-                            v-model="row.iban"
-                        />
+                        <VnInput :label="t('supplier.accounts.iban')" v-model="row.iban">
+                            <template #append>
+                                <QIcon name="info" class="cursor-info">
+                                    <QTooltip>{{
+                                        t('components.iban_tooltip')
+                                    }}</QTooltip>
+                                </QIcon>
+                            </template></VnInput
+                        >
                     </div>
                     <div class="col">
                         <VnSelectCreate
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 3ded85584..34fc26445 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -248,7 +248,15 @@ onMounted(async () => {
                             v-model="data.iban"
                             :label="t('worker.create.iban')"
                             :rules="validate('Worker.iban')"
-                        />
+                        >
+                            <template #append>
+                                <QIcon name="info" class="cursor-info">
+                                    <QTooltip>{{
+                                        t('components.iban_tooltip')
+                                    }}</QTooltip>
+                                </QIcon>
+                            </template>
+                        </VnInput>
                     </div>
                     <VnSelectCreate
                         :label="t('worker.create.bankEntity')"

From 40fb0c4533cfb05ce6da66bbf8650b1836a97399 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 31 Jan 2024 08:41:21 +0100
Subject: [PATCH 089/111] refs #5834 feat: add required for country

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

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 2a1385945..00a540a6f 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -77,6 +77,7 @@ const onDataSaved = (data) => {
                         option-value="id"
                         option-label="country"
                         hide-selected
+                        :required="true"
                         :rules="validate('bankEntity.countryFk')"
                     />
                 </div>

From f3e7d8ceb19babfd3c15bdfb8f30f626f082770b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 31 Jan 2024 08:54:49 +0100
Subject: [PATCH 090/111] refs #5834 feat: i18n

---
 src/components/common/VnLocation.vue | 6 ++++--
 src/i18n/en/index.js                 | 1 +
 src/i18n/es/index.js                 | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 0b30faaa7..17dd3d37b 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -94,7 +94,7 @@ function handleFetch( data) {
         :options="postcodesOptions"
         :label="t('Location')"
         :option-label="showLabel"
-        :placeholder="t('Search by postalCode, town, province or country')"
+        :placeholder="t('search_by_postalcode')"
         @input-value="locationFilter"
         :default-filter="false"
         :input-debounce="300"
@@ -129,7 +129,9 @@ function handleFetch( data) {
 </style>
 
 <i18n>
+en:
+    search_by_postalcode: Search by postalcode, town, province or country
 es:
     Location: Ubicación
-    Search by postalcode, town, province or country: Buscar por código postal, ciudad o país
+    search_by_postalcode: Buscar por código postal, ciudad o país
 </i18n>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 2eb445680..7e3e7fe3b 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -1087,5 +1087,6 @@ export default {
         VnLv: {
             copyText: '{copyValue} has been copied to the clipboard',
         },
+        iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789',
     },
 };
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 2a9bcd615..82a24893b 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -1086,5 +1086,6 @@ export default {
         VnLv: {
             copyText: '{copyValue} se ha copiado al portapepeles',
         },
+        iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789',
     },
 };

From 0287ec4932b242c4eb9c2e54b742ee4e62bcc5f9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 31 Jan 2024 08:57:05 +0100
Subject: [PATCH 091/111] refs #5834 feat: add required for code

---
 src/components/CreateBankEntityForm.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 00a540a6f..270a79d93 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -82,7 +82,7 @@ const onDataSaved = (data) => {
                     />
                 </div>
                 <div v-if="showEntityField" class="col">
-                    <QInput :label="t('id')" v-model="data.id" />
+                    <QInput :label="t('id')" v-model="data.id"/>
                 </div>
             </VnRow>
         </template>
@@ -96,12 +96,12 @@ en:
     name: Name *
     swift: Swift *
     country: Country
-    id: Entity code
+    id: Entity code *
 es:
     title: Nueva entidad bancaria
     subtitle: ¡Por favor, asegúrate de poner los datos correctos!
     name: Nombre *
     swift: Swift *
     country: País
-    id: Código de la entidad
+    id: Código de la entidad *
 </i18n>

From fea618b2133f096d3b3f4826795141cc133591ba Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 31 Jan 2024 09:00:48 +0100
Subject: [PATCH 092/111] refs #5834 feat: replace QInput by VnInput

---
 src/components/CreateBankEntityForm.vue | 26 ++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 270a79d93..106dbec3a 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import VnInput from 'src/components/common/VnInput.vue';
 
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
@@ -54,16 +55,18 @@ const onDataSaved = (data) => {
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <QInput
+                    <VnInput
                         :label="t('name')"
                         v-model="data.name"
+                        :required="true"
                         :rules="validate('bankEntity.name')"
                     />
                 </div>
                 <div class="col">
-                    <QInput
+                    <VnInput
                         :label="t('swift')"
                         v-model="data.bic"
+                        :required="true"
                         :rules="validate('bankEntity.bic')"
                     />
                 </div>
@@ -82,7 +85,12 @@ const onDataSaved = (data) => {
                     />
                 </div>
                 <div v-if="showEntityField" class="col">
-                    <QInput :label="t('id')" v-model="data.id"/>
+                    <VnInput
+                        :label="t('id')"
+                        v-model="data.id"
+                        :required="true"
+                        :rules="validate('city.name')"
+                    />
                 </div>
             </VnRow>
         </template>
@@ -93,15 +101,15 @@ const onDataSaved = (data) => {
 en:
     title: New bank entity
     subtitle: Please, ensure you put the correct data!
-    name: Name *
-    swift: Swift *
+    name: Name
+    swift: Swift
     country: Country
-    id: Entity code *
+    id: Entity code
 es:
     title: Nueva entidad bancaria
     subtitle: ¡Por favor, asegúrate de poner los datos correctos!
-    name: Nombre *
-    swift: Swift *
+    name: Nombre
+    swift: Swift
     country: País
-    id: Código de la entidad *
+    id: Código de la entidad
 </i18n>

From c42d8169dc069c4e2407c8f5ba05267cfb06fe7b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 31 Jan 2024 09:03:44 +0100
Subject: [PATCH 093/111] refs #5834 perf: remove bad tag

---
 src/pages/Customer/Card/CustomerBillingData.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index 195783824..a528775d8 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -70,9 +70,6 @@ const getBankEntities = () => {
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <QIcon name="info" class="cursor-info">
-                        <QTooltip> asd</QTooltip>
-                    </QIcon>
                     <VnInput :label="t('IBAN')" v-model="data.iban">
                         <template #append>
                             <QIcon name="info" class="cursor-info">

From 27bfd009cf2bbc6029d4ffb171bb1430703aae2e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 31 Jan 2024 09:05:21 +0100
Subject: [PATCH 094/111] refs #5834 perf: fix bad lint

---
 src/pages/Customer/Card/CustomerBillingData.vue | 4 ++--
 src/pages/Supplier/Card/SupplierAccounts.vue    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index a528775d8..925cdd534 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -75,8 +75,8 @@ const getBankEntities = () => {
                             <QIcon name="info" class="cursor-info">
                                 <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
                             </QIcon>
-                        </template></VnInput
-                    >
+                        </template>
+                    </VnInput>
                 </div>
                 <div class="col">
                     <VnSelectCreate
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index eec958e00..e7aff1e04 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -106,8 +106,8 @@ onMounted(() => {
                                         t('components.iban_tooltip')
                                     }}</QTooltip>
                                 </QIcon>
-                            </template></VnInput
-                        >
+                            </template>
+                        </VnInput>
                     </div>
                     <div class="col">
                         <VnSelectCreate

From 588a5ff674e18c59160dfb8d3c616dd06b6ebf66 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 09:31:20 -0300
Subject: [PATCH 095/111] photo uplader updates

---
 src/components/EditPictureForm.vue            | 154 ++++++++++--------
 src/pages/Item/Card/ItemDescriptor.vue        |  15 +-
 .../Supplier/Card/SupplierConsumption.vue     |   2 +-
 3 files changed, 99 insertions(+), 72 deletions(-)

diff --git a/src/components/EditPictureForm.vue b/src/components/EditPictureForm.vue
index d2b3df528..723adc0e9 100644
--- a/src/components/EditPictureForm.vue
+++ b/src/components/EditPictureForm.vue
@@ -12,30 +12,23 @@ import 'croppie/croppie.css';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 
-const props = defineProps({});
+const emit = defineEmits(['closeForm']);
+
+const props = defineProps({
+    id: {
+        type: String,
+        default: '',
+    },
+    collection: {
+        type: String,
+        default: '',
+    },
+});
 
 const { t } = useI18n();
 const { notify } = useNotify();
 
-const editPhotoFormData = reactive({
-    uploadMethod: 'computer',
-    file: null,
-    url: null,
-    viewportType: {
-        code: 'normal',
-        description: t('Normal'),
-        viewport: {
-            width: 400,
-            height: 400,
-        },
-        output: {
-            width: 1200,
-            height: 1200,
-        },
-    },
-});
-
-const options = [
+const uploadMethodsOptions = [
     { label: t('Select from computer'), value: 'computer' },
     { label: t('Import from external URL'), value: 'URL' },
 ];
@@ -79,12 +72,22 @@ const viewportTypes = [
     },
 ];
 
+const uploadMethodSelected = ref('computer');
+const viewPortTypeSelected = ref(viewportTypes[0]);
+
 const allowedContentTypes = ref('');
 const photoContainerRef = ref(null);
 const editor = ref(null);
+const newPhoto = reactive({
+    id: props.id,
+    collection: props.collection,
+    file: null,
+    url: null,
+    blob: null,
+});
 
 const displayEditor = () => {
-    const viewportType = editPhotoFormData.viewportType;
+    const viewportType = viewPortTypeSelected.value;
     const viewport = viewportType.viewport;
     const boundaryWidth = viewport.width + 200;
     const boundaryHeight = viewport.height + 200;
@@ -100,17 +103,17 @@ const displayEditor = () => {
 
 const viewportSelection = computed({
     get() {
-        return editPhotoFormData.viewportType;
+        return viewPortTypeSelected.value;
     },
     set(val) {
-        editPhotoFormData.viewportType = val;
+        viewPortTypeSelected.value = val;
 
-        const hasFile = editPhotoFormData.file || editPhotoFormData.url;
+        const hasFile = newPhoto.files || newPhoto.url;
         if (!val || !hasFile) return;
 
         let file;
-        if (editPhotoFormData.uploadMethod == 'computer') file = editPhotoFormData.file;
-        else if (editPhotoFormData.uploadMethod == 'URL') file = editPhotoFormData.url;
+        if (uploadMethodSelected.value == 'computer') file = newPhoto.files;
+        else if (uploadMethodSelected.value == 'URL') file = newPhoto.url;
 
         updatePhotoPreview(file);
     },
@@ -119,12 +122,13 @@ const viewportSelection = computed({
 const updatePhotoPreview = (value) => {
     if (value) {
         displayEditor();
-        if (editPhotoFormData.uploadMethod == 'computer') {
-            editPhotoFormData.file = value;
+        if (uploadMethodSelected.value == 'computer') {
+            newPhoto.files = value;
             const reader = new FileReader();
             reader.onload = (e) => editor.value.bind({ url: e.target.result });
             reader.readAsDataURL(value);
-        } else if (editPhotoFormData.uploadMethod == 'URL') {
+        } else if (uploadMethodSelected.value == 'URL') {
+            newPhoto.url = value;
             const img = new Image();
             img.crossOrigin = 'Anonymous';
             img.src = value;
@@ -149,47 +153,44 @@ const rotateRight = () => {
 
 const onUploadAccept = () => {
     try {
-        if (!this.newPhoto.files) throw new Error(`Select an image`);
+        if (!newPhoto.files && !newPhoto.url) {
+            notify(t('Select an image'), 'negative');
+            return;
+        }
 
         const options = {
             type: 'blob',
         };
-        return this.editor
+
+        editor.value
             .result(options)
-            .then((blob) => (this.newPhoto.blob = blob))
-            .then(() => this.makeRequest());
-    } catch (e) {
-        this.vnApp.showError(this.$t(e.message));
-        return false;
+            .then((result) => {
+                const file = new File([result], newPhoto.files?.name || '');
+                newPhoto.blob = file;
+            })
+            .then(() => makeRequest());
+    } catch (err) {
+        console.error('Error uploading image');
+    } finally {
+        emit('closeForm');
     }
 };
 
 const makeRequest = async () => {
-    // const options = {
-    //     method: 'POST',
-    //     url: `Images/upload`,
-    //     params: this.newPhoto,
-    //     headers: { 'Content-Type': undefined },
-    //     timeout: this.canceler.promise,
-    //     transformRequest: ([file]) => {
-    //         const formData = new FormData();
-    //         const now = Date.vnNew();
-    //         const timestamp = now.getTime();
-    //         const fileName = `${file.name}_${timestamp}`;
+    const formData = new FormData();
+    const now = Date.vnNew();
+    const timestamp = now.getTime();
+    const fileName = `${newPhoto.files?.name}_${timestamp}`;
+    formData.append('blob', newPhoto.blob, fileName);
 
-    //         formData.append('blob', this.newPhoto.blob, fileName);
+    await axios.post('Images/upload', formData, {
+        params: newPhoto,
+        headers: {
+            'Content-Type': 'multipart/form-data',
+        },
+    });
 
-    //         return formData;
-    //     },
-    //     data: this.newPhoto.files,
-    // };
-
-    await axios.post('Images/upload');
-
-    this.$http(options)
-        .then(() => this.vnApp.showSuccess(this.$t('Data saved!')))
-        .then(() => this.emit('response'))
-        .finally(() => (this.canceler = null));
+    notify(t('globals.dataSaved'), 'positive');
 };
 </script>
 
@@ -200,7 +201,7 @@ const makeRequest = async () => {
         @on-fetch="(data) => (allowedContentTypes = data.join(', '))"
         auto-load
     />
-    <QForm class="all-pointer-events">
+    <QForm @submit="onUploadAccept()" class="all-pointer-events">
         <QCard class="q-pa-lg">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
@@ -208,7 +209,7 @@ const makeRequest = async () => {
             <h1 class="title">{{ t('Edit photo') }}</h1>
             <div class="row q-gutter-lg">
                 <div
-                    v-show="editPhotoFormData.file || editPhotoFormData.url"
+                    v-show="newPhoto.files || newPhoto.url"
                     class="row q-gutter-lg items-center"
                 >
                     <QIcon
@@ -242,18 +243,19 @@ const makeRequest = async () => {
                     <VnRow class="row q-gutter-md q-mb-md">
                         <div class="col">
                             <QOptionGroup
-                                :options="options"
+                                :options="uploadMethodsOptions"
                                 type="radio"
-                                v-model="editPhotoFormData.uploadMethod"
+                                v-model="uploadMethodSelected"
                             />
                         </div>
                     </VnRow>
                     <VnRow class="row q-gutter-md q-mb-md">
                         <div class="col">
                             <QFile
-                                v-if="editPhotoFormData.uploadMethod === 'computer'"
+                                v-if="uploadMethodSelected === 'computer'"
                                 :label="t('File')"
                                 :multiple="false"
+                                v-model="newPhoto.files"
                                 @update:model-value="updatePhotoPreview($event)"
                                 :accept="allowedContentTypes"
                                 class="required"
@@ -279,8 +281,8 @@ const makeRequest = async () => {
                                 </template>
                             </QFile>
                             <VnInput
-                                v-if="editPhotoFormData.uploadMethod === 'URL'"
-                                v-model="editPhotoFormData.url"
+                                v-if="uploadMethodSelected === 'URL'"
+                                v-model="newPhoto.url"
                                 @update:model-value="updatePhotoPreview($event)"
                                 placeholder="https://"
                             />
@@ -297,6 +299,25 @@ const makeRequest = async () => {
                             />
                         </div>
                     </VnRow>
+                    <div class="q-mt-lg row justify-end">
+                        <QBtn
+                            :label="t('globals.save')"
+                            type="submit"
+                            color="primary"
+                            :disabled="isLoading"
+                            :loading="isLoading"
+                        />
+                        <QBtn
+                            :label="t('globals.cancel')"
+                            type="reset"
+                            color="primary"
+                            flat
+                            class="q-ml-sm"
+                            :disabled="isLoading"
+                            :loading="isLoading"
+                            v-close-popup
+                        />
+                    </div>
                 </div>
             </div>
         </QCard>
@@ -331,4 +352,5 @@ es:
     This photo provider doesn't allow remote downloads: Este proveedor de fotos no permite descargas remotas
     Rotate left: Girar a la izquierda
     Rotate right: Girar a la derecha
+    Select an image: Selecciona una imagen
 </i18n>
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index ae219cdee..bd7e8c371 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -63,6 +63,7 @@ const warehouseFk = computed({
     },
 });
 const showWarehouseIconTooltip = ref(true);
+const showEditPhotoForm = ref(false);
 
 onMounted(() => {
     warehouseFk.value = user.value.warehouseFk;
@@ -124,8 +125,8 @@ const openRegularizeStockForm = () => {
     regularizeStockFormDialog.value.show();
 };
 
-const openEditPhotoForm = () => {
-    editPhotoFormDialog.value.show();
+const toggleEditPictureForm = () => {
+    showEditPhotoForm.value = !showEditPhotoForm.value;
 };
 
 const cloneItem = async () => {
@@ -212,11 +213,15 @@ const openCloneDialog = async () => {
                     size="lg"
                     round
                     class="edit-photo-btn"
-                    @click="openEditPhotoForm()"
+                    @click="toggleEditPictureForm()"
                 >
                     <QIcon name="edit" size="sm" />
-                    <QDialog ref="editPhotoFormDialog">
-                        <EditPictureForm />
+                    <QDialog ref="editPhotoFormDialog" v-model="showEditPhotoForm">
+                        <EditPictureForm
+                            collection="catalog"
+                            :id="entityId"
+                            @close-form="toggleEditPictureForm()"
+                        />
                     </QDialog>
                 </QBtn>
             </div>
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 06438349b..da14a6343 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -155,11 +155,11 @@ onMounted(async () => {
         </QDrawer>
         <QTable
             :rows="rows"
-            hide-bottom
             row-key="id"
             hide-header
             :pagination="{ rowsPerPage: 0 }"
             class="full-width q-mt-md"
+            :no-data-label="t('No results')"
         >
             <template #body="{ row }">
                 <QTr>

From ae4c80f45c235a43e5318c10e411ed27962a37c7 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 09:34:13 -0300
Subject: [PATCH 096/111] Make Notes a input text instead of textarea

---
 src/pages/Supplier/Card/SupplierBasicData.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 747784943..c5a6afbf0 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -90,13 +90,7 @@ const workersOptions = ref([]);
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <QInput
-                        :label="t('supplier.basicData.note')"
-                        type="textarea"
-                        v-model="data.note"
-                        fill-input
-                        autogrow
-                    />
+                    <VnInput :label="t('supplier.basicData.note')" v-model="data.note" />
                 </div>
             </VnRow>
         </template>

From 2f67fef56249dfae1548b202474929f8c1ea3693 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 09:37:02 -0300
Subject: [PATCH 097/111] Add tooltip to Beneficiary input in SupplierAccounts

---
 src/pages/Supplier/Card/SupplierAccounts.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 30edfb2fd..ba115a6f4 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -135,7 +135,17 @@ onMounted(() => {
                         <VnInput
                             :label="t('supplier.accounts.beneficiary')"
                             v-model="row.beneficiary"
-                        />
+                        >
+                            <template #append>
+                                <QIcon name="info" class="cursor-pointer">
+                                    <QTooltip>{{
+                                        t(
+                                            'Name of the bank account holder if different from the provider'
+                                        )
+                                    }}</QTooltip>
+                                </QIcon>
+                            </template>
+                        </VnInput>
                     </div>
                     <div class="col-1 row justify-center items-center">
                         <QIcon
@@ -174,4 +184,5 @@ onMounted(() => {
         Do you want to change the pay method to wire transfer?: ¿Quieres modificar la forma de pago a transferencia?
         Add account: Añadir cuenta
         Remove account: Remover cuenta
+        Name of the bank account holder if different from the provider: Nombre del titular de la cuenta bancaria en caso de ser diferente del proveedor
 </i18n>

From b9dcbc18ca53629accc3783070c87f2c1b608d75 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 09:51:22 -0300
Subject: [PATCH 098/111] Change SupplierAddressesCreate inputs layout

---
 src/pages/Supplier/Card/SupplierAddressesCreate.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index 8ad0959f5..60a803ee1 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -147,8 +147,6 @@ onMounted(() => {
                             option-value="id"
                         />
                     </div>
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
                         <VnSelectFilter
                             :label="t('supplier.addresses.province')"
@@ -160,21 +158,20 @@ onMounted(() => {
                             v-model="data.provinceFk"
                         />
                     </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
                         <VnInput
                             v-model="data.phone"
                             :label="t('supplier.addresses.phone')"
                         />
                     </div>
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
                         <VnInput
                             v-model="data.mobile"
                             :label="t('supplier.addresses.mobile')"
                         />
                     </div>
-                    <div class="col" />
                 </VnRow>
             </template>
         </FormModel>

From 0e32138714130fb577439c03e5e5aed603f07b4f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 10:49:29 -0300
Subject: [PATCH 099/111] Make input file clip icon work

---
 src/components/EditPictureForm.vue | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/components/EditPictureForm.vue b/src/components/EditPictureForm.vue
index 723adc0e9..941497472 100644
--- a/src/components/EditPictureForm.vue
+++ b/src/components/EditPictureForm.vue
@@ -74,7 +74,7 @@ const viewportTypes = [
 
 const uploadMethodSelected = ref('computer');
 const viewPortTypeSelected = ref(viewportTypes[0]);
-
+const inputFileRef = ref(null);
 const allowedContentTypes = ref('');
 const photoContainerRef = ref(null);
 const editor = ref(null);
@@ -86,6 +86,10 @@ const newPhoto = reactive({
     blob: null,
 });
 
+const openInputFile = () => {
+    inputFileRef.value.pickFiles();
+};
+
 const displayEditor = () => {
     const viewportType = viewPortTypeSelected.value;
     const viewport = viewportType.viewport;
@@ -253,21 +257,26 @@ const makeRequest = async () => {
                         <div class="col">
                             <QFile
                                 v-if="uploadMethodSelected === 'computer'"
+                                ref="inputFileRef"
                                 :label="t('File')"
                                 :multiple="false"
                                 v-model="newPhoto.files"
                                 @update:model-value="updatePhotoPreview($event)"
                                 :accept="allowedContentTypes"
-                                class="required"
+                                class="required cursor-pointer"
                             >
                                 <template #append>
                                     <QIcon
                                         name="vn:attach"
-                                        class="cursor-pointer q-mr-sm"
+                                        class="cursor-pointer q-mr-sm non-selectable"
+                                        @click="openInputFile()"
                                     >
                                         <QTooltip>{{ t('Select a file') }}</QTooltip>
                                     </QIcon>
-                                    <QIcon name="info" class="cursor-pointer">
+                                    <QIcon
+                                        name="info"
+                                        class="cursor-pointer non-selectable"
+                                    >
                                         <QTooltip>{{
                                             t(
                                                 'components.editPictureForm.allowedFilesText',

From c7653088b240f6e386e5276044011065d9c6c3ad Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 10:50:03 -0300
Subject: [PATCH 100/111] Change bank entity input label

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

diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index ba115a6f4..e88b59d4c 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -106,7 +106,7 @@ onMounted(() => {
                     </div>
                     <div class="col">
                         <VnSelectCreate
-                            :label="t('worker.create.bankEntity')"
+                            :label="t('supplier.accounts.bankEntity')"
                             v-model="row.bankEntityFk"
                             :options="bankEntitiesOptions"
                             option-label="name"

From 96af02116d31aa6954fd731b44389553dc98c783 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 10:52:14 -0300
Subject: [PATCH 101/111] Change SupplierAgencyTermCreate inputs layout

---
 src/pages/Supplier/Card/SupplierAgencyTermCreate.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
index 00f0b868f..17786c1ea 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
@@ -80,8 +80,6 @@ const onDataSaved = () => {
                             type="number"
                         />
                     </div>
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
                         <QInput
                             :label="t('supplier.agencyTerms.m3Price')"
@@ -89,6 +87,8 @@ const onDataSaved = () => {
                             type="number"
                         />
                     </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
                         <QInput
                             :label="t('supplier.agencyTerms.routePrice')"
@@ -96,8 +96,6 @@ const onDataSaved = () => {
                             type="number"
                         />
                     </div>
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
                         <QInput
                             :label="t('supplier.agencyTerms.minimumKm')"
@@ -105,7 +103,6 @@ const onDataSaved = () => {
                             type="number"
                         />
                     </div>
-                    <div class="col" />
                 </VnRow>
             </template>
         </FormModel>

From 43c621f379a74b4555b5629dd904f456b9e48555 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 10:55:55 -0300
Subject: [PATCH 102/111] remove tooltip to attach icon

---
 src/components/EditPictureForm.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/EditPictureForm.vue b/src/components/EditPictureForm.vue
index 941497472..d47d60fee 100644
--- a/src/components/EditPictureForm.vue
+++ b/src/components/EditPictureForm.vue
@@ -268,15 +268,12 @@ const makeRequest = async () => {
                                 <template #append>
                                     <QIcon
                                         name="vn:attach"
-                                        class="cursor-pointer q-mr-sm non-selectable"
+                                        class="cursor-pointer q-mr-sm"
                                         @click="openInputFile()"
                                     >
-                                        <QTooltip>{{ t('Select a file') }}</QTooltip>
+                                        <!-- <QTooltip>{{ t('Select a file') }}</QTooltip> -->
                                     </QIcon>
-                                    <QIcon
-                                        name="info"
-                                        class="cursor-pointer non-selectable"
-                                    >
+                                    <QIcon name="info" class="cursor-pointer">
                                         <QTooltip>{{
                                             t(
                                                 'components.editPictureForm.allowedFilesText',

From cb51445eadba90f67ccfe7c4344d5b14dc35f66a Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 11:00:45 -0300
Subject: [PATCH 103/111] Change available and visible text colors in item
 descriptor

---
 src/css/app.scss                       |  4 ++++
 src/pages/Item/Card/ItemDescriptor.vue | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index b742dae2f..dbf45ce89 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -52,6 +52,10 @@ body.body--dark {
     color: var(--vn-text);
 }
 
+.color-vn-white {
+    color: $white;
+}
+
 .vn-card {
     background-color: var(--vn-gray);
     color: var(--vn-text);
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index bd7e8c371..41398bd28 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -231,22 +231,26 @@ const openCloneDialog = async () => {
                 style="height: 54px"
             >
                 <div class="col column items-center">
-                    <span class="text-uppercase" style="font-size: 11px">
+                    <span class="text-uppercase color-vn-white" style="font-size: 11px">
                         {{ t('item.descriptor.visible') }}
                     </span>
-                    <span class="text-weight-bold text-h5">{{ visible }}</span>
+                    <span class="text-weight-bold text-h5 color-vn-white">{{
+                        visible
+                    }}</span>
                 </div>
                 <div
                     class="col column items-center separation-borders"
                     style="font-size: 11px"
                 >
-                    <span class="text-uppercase">
+                    <span class="text-uppercase color-vn-white">
                         {{ t('item.descriptor.available') }}
                     </span>
-                    <span class="text-weight-bold text-h5">{{ available }}</span>
+                    <span class="text-weight-bold text-h5 color-vn-white">{{
+                        available
+                    }}</span>
                 </div>
                 <div class="col column items-center justify-center">
-                    <QIcon name="info" class="cursor-pointer" size="md">
+                    <QIcon name="info" class="cursor-pointer color-vn-white" size="md">
                         <QTooltip>{{ warehouseText }}</QTooltip>
                     </QIcon>
                 </div>
@@ -302,7 +306,7 @@ es:
 }
 
 .separation-borders {
-    border-left: 1px solid var(--vn-text);
-    border-right: 1px solid var(--vn-text);
+    border-left: 1px solid $white;
+    border-right: 1px solid $white;
 }
 </style>

From aa40a3b0f5b958c5c8ecff246b31a67152df6b96 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 11:27:08 -0300
Subject: [PATCH 104/111] resolve conflicts with dev

---
 src/i18n/en/index.js                          |  3 +
 src/i18n/es/index.js                          |  3 +
 .../Supplier/Card/SupplierConsumption.vue     | 60 +++++++++----------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index e8d10e8b4..baaf414d6 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -1105,5 +1105,8 @@ export default {
         editPictureForm: {
             allowedFilesText: 'Allowed file types: { allowedContentTypes }',
         },
+        VnLv: {
+            copyText: '{copyValue} has been copied to the clipboard',
+        },
     },
 };
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 67e3a2c29..0ea506b55 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -1105,5 +1105,8 @@ export default {
         editPictureForm: {
             allowedFilesText: 'Tipos de archivo permitidos: { allowedContentTypes }',
         },
+        VnLv: {
+            copyText: '{copyValue} se ha copiado al portapepeles',
+        },
     },
 };
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index da14a6343..3be2d7a90 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -105,10 +105,8 @@ const sendCampaignMetricsEmail = ({ address }) => {
     });
 };
 
-const calculateTotal = (buysArray) => {
-    if (!buysArray || !buysArray.length > 0) return;
-    return buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
-};
+const calculateTotal = (buysArray = []) =>
+    buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
 
 onMounted(async () => {
     stateStore.rightDrawer = true;
@@ -117,35 +115,31 @@ onMounted(async () => {
 </script>
 
 <template>
-    <QToolbar v-if="rows && rows.length > 0" class="bg-vn-dark justify-end">
-        <div id="st-data">
-            <QBtn
-                :disabled="!dateRanges.from && !dateRanges.to"
-                color="primary"
-                icon-right="picture_as_pdf"
-                no-caps
-                class="q-mr-md"
-                @click="openReportPdf()"
-            >
-                <QTooltip>
-                    {{ t('Open as PDF') }}
-                </QTooltip>
-            </QBtn>
-            <QBtn
-                :disabled="!dateRanges.from && !dateRanges.to"
-                color="primary"
-                icon-right="email"
-                no-caps
-                @click="openSendEmailDialog()"
-            >
-                <QTooltip>
-                    {{ t('Send to email') }}
-                </QTooltip>
-            </QBtn>
-        </div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
+    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
+        <QBtn
+            v-if="dateRanges.from && dateRanges.to"
+            color="primary"
+            icon-right="picture_as_pdf"
+            no-caps
+            class="q-mr-md"
+            @click="openReportPdf()"
+        >
+            <QTooltip>
+                {{ t('Open as PDF') }}
+            </QTooltip>
+        </QBtn>
+        <QBtn
+            v-if="dateRanges.from && dateRanges.to"
+            color="primary"
+            icon-right="email"
+            no-caps
+            @click="openSendEmailDialog()"
+        >
+            <QTooltip>
+                {{ t('Send to email') }}
+            </QTooltip>
+        </QBtn>
+    </Teleport>
 
     <QPage class="column items-center q-pa-md">
         <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>

From 71e974030607e0eb559d06e576d6354fef0e1c4b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 11:34:11 -0300
Subject: [PATCH 105/111] text area changes

---
 src/pages/Supplier/Card/SupplierBasicData.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index c5a6afbf0..bc50deb9b 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -90,7 +90,12 @@ const workersOptions = ref([]);
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnInput :label="t('supplier.basicData.note')" v-model="data.note" />
+                    <QInput
+                        :label="t('supplier.basicData.note')"
+                        type="textarea"
+                        v-model="data.note"
+                        fill-input
+                    />
                 </div>
             </VnRow>
         </template>

From f325e3d735ea2690bd1f25f7578d7f9aec726d48 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 1 Feb 2024 12:28:52 +0100
Subject: [PATCH 106/111] refs #6783 fix: correct version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1d729b82f..d3fa055f7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.02.01",
+    "version": "24.04.01",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

From 6bfa71086412669dd79cacbdf97eb984c48bbb66 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 1 Feb 2024 14:20:46 +0100
Subject: [PATCH 107/111] fix(VnLog): option-value

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

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index c93399e58..4265d02e9 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -664,6 +664,7 @@ setLogTree();
                         :label="t('globals.entity')"
                         v-model="selectedFilters.changedModel"
                         option-label="locale"
+                        option-value="value"
                         :options="actions"
                         @update:model-value="selectFilter('action')"
                         hide-selected

From 90f5d8dbf37020b8616fd00c5f094d0df1a9d799 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 1 Feb 2024 14:24:54 +0100
Subject: [PATCH 108/111] refs #6783 deploy: init version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d3fa055f7..67b15a693 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.04.01",
+    "version": "24.8.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

From 68260c1383472f9a76901de87691a5cc64c11118 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 1 Feb 2024 11:35:14 -0300
Subject: [PATCH 109/111] force item descriptor image upload

---
 src/components/EditPictureForm.vue     |  7 ++++---
 src/pages/Item/Card/ItemDescriptor.vue | 16 ++++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/components/EditPictureForm.vue b/src/components/EditPictureForm.vue
index d47d60fee..44d44587f 100644
--- a/src/components/EditPictureForm.vue
+++ b/src/components/EditPictureForm.vue
@@ -12,7 +12,7 @@ import 'croppie/croppie.css';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 
-const emit = defineEmits(['closeForm']);
+const emit = defineEmits(['closeForm', 'onPhotoUploaded']);
 
 const props = defineProps({
     id: {
@@ -175,8 +175,6 @@ const onUploadAccept = () => {
             .then(() => makeRequest());
     } catch (err) {
         console.error('Error uploading image');
-    } finally {
-        emit('closeForm');
     }
 };
 
@@ -194,6 +192,9 @@ const makeRequest = async () => {
         },
     });
 
+    emit('closeForm');
+    emit('onPhotoUploaded');
+
     notify(t('globals.dataSaved'), 'positive');
 };
 </script>
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 41398bd28..e1cbfb638 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref, onMounted, onUnmounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -43,6 +43,7 @@ const user = state.getUser();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
+const image = ref(null);
 const regularizeStockFormDialog = ref(null);
 const editPhotoFormDialog = ref(null);
 const item = ref(null);
@@ -65,14 +66,16 @@ const warehouseFk = computed({
 const showWarehouseIconTooltip = ref(true);
 const showEditPhotoForm = ref(false);
 
-onMounted(() => {
+onMounted(async () => {
+    await getItemAvatar();
     warehouseFk.value = user.value.warehouseFk;
 });
 
-function getItemAvatar() {
+const getItemAvatar = async () => {
     const token = getToken();
-    return `/api/Images/catalog/200x200/${entityId.value}/download?access_token=${token}`;
-}
+    const timeStamp = `timestamp=${Date.now()}`;
+    image.value = `/api/Images/catalog/200x200/${entityId.value}/download?access_token=${token}&${timeStamp}`;
+};
 
 const data = ref(useCardDescription());
 const setData = (entity) => {
@@ -189,7 +192,7 @@ const openCloneDialog = async () => {
         </template>
         <template #before>
             <div class="relative-position">
-                <QImg :src="getItemAvatar()" class="photo" style="position: relative">
+                <QImg :src="image" spinner-color="primary">
                     <template #error>
                         <div
                             class="absolute-full picture text-center q-pa-md flex flex-center"
@@ -221,6 +224,7 @@ const openCloneDialog = async () => {
                             collection="catalog"
                             :id="entityId"
                             @close-form="toggleEditPictureForm()"
+                            @on-photo-uploaded="getItemAvatar()"
                         />
                     </QDialog>
                 </QBtn>

From 25926e666069fc74f56294b12420256ddbb9cb0f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 1 Feb 2024 11:38:16 -0300
Subject: [PATCH 110/111] Add item descriptor photo class again

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

diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index e1cbfb638..362fcfc67 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -192,7 +192,7 @@ const openCloneDialog = async () => {
         </template>
         <template #before>
             <div class="relative-position">
-                <QImg :src="image" spinner-color="primary">
+                <QImg :src="image" spinner-color="primary" class="photo">
                     <template #error>
                         <div
                             class="absolute-full picture text-center q-pa-md flex flex-center"

From 565b94e91508df0e56024092375cb14cfcf0d37d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 2 Feb 2024 07:38:06 +0100
Subject: [PATCH 111/111] refs #6762 fix(supplierConsumption): subtoolbar

---
 src/pages/Supplier/Card/SupplierConsumption.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 3be2d7a90..59dd2281c 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -115,9 +115,9 @@ onMounted(async () => {
 </script>
 
 <template>
-    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
+    <Teleport to="#st-actions" v-if="stateStore.isSubToolbarShown()">
         <QBtn
-            v-if="dateRanges.from && dateRanges.to"
+            :disabled="!dateRanges.from && !dateRanges.to"
             color="primary"
             icon-right="picture_as_pdf"
             no-caps
@@ -129,7 +129,7 @@ onMounted(async () => {
             </QTooltip>
         </QBtn>
         <QBtn
-            v-if="dateRanges.from && dateRanges.to"
+            :disabled="!dateRanges.from && !dateRanges.to"
             color="primary"
             icon-right="email"
             no-caps