From 271e33a999d54cf06788aa41dce6164658aaf6ab Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 20 Sep 2024 11:57:15 +0200
Subject: [PATCH 01/14] feat: formatLocation when field is null

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

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index b6cbfbafd..c3b07c72c 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -12,14 +12,46 @@ const props = defineProps({
         default: null,
     },
 });
+const formatLocation = (obj, properties) => {
+    // Crear un array con las propiedades del objeto
+    const parts = properties.map((prop) => {
+        if (typeof prop === 'string') {
+            return obj[prop];
+        } else if (typeof prop === 'function') {
+            return prop(obj);
+        }
+        return null;
+    });
+
+    // Filtrar los valores que no son null o undefined
+    const filteredParts = parts.filter(
+        (part) => part !== null && part !== undefined && part !== ''
+    );
+
+    // Unir los valores filtrados con el formato deseado
+    return filteredParts.join(', ');
+};
+
+const locationProperties = [
+    'postcode',
+    (obj) =>
+        obj.city
+            ? `${obj.city}${obj.province?.name ? `(${obj.province.name})` : ''}`
+            : null,
+    (obj) => obj.country?.name,
+];
 const modelValue = ref(
-    props.location
-        ? `${props.location?.postcode} - ${props.location?.city}(${props.location?.province?.name}), ${props.location?.country?.name}`
-        : null
+    props.location ? formatLocation(props.location, locationProperties) : null
 );
 function showLabel(data) {
-    return `${data.code} - ${data.town}(${data.province}), ${data.country}`;
+    const dataProperties = [
+        'code',
+        (obj) => (obj.town ? `${obj.town}(${obj.province})` : null),
+        'country',
+    ];
+    return formatLocation(data, dataProperties);
 }
+
 const handleModelValue = (data) => {
     emit('update:model-value', data);
 };

From f06723a9192a158bbdff8fb160e664d994692f68 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 11:39:10 +0200
Subject: [PATCH 02/14] test: VnLocation

---
 .../integration/vnComponent/vnLocation.spec.js      | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 3533a3c1f..15ab53d17 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -36,20 +36,23 @@ describe('VnLocation', () => {
         });
         it('Fin by postalCode', () => {
             const postCode = '46600';
+            const postCodeLabel = '46600, Valencia(Province one), España';
             const firstOption = '[role="listbox"] .q-item:nth-child(1)';
 
             cy.get(inputLocation).click();
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type(postCode);
-            cy.get(locationOptions).should('have.length.at.least', 2);
+            cy.get(locationOptions)
+                .get(':nth-child(1)')
+                .should('have.length.at.least', 2);
+            cy.get(
+                firstOption.concat(' > .q-item__section > .q-item__label--caption')
+            ).should('have.text', postCodeLabel);
             cy.get(firstOption).click();
             cy.get('.q-btn-group > .q-btn--standard > .q-btn__content > .q-icon').click();
             cy.reload();
             cy.waitForElement('.q-form');
-            cy.get(inputLocation).should(
-                'have.value',
-                '46600 - Valencia(Province one), España'
-            );
+            cy.get(inputLocation).should('have.value', postCodeLabel);
         });
 
         it('Create postCode', () => {

From 013a76cbce074ef727b371ce949bbf79b8f75f7e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 11:48:00 +0200
Subject: [PATCH 03/14] test: VnLocation

---
 src/components/common/VnLocation.vue                    | 3 ---
 test/cypress/integration/vnComponent/vnLocation.spec.js | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index c3b07c72c..633d32b85 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -13,7 +13,6 @@ const props = defineProps({
     },
 });
 const formatLocation = (obj, properties) => {
-    // Crear un array con las propiedades del objeto
     const parts = properties.map((prop) => {
         if (typeof prop === 'string') {
             return obj[prop];
@@ -23,12 +22,10 @@ const formatLocation = (obj, properties) => {
         return null;
     });
 
-    // Filtrar los valores que no son null o undefined
     const filteredParts = parts.filter(
         (part) => part !== null && part !== undefined && part !== ''
     );
 
-    // Unir los valores filtrados con el formato deseado
     return filteredParts.join(', ');
 };
 
diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 15ab53d17..1872d3591 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -34,7 +34,7 @@ describe('VnLocation', () => {
             cy.visit('/#/supplier/567/fiscal-data', { timeout: 7000 });
             cy.waitForElement('.q-form');
         });
-        it('Fin by postalCode', () => {
+        it('Find by postalCode', () => {
             const postCode = '46600';
             const postCodeLabel = '46600, Valencia(Province one), España';
             const firstOption = '[role="listbox"] .q-item:nth-child(1)';

From a5c6d628ca9eb4378cd548e4a4d9b79bc554592e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 23 Sep 2024 18:48:58 +0000
Subject: [PATCH 04/14] feat: enable notify positive when user update self data

---
 src/components/UserPanel.vue | 43 +++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 98334460a..5276f9e20 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -13,12 +13,14 @@ import FetchData from 'components/FetchData.vue';
 import { useClipboard } from 'src/composables/useClipboard';
 import { useRole } from 'src/composables/useRole';
 import VnAvatar from './ui/VnAvatar.vue';
+import useNotify from 'src/composables/useNotify';
 
 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
 const { copyText } = useClipboard();
+const { notify } = useNotify();
 
 const userLocale = computed({
     get() {
@@ -53,6 +55,7 @@ const user = state.getUser();
 const warehousesData = ref();
 const companiesData = ref();
 const accountBankData = ref();
+const isEmployee = computed(() => useRole().isEmployee());
 
 onMounted(async () => {
     updatePreferences();
@@ -70,18 +73,28 @@ function updatePreferences() {
 
 async function saveDarkMode(value) {
     const query = `/UserConfigs/${user.value.id}`;
-    await axios.patch(query, {
-        darkMode: value,
-    });
-    user.value.darkMode = value;
+    try {
+        await axios.patch(query, {
+            darkMode: value,
+        });
+        user.value.darkMode = value;
+        notify('globals.dataSaved', 'positive');
+    } catch (error) {
+        console.error(error);
+    }
 }
 
 async function saveLanguage(value) {
     const query = `/VnUsers/${user.value.id}`;
-    await axios.patch(query, {
-        lang: value,
-    });
-    user.value.lang = value;
+    try {
+        await axios.patch(query, {
+            lang: value,
+        });
+        user.value.lang = value;
+        notify('globals.dataSaved', 'positive');
+    } catch (error) {
+        console.error(error);
+    }
 }
 
 function logout() {
@@ -98,10 +111,18 @@ function localUserData() {
 }
 
 function saveUserData(param, value) {
-    axios.post('UserConfigs/setUserConfig', { [param]: value });
-    localUserData();
+    try {
+        axios.post('UserConfigs/setUserConfig', { [param]: value });
+        localUserData();
+        notify('globals.dataSaved', 'positive');
+    } catch (error) {
+        console.error(error);
+    }
 }
-const isEmployee = computed(() => useRole().isEmployee());
+
+const onDataSaved = () => {
+    notify('globals.dataSaved', 'positive');
+};
 </script>
 
 <template>

From 72ddeaa90ae3a8f871dfc136fa73045cb7709538 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 25 Sep 2024 10:53:38 +0200
Subject: [PATCH 05/14] test: refs #8031 e2e

---
 src/components/UserPanel.vue                  | 20 ++++---
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 .../integration/vnComponent/UserPanel.spec.js | 58 +++++++++++++++++++
 test/cypress/support/commands.js              |  6 ++
 5 files changed, 78 insertions(+), 8 deletions(-)
 create mode 100644 test/cypress/integration/vnComponent/UserPanel.spec.js

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 5276f9e20..810f63044 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -78,9 +78,9 @@ async function saveDarkMode(value) {
             darkMode: value,
         });
         user.value.darkMode = value;
-        notify('globals.dataSaved', 'positive');
+        onDataSaved();
     } catch (error) {
-        console.error(error);
+        onDataError();
     }
 }
 
@@ -91,9 +91,9 @@ async function saveLanguage(value) {
             lang: value,
         });
         user.value.lang = value;
-        notify('globals.dataSaved', 'positive');
+        onDataSaved();
     } catch (error) {
-        console.error(error);
+        onDataError();
     }
 }
 
@@ -110,19 +110,23 @@ function localUserData() {
     state.setUser(user.value);
 }
 
-function saveUserData(param, value) {
+async function saveUserData(param, value) {
     try {
-        axios.post('UserConfigs/setUserConfig', { [param]: value });
+        await axios.post('UserConfigs/setUserConfig', { [param]: value });
         localUserData();
-        notify('globals.dataSaved', 'positive');
+        onDataSaved();
     } catch (error) {
-        console.error(error);
+        onDataError();
     }
 }
 
 const onDataSaved = () => {
     notify('globals.dataSaved', 'positive');
 };
+
+const onDataError = () => {
+    notify('errors.updateUserConfig', 'negative');
+};
 </script>
 
 <template>
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 9e1038b96..8d17b7e5f 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -302,6 +302,7 @@ errors:
     statusBadGateway: It seems that the server has fall down
     statusGatewayTimeout: Could not contact the server
     userConfig: Error fetching user config
+    updateUserConfig: Error updating user config
     tokenConfig: Error fetching token config
     writeRequest: The requested operation could not be completed
 login:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index c07e1f631..7a7a16dbc 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -306,6 +306,7 @@ errors:
     statusBadGateway: Parece ser que el servidor ha caído
     statusGatewayTimeout: No se ha podido contactar con el servidor
     userConfig: Error al obtener configuración de usuario
+    updateUserConfig: Error al actualizar la configuración de usuario
     tokenConfig: Error al obtener configuración de token
     writeRequest: No se pudo completar la operación solicitada
 login:
diff --git a/test/cypress/integration/vnComponent/UserPanel.spec.js b/test/cypress/integration/vnComponent/UserPanel.spec.js
new file mode 100644
index 000000000..e83d07954
--- /dev/null
+++ b/test/cypress/integration/vnComponent/UserPanel.spec.js
@@ -0,0 +1,58 @@
+/// <reference types="cypress" />
+describe('UserPanel', () => {
+    beforeEach(() => {
+        cy.viewport(1280, 720);
+        cy.login('developer');
+        cy.visit(`/#dashboard`);
+        cy.waitForElement('.q-page', 6000);
+    });
+
+    it('should notify when update user warehouse', () => {
+        const userWarehouse =
+            '.q-menu .q-gutter-xs > :nth-child(3) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native> .q-field__input';
+
+        // Abro el panel
+        cy.openUserPanel();
+
+        // Compruebo la opcion inicial
+        cy.get(userWarehouse).should('have.value', 'VNL').click();
+
+        // Actualizo la opción
+        getOption(3);
+
+        //Compruebo la notificación
+        cy.get('.q-notification').should('be.visible');
+        cy.get(userWarehouse).should('have.value', 'VNH');
+
+        //Restauro el valor
+        cy.get(userWarehouse).click();
+        getOption(2);
+    });
+    it('should notify when update user company', () => {
+        const userCompany =
+            '.q-menu .q-gutter-xs > :nth-child(2)  >  .q-field--float > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native> .q-field__input';
+
+        // Abro el panel
+        cy.openUserPanel();
+
+        // Compruebo la opcion inicial
+        cy.get(userCompany).should('have.value', 'Warehouse One').click();
+
+        //Actualizo la opción
+        getOption(2);
+
+        //Compruebo la notificación
+        cy.get('.q-notification').should('be.visible');
+        cy.get(userCompany).should('have.value', 'Warehouse Two');
+
+        //Restauro el valor
+        cy.get(userCompany).click();
+        getOption(1);
+    });
+});
+
+function getOption(index) {
+    cy.waitForElement('[role="listbox"]');
+    const option = `[role="listbox"] .q-item:nth-child(${index})`;
+    cy.get(option).click();
+}
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 43788f59f..83f45b721 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -248,3 +248,9 @@ Cypress.Commands.add('validateContent', (selector, expectedValue) => {
 Cypress.Commands.add('openActionsDescriptor', () => {
     cy.get('.header > :nth-child(3) > .q-btn__content > .q-icon').click();
 });
+
+Cypress.Commands.add('openUserPanel', () => {
+    cy.get(
+        '.column > .q-avatar > .q-avatar__content > .q-img > .q-img__container > .q-img__image'
+    ).click();
+});

From cb0d3c5bca1319b995fcba4add6dd138372fb7ee Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 30 Sep 2024 09:46:00 +0200
Subject: [PATCH 06/14] fix: refs #7404 sticky footer and transparent header
 for vnTable

---
 src/components/LeftMenuItem.vue            |  1 -
 src/components/VnTable/VnTable.vue         | 44 ++++++++++------------
 src/pages/Entry/EntryStockBought.vue       | 22 +++++++----
 src/pages/Entry/EntryStockBoughtDetail.vue | 15 +++-----
 4 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index ab74c1de5..a3112b17f 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -44,7 +44,6 @@ const itemComputed = computed(() => {
         </QItemSection>
     </QItem>
 </template>
-
 <style lang="scss" scoped>
 .q-item {
     min-height: 5vh;
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 572dbf144..6d27f7ced 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -73,7 +73,6 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-
     hasSubToolbar: {
         type: Boolean,
         default: null,
@@ -685,17 +684,15 @@ function handleOnDataSaved(_) {
                         </QCard>
                     </component>
                 </template>
-                <template #bottom-row="{ cols }" v-if="footer">
-                    <QTr v-if="rows.length" class="bg-header" style="height: 30px">
+                <template #bottom-row="{ cols }" v-if="$props.footer">
+                    <QTr v-if="rows.length" style="height: 30px">
                         <QTh
                             v-for="col of cols.filter((cols) => cols.visible ?? true)"
                             :key="col?.id"
                             class="text-center"
+                            :class="getColAlign(col)"
                         >
-                            <slot
-                                :name="`column-footer-${col.name}`"
-                                :class="getColAlign(col)"
-                            />
+                            <slot :name="`column-footer-${col.name}`" />
                         </QTh>
                     </QTr>
                 </template>
@@ -774,16 +771,6 @@ es:
     color: var(--vn-text-color);
 }
 
-.q-table--dark .q-table__bottom,
-.q-table--dark thead,
-.q-table--dark tr {
-    border-color: var(--vn-section-color);
-}
-
-.q-table__container > div:first-child {
-    background-color: var(--vn-page-color);
-}
-
 .grid-three {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(400px, max-content));
@@ -857,6 +844,15 @@ es:
         background-color: var(--vn-section-color);
         z-index: 1;
     }
+    table tbody th {
+        position: relative;
+    }
+    tbody:nth-last-child(1) {
+        @extend .bg-header;
+        position: sticky;
+        z-index: 2;
+        bottom: 0;
+    }
 }
 
 .vn-label-value {
@@ -903,12 +899,12 @@ es:
     user-select: all;
 }
 
-.full-width-slot {
-    width: 100%;
-    display: flex;
-    text-align: center;
-    color: var(--vn-text-color);
-    margin-bottom: -1%;
-    background-color: var(--vn-header-color);
+.q-table__container.q-table--horizontal-separator.column.no-wrap.q-table__card.q-table__card--dark.q-dark.q-table--flat.q-table--dark.q-table--no-wrap.vnTable,
+.q-table__container.q-table--horizontal-separator.column.no-wrap.q-table__card.q-table--flat.q-table--no-wrap.vnTable {
+    background-color: transparent;
+}
+
+.q-table__middle.q-virtual-scroll.q-virtual-scroll--vertical.scroll {
+    background-color: var(--vn-section-color);
 }
 </style>
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 4750a8417..b41973243 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -47,7 +47,7 @@ const columns = [
         },
     },
     {
-        align: 'left',
+        align: 'center',
         label: t('Reserve'),
         name: 'reserve',
         columnFilter: false,
@@ -141,6 +141,10 @@ function setFooter(data) {
     });
     tableRef.value.footer = footer;
 }
+
+function round(value) {
+    return Math.round(value * 100) / 100;
+}
 </script>
 <template>
     <VnSubToolbar>
@@ -152,7 +156,9 @@ function setFooter(data) {
                 :filter="filter"
                 @on-fetch="
                     (data) => {
-                        travel = data.find((data) => data.warehouseIn.code === 'VNH');
+                        travel = data.find(
+                            (data) => data.warehouseIn.code.toLowerCase() === 'vnh'
+                        );
                     }
                 "
             />
@@ -205,8 +211,9 @@ function setFooter(data) {
             />
         </template>
     </RightMenu>
+
     <div class="table-container">
-        <QPage class="column items-center q-pa-md">
+        <div class="column items-center">
             <VnTable
                 ref="tableRef"
                 data-key="StockBoughts"
@@ -228,6 +235,7 @@ function setFooter(data) {
                 :columns="columns"
                 :user-params="userParams"
                 :footer="true"
+                table-height="80vh"
                 auto-load
             >
                 <template #column-workerFk="{ row }">
@@ -243,7 +251,7 @@ function setFooter(data) {
                 </template>
                 <template #column-footer-reserve>
                     <span>
-                        {{ tableRef.footer.reserve }}
+                        {{ round(tableRef.footer.reserve) }}
                     </span>
                 </template>
                 <template #column-footer-bought>
@@ -253,11 +261,11 @@ function setFooter(data) {
                                 tableRef.footer.reserve < tableRef.footer.bought,
                         }"
                     >
-                        {{ tableRef.footer.bought }}
+                        {{ round(tableRef.footer.bought) }}
                     </span>
                 </template>
             </VnTable>
-        </QPage>
+        </div>
     </div>
 </template>
 <style lang="scss" scoped>
@@ -272,7 +280,7 @@ function setFooter(data) {
     display: flex;
     flex-direction: column;
     align-items: center;
-    width: 40%;
+    width: 45%;
 }
 .text-negative {
     color: $negative !important;
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 2c1a5a47e..0fd775ee6 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -77,18 +77,10 @@ const columns = [
                 :columns="columns"
                 :right-search="false"
                 :disable-infinite-scroll="true"
+                :disable-option="{ card: true }"
                 :limit="0"
                 auto-load
             >
-                <template #top-left>
-                    <QBtn
-                        flat
-                        icon="Close"
-                        color="primary"
-                        class="bg-vn-section-color q-pa-xs"
-                        v-close-popup
-                    />
-                </template>
                 <template #column-entryFk="{ row }">
                     <span class="link">
                         {{ row?.entryFk }}
@@ -112,6 +104,11 @@ const columns = [
     justify-content: center;
     align-items: center;
     margin: auto;
+    background-color: var(--vn-section-color);
+    padding: 4px;
+}
+.container > div > div > .q-table__top.relative-position.row.items-center {
+    background-color: red !important;
 }
 </style>
 <i18n>

From 868e6a312f063e54f9cd567e1a6f3b2cc7c52dcc Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 30 Sep 2024 10:04:00 +0200
Subject: [PATCH 07/14] fix: refs #7404 class name

---
 src/components/VnTable/VnTable.vue   | 3 +--
 src/pages/Entry/EntryStockBought.vue | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 6d27f7ced..861a79432 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -899,8 +899,7 @@ es:
     user-select: all;
 }
 
-.q-table__container.q-table--horizontal-separator.column.no-wrap.q-table__card.q-table__card--dark.q-dark.q-table--flat.q-table--dark.q-table--no-wrap.vnTable,
-.q-table__container.q-table--horizontal-separator.column.no-wrap.q-table__card.q-table--flat.q-table--no-wrap.vnTable {
+.q-table__container {
     background-color: transparent;
 }
 
diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index b41973243..9b6eca132 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -211,7 +211,6 @@ function round(value) {
             />
         </template>
     </RightMenu>
-
     <div class="table-container">
         <div class="column items-center">
             <VnTable

From c815177be934c99db36b592db69aca6c206fda0d Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 30 Sep 2024 10:13:39 +0200
Subject: [PATCH 08/14] fix: refs #7404 translate and width problem

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

diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 9b6eca132..0e8013586 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -76,7 +76,7 @@ const columns = [
         name: 'tableActions',
         actions: [
             {
-                title: t('More'),
+                title: t('View more details'),
                 icon: 'search',
                 isPrimary: true,
                 action: (row) => {
@@ -279,7 +279,7 @@ function round(value) {
     display: flex;
     flex-direction: column;
     align-items: center;
-    width: 45%;
+    width: 35%;
 }
 .text-negative {
     color: $negative !important;
@@ -293,8 +293,8 @@ function round(value) {
         Buyer: Comprador
         Reserve: Reservado
         Bought: Comprado
-        More: Más
         Date: Fecha
+        View more details: Ver más detalles
         Reserve some space: Reservar espacio
-        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha
+        This buyer has already made a reservation for this date: Este comprador ya ha hecho una reserva para esta fecha 
 </i18n>

From 7fa0a5b28cbe5c2e7c177758158e8d610c88bd82 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 30 Sep 2024 10:47:02 +0200
Subject: [PATCH 09/14] fix: refs #7404 path name

---
 src/router/modules/entry.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 4750a4301..76b4a6e23 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -59,7 +59,7 @@ export default {
                     component: () => import('src/pages/Entry/EntryLatestBuys.vue'),
                 },
                 {
-                    path: 'stock-Bought',
+                    path: 'stock-bought',
                     name: 'EntryStockBought',
                     meta: {
                         title: 'reserves',

From cf67865b0bf099570086314099b9a214a3e17ce5 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 30 Sep 2024 11:53:54 +0200
Subject: [PATCH 10/14] feat: refs #7404 updates

---
 src/components/common/VnInput.vue       | 39 +++++++++++++++++++++++++
 src/components/common/VnSelect.vue      | 17 +++++++++++
 src/components/ui/VnFilterPanel.vue     | 16 +++-------
 src/css/app.scss                        |  8 +++++
 src/pages/InvoiceOut/InvoiceOutList.vue |  5 +++-
 src/pages/Item/ItemFixedPrice.vue       |  7 ++++-
 6 files changed, 78 insertions(+), 14 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 1246eedcd..ce7918eda 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -130,4 +130,43 @@ const mixinRules = [
 .q-field__append {
     padding-inline: 0;
 }
+// .q-field--standard .q-field__control:after {
+//     padding: 0;
+// }
+// .q-field__control-container.col.relative-position.row.no-wrap.q-anchor--skip {
+//     display: flex;
+//     flex-direction: row;
+//     align-items: flex-end;
+// }
+
+.q-field__append.q-field__marginal.row.no-wrap.items-center.row {
+    height: 20px;
+}
+.q-field--outlined .q-field__append.q-field__marginal.row.no-wrap.items-center.row {
+    height: auto;
+}
+.q-field__control,
+.q-select--with-input {
+    /* color: var(--q-primary); */
+    // margin-bottom: 10px;
+    height: 23px;
+    /* max-width: 100%; */
+    /* outline: none; */
+}
+// .q-field--labeled .q-field__native,
+// .q-field--labeled .q-field__prefix,
+// .q-field--labeled .q-field__suffix {
+//     padding-bottom: 0;
+// }
+.q-field__native,
+.q-field__prefix,
+.q-field__suffix,
+.q-field__input {
+    padding: 0;
+}
+// .q-field__append.q-field__marginal.row.no-wrap.items-center.q-anchor--skip {
+//     display: flex;
+//     flex-direction: row;
+//     align-items: flex-end;
+// }
 </style>
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index aa629767d..bd505ed29 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -283,4 +283,21 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 .q-field--outlined {
     max-width: 100%;
 }
+.q-field__inner {
+    .q-field__control {
+        min-height: auto !important;
+        .q-field__native.row {
+            min-height: auto !important;
+        }
+    }
+}
+//     &.q-field__control {
+//         min-height: auto;
+//         &.q-field__controler-container {
+//             .q-field__native {
+//                 min-height: revert;
+//             }
+//         }
+//     }
+// }
 </style>
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index ef07b7bef..43d634ad9 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -3,7 +3,6 @@ import { onMounted, ref, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import { useRoute } from 'vue-router';
-import { date } from 'quasar';
 import toDate from 'filters/toDate';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
@@ -59,7 +58,6 @@ const $props = defineProps({
 });
 
 defineExpose({ search, sanitizer });
-
 const emit = defineEmits([
     'update:modelValue',
     'refresh',
@@ -114,9 +112,9 @@ watch(
 );
 
 const isLoading = ref(false);
-async function search() {
+async function search(evt) {
     try {
-        if ($props.disableSubmitEvent) return;
+        if (evt && $props.disableSubmitEvent) return;
 
         store.filter.where = {};
         isLoading.value = true;
@@ -167,7 +165,7 @@ const tagsList = computed(() => {
     for (const key of Object.keys(userParams.value)) {
         const value = userParams.value[key];
         if (value == null || ($props.hiddenTags || []).includes(key)) continue;
-        tagList.push({ label: aliasField(key), value });
+        tagList.push({ label: key, value });
     }
     return tagList;
 });
@@ -187,7 +185,6 @@ async function remove(key) {
 }
 
 function formatValue(value) {
-    if (value instanceof Date) return date.formatDate(value, 'DD/MM/YYYY');
     if (typeof value === 'boolean') return value ? t('Yes') : t('No');
     if (isNaN(value) && !isNaN(Date.parse(value))) return toDate(value);
 
@@ -203,11 +200,6 @@ function sanitizer(params) {
     }
     return params;
 }
-
-function aliasField(field) {
-    const split = field.split('.');
-    return split[1] ?? split[0];
-}
 </script>
 
 <template>
@@ -219,7 +211,7 @@ function aliasField(field) {
         icon="search"
         @click="search()"
     ></QBtn>
-    <QForm @submit="search" id="filterPanelForm">
+    <QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
         <QList dense>
             <QItem class="q-mt-xs">
                 <QItemSection top>
diff --git a/src/css/app.scss b/src/css/app.scss
index 905934d4c..8115e44b8 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -288,3 +288,11 @@ input::-webkit-inner-spin-button {
         color: $info;
     }
 }
+.q-field__inner {
+    .q-field__control {
+        min-height: auto !important;
+        .q-field__native.row {
+            min-height: auto !important;
+        }
+    }
+}
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 5157d957b..3dc565251 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -27,13 +27,16 @@ const { openReport } = usePrintService();
 
 const columns = computed(() => [
     {
-        align: 'left',
+        align: 'center',
         name: 'id',
         label: t('invoiceOutList.tableVisibleColumns.id'),
         chip: {
             condition: () => true,
         },
         isId: true,
+        columnFilter: {
+            name: 'search',
+        },
     },
     {
         align: 'left',
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 2158065bd..7d4d6b896 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -514,7 +514,7 @@ function handleOnDataSave({ CrudModelRef }) {
             </template>
             <template #column-minPrice="props">
                 <QTd class="col">
-                    <div class="row">
+                    <div class="row" style="align-items: center">
                         <QCheckbox
                             :model-value="props.row.hasMinPrice"
                             @update:model-value="updateMinPrice($event, props)"
@@ -601,6 +601,11 @@ function handleOnDataSave({ CrudModelRef }) {
 .q-table td {
     padding-inline: 5px !important;
 }
+.q-table tr td {
+    font-size: 10pt;
+    border-top: none;
+    border-collapse: collapse;
+}
 .q-table tbody td {
     max-width: none;
     .q-td.col {

From b41026806fd434ecc73f2694d29232738258ac7e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 30 Sep 2024 12:48:05 +0200
Subject: [PATCH 11/14] style: refs #7404 compress spaces

---
 src/components/common/VnInput.vue  | 22 ++++++++++++++++------
 src/components/common/VnSelect.vue |  3 +++
 src/components/ui/VnRow.vue        |  1 +
 src/css/app.scss                   |  3 +++
 4 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index ce7918eda..e518479b5 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -145,24 +145,34 @@ const mixinRules = [
 .q-field--outlined .q-field__append.q-field__marginal.row.no-wrap.items-center.row {
     height: auto;
 }
+.q-field__control {
+    height: unset;
+}
+.q-field__control.relative-position.row.no-wrap
+    > .q-field__control-container
+    > input.q-field__native
+    ~ div.q-field__label {
+    height: 41px;
+}
 .q-field__control,
 .q-select--with-input {
     /* color: var(--q-primary); */
     // margin-bottom: 10px;
-    height: 23px;
+    // height: 23px;
     /* max-width: 100%; */
     /* outline: none; */
 }
-// .q-field--labeled .q-field__native,
-// .q-field--labeled .q-field__prefix,
-// .q-field--labeled .q-field__suffix {
-//     padding-bottom: 0;
-// }
+.q-field--labeled .q-field__native,
+.q-field--labeled .q-field__prefix,
+.q-field--labeled .q-field__suffix {
+    padding-bottom: 0;
+}
 .q-field__native,
 .q-field__prefix,
 .q-field__suffix,
 .q-field__input {
     padding: 0;
+    min-height: 15px;
 }
 // .q-field__append.q-field__marginal.row.no-wrap.items-center.q-anchor--skip {
 //     display: flex;
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index bd505ed29..15d3a9524 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -286,6 +286,9 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 .q-field__inner {
     .q-field__control {
         min-height: auto !important;
+
+        display: flex;
+        align-items: flex-end;
         .q-field__native.row {
             min-height: auto !important;
         }
diff --git a/src/components/ui/VnRow.vue b/src/components/ui/VnRow.vue
index 16bcfab7d..0df1fb7d4 100644
--- a/src/components/ui/VnRow.vue
+++ b/src/components/ui/VnRow.vue
@@ -9,6 +9,7 @@ defineProps({ wrap: { type: Boolean, default: false } });
 <style lang="scss" scoped>
 .vn-row {
     display: flex;
+    align-items: flex-end;
     > :deep(*) {
         flex: 1;
     }
diff --git a/src/css/app.scss b/src/css/app.scss
index 8115e44b8..c77af41f9 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -291,6 +291,9 @@ input::-webkit-inner-spin-button {
 .q-field__inner {
     .q-field__control {
         min-height: auto !important;
+        display: flex;
+        align-items: flex-end;
+        padding-bottom: 2px;
         .q-field__native.row {
             min-height: auto !important;
         }

From b3c36e555f4ecb81ae4022514c05b89ea2bd74ab Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 30 Sep 2024 12:50:23 +0200
Subject: [PATCH 12/14] style: refs #7404 compress spaces

---
 src/components/common/VnInput.vue  | 41 +++++++-----------------------
 src/components/common/VnSelect.vue |  9 -------
 2 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index e518479b5..f389ca842 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -130,14 +130,6 @@ const mixinRules = [
 .q-field__append {
     padding-inline: 0;
 }
-// .q-field--standard .q-field__control:after {
-//     padding: 0;
-// }
-// .q-field__control-container.col.relative-position.row.no-wrap.q-anchor--skip {
-//     display: flex;
-//     flex-direction: row;
-//     align-items: flex-end;
-// }
 
 .q-field__append.q-field__marginal.row.no-wrap.items-center.row {
     height: 20px;
@@ -154,29 +146,14 @@ const mixinRules = [
     ~ div.q-field__label {
     height: 41px;
 }
-.q-field__control,
-.q-select--with-input {
-    /* color: var(--q-primary); */
-    // margin-bottom: 10px;
-    // height: 23px;
-    /* max-width: 100%; */
-    /* outline: none; */
+
+.q-field--labeled {
+    .q-field__native,
+    .q-field__prefix,
+    .q-field__suffix,
+    .q-field__input {
+        padding-bottom: 0;
+        min-height: 15px;
+    }
 }
-.q-field--labeled .q-field__native,
-.q-field--labeled .q-field__prefix,
-.q-field--labeled .q-field__suffix {
-    padding-bottom: 0;
-}
-.q-field__native,
-.q-field__prefix,
-.q-field__suffix,
-.q-field__input {
-    padding: 0;
-    min-height: 15px;
-}
-// .q-field__append.q-field__marginal.row.no-wrap.items-center.q-anchor--skip {
-//     display: flex;
-//     flex-direction: row;
-//     align-items: flex-end;
-// }
 </style>
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 15d3a9524..84ab4b4b6 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -294,13 +294,4 @@ const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
         }
     }
 }
-//     &.q-field__control {
-//         min-height: auto;
-//         &.q-field__controler-container {
-//             .q-field__native {
-//                 min-height: revert;
-//             }
-//         }
-//     }
-// }
 </style>

From e7a2d3aa85fb98a4abde729b70fd83a315151d94 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 30 Sep 2024 20:20:51 +0200
Subject: [PATCH 13/14] fix: refs #7354 ZonLocation filter

---
 src/pages/Zone/Card/ZoneLocationsTree.vue | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index cb1508ed6..6b3934df7 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { onMounted, ref, computed, watch, onUnmounted } from 'vue';
 import { useRoute } from 'vue-router';
-
+import VnInput from 'src/components/common/VnInput.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import { useArrayData } from 'composables/useArrayData';
@@ -144,7 +144,8 @@ watch(storeData, async (val) => {
 });
 
 const reFetch = async () => {
-    await arrayData.fetch({ append: false });
+    const { data } = await arrayData.fetch({ append: false });
+    nodes.value = data;
 };
 
 onMounted(async () => {
@@ -182,6 +183,16 @@ onUnmounted(() => {
 </script>
 
 <template>
+    <VnInput
+        v-if="showSearchBar"
+        v-model="store.userParams.search"
+        :placeholder="$t('globals.search')"
+        @update:model-value="reFetch()"
+    >
+        <template #prepend>
+            <QBtn color="primary" icon="search" dense flat @click="reFetch()" />
+        </template>
+    </VnInput>
     <QTree
         ref="treeRef"
         :nodes="nodes"

From 41acf0e1e2e025e80a086018b04e4a5012fb4b69 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 1 Oct 2024 00:24:34 +0200
Subject: [PATCH 14/14] feat: #7679 show country provinces

---
 src/components/CreateNewCityForm.vue          | 40 ++++++++++++-------
 src/components/CreateNewPostcodeForm.vue      | 31 +++++++++++---
 src/components/CreateNewProvinceForm.vue      | 16 +++++++-
 src/components/VnSelectProvince.vue           | 40 +++++++++++--------
 .../vnComponent/vnLocation.spec.js            | 19 +++++++++
 5 files changed, 108 insertions(+), 38 deletions(-)

diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index 9a7d8666c..85d13beb1 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -1,35 +1,42 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelectProvince from 'components/VnSelectProvince.vue';
 import VnInput from 'components/common/VnInput.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
 const emit = defineEmits(['onDataSaved']);
-
+const $props = defineProps({
+    countryFk: {
+        type: Number,
+        default: null,
+    },
+    provinceSelected: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
+});
 const { t } = useI18n();
 
-const cityFormData = reactive({
+const cityFormData = ref({
     name: null,
     provinceFk: null,
 });
-
-const provincesOptions = ref([]);
-
+onMounted(() => {
+    cityFormData.value.provinceFk = $props.provinceSelected;
+});
 const onDataSaved = (...args) => {
     emit('onDataSaved', ...args);
 };
 </script>
 
 <template>
-    <FetchData
-        @on-fetch="(data) => (provincesOptions = data)"
-        auto-load
-        url="Provinces"
-    />
     <FormModelPopup
         :title="t('New city')"
         :subtitle="t('Please, ensure you put the correct data!')"
@@ -41,11 +48,16 @@ const onDataSaved = (...args) => {
         <template #form-inputs="{ data, validate }">
             <VnRow>
                 <VnInput
-                    :label="t('Name')"
+                    :label="t('Names')"
                     v-model="data.name"
                     :rules="validate('city.name')"
                 />
-                <VnSelectProvince v-model="data.provinceFk" />
+                <VnSelectProvince
+                    :province-selected="$props.provinceSelected"
+                    :country-fk="$props.countryFk"
+                    v-model="data.provinceFk"
+                    :provinces="$props.provinces"
+                />
             </VnRow>
         </template>
     </FormModelPopup>
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index dc8027989..396a7ebc8 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -63,17 +63,27 @@ function setTown(newTown, data) {
 }
 
 async function setProvince(id, data) {
-    await provincesFetchDataRef.value.fetch();
     const newProvince = provincesOptions.value.find((province) => province.id == id);
     if (!newProvince) return;
 
     data.countryFk = newProvince.countryFk;
 }
 
+async function onProvinceCreated(data) {
+    await provincesFetchDataRef.value.fetch({
+        where: { countryFk: postcodeFormData.countryFk },
+    });
+    postcodeFormData.provinceFk.value = data.id;
+}
+
 watch(
     () => [postcodeFormData.countryFk],
-    async (newCountryFk) => {
-        if (newCountryFk) {
+    async (newCountryFk, oldValueFk) => {
+        if (!!oldValueFk[0] && newCountryFk[0] !== oldValueFk[0]) {
+            postcodeFormData.provinceFk = null;
+            postcodeFormData.townFk = null;
+        }
+        if ((newCountryFk, newCountryFk !== postcodeFormData.countryFk)) {
             await provincesFetchDataRef.value.fetch({
                 where: {
                     countryFk: newCountryFk[0],
@@ -93,7 +103,7 @@ watch(
 watch(
     () => postcodeFormData.provinceFk,
     async (newProvinceFk) => {
-        if (newProvinceFk) {
+        if (newProvinceFk[0] && newProvinceFk[0] !== postcodeFormData.provinceFk) {
             await townsFetchDataRef.value.fetch({
                 where: { provinceFk: newProvinceFk[0] },
             });
@@ -121,6 +131,7 @@ async function handleCountries(data) {
     <FetchData
         ref="townsFetchDataRef"
         @on-fetch="handleTowns"
+        :limit="30"
         auto-load
         url="Towns/location"
     />
@@ -140,6 +151,7 @@ async function handleCountries(data) {
                     :label="t('Postcode')"
                     v-model="data.code"
                     :rules="validate('postcode.code')"
+                    clearable
                 />
                 <VnSelectDialog
                     :label="t('City')"
@@ -151,7 +163,7 @@ async function handleCountries(data) {
                     :rules="validate('postcode.city')"
                     :acls="[{ model: 'Town', props: '*', accessType: 'WRITE' }]"
                     :emit-value="false"
-                    clearable
+                    :clearable="true"
                 >
                     <template #option="{ itemProps, opt }">
                         <QItem v-bind="itemProps">
@@ -166,6 +178,9 @@ async function handleCountries(data) {
                     </template>
                     <template #form>
                         <CreateNewCityForm
+                            :country-fk="data.countryFk"
+                            :province-selected="data.provinceFk"
+                            :provinces="provincesOptions"
                             @on-data-saved="
                                 (_, requestResponse) =>
                                     onCityCreated(requestResponse, data)
@@ -176,9 +191,13 @@ async function handleCountries(data) {
             </VnRow>
             <VnRow>
                 <VnSelectProvince
-                    :country-fk="postcodeFormData.countryFk"
+                    :country-fk="data.countryFk"
+                    :province-selected="data.provinceFk"
                     @update:model-value="(value) => setProvince(value, data)"
                     v-model="data.provinceFk"
+                    :clearable="true"
+                    :provinces="provincesOptions"
+                    @on-province-created="onProvinceCreated"
                 />
                 <VnSelect
                     :label="t('Country')"
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index e32684a98..4c1d96930 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -16,7 +16,16 @@ const provinceFormData = reactive({
     name: null,
     autonomyFk: null,
 });
-
+const $props = defineProps({
+    countryFk: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
+});
 const autonomiesOptions = ref([]);
 
 const onDataSaved = (dataSaved, requestResponse) => {
@@ -31,6 +40,11 @@ const onDataSaved = (dataSaved, requestResponse) => {
     <FetchData
         @on-fetch="(data) => (autonomiesOptions = data)"
         auto-load
+        :filter="{
+            where: {
+                countryFk: $props.countryFk,
+            },
+        }"
         url="Autonomies/location"
     />
     <FormModelPopup
diff --git a/src/components/VnSelectProvince.vue b/src/components/VnSelectProvince.vue
index d89827821..9eef125cc 100644
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@@ -8,18 +8,27 @@ import FetchData from 'components/FetchData.vue';
 import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
 
 const emit = defineEmits(['onProvinceCreated']);
-const provinceFk = defineModel({ type: Number });
-watch(provinceFk, async () => await provincesFetchDataRef.value.fetch());
 const $props = defineProps({
     countryFk: {
         type: Number,
         default: null,
     },
+    provinceSelected: {
+        type: Number,
+        default: null,
+    },
+    provinces: {
+        type: Array,
+        default: () => [],
+    },
 });
+const provinceFk = defineModel({ type: Number, default: null });
+
 const { validate } = useValidator();
 const { t } = useI18n();
 
-const provincesOptions = ref();
+const provincesOptions = ref($props.provinces);
+provinceFk.value = $props.provinceSelected;
 const provincesFetchDataRef = ref();
 
 async function onProvinceCreated(_, data) {
@@ -27,16 +36,6 @@ async function onProvinceCreated(_, data) {
     provinceFk.value = data.id;
     emit('onProvinceCreated', data);
 }
-watch(
-    () => $props.countryFk,
-    async (newProvinceFk) => {
-        if (newProvinceFk) {
-            await provincesFetchDataRef.value.fetch({
-                where: { countryFk: newProvinceFk },
-            });
-        }
-    }
-);
 async function handleProvinces(data) {
     provincesOptions.value = data;
 }
@@ -45,14 +44,18 @@ async function handleProvinces(data) {
 <template>
     <FetchData
         ref="provincesFetchDataRef"
-        :filter="{ include: { relation: 'country' } }"
+        :filter="{
+            include: { relation: 'country' },
+            where: {
+                countryFk: $props.countryFk,
+            },
+        }"
         @on-fetch="handleProvinces"
-        auto-load
         url="Provinces"
     />
     <VnSelectDialog
         :label="t('Province')"
-        :options="provincesOptions"
+        :options="$props.provinces"
         hide-selected
         v-model="provinceFk"
         :rules="validate && validate('postcode.provinceFk')"
@@ -67,7 +70,10 @@ async function handleProvinces(data) {
             </QItem>
         </template>
         <template #form>
-            <CreateNewProvinceForm @on-data-saved="onProvinceCreated" />
+            <CreateNewProvinceForm
+                :country-fk="$props.countryFk"
+                @on-data-saved="onProvinceCreated"
+            />
         </template>
     </VnSelectDialog>
 </template>
diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 88919e41c..78dc38899 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -48,6 +48,25 @@ describe('VnLocation', () => {
                 `${createForm.prefix} > :nth-child(4) > .q-field:nth-child(3)> ${createForm.sufix}`
             ).should('have.length', 1);
         });
+        it('should pass selected country', () => {
+            // Select a country
+            const country = 'Ecuador';
+            const province = 'Province five';
+            cy.selectOption(
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(5)> ${createForm.sufix}`,
+                country
+            );
+            cy.selectOption(
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix}`,
+                province
+            );
+            cy.get(
+                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(3) > .q-icon`
+            ).click();
+            cy.get(
+                `#q-portal--dialog--4 > .q-dialog > ${createForm.prefix} > .vn-row > .q-select > ${createForm.sufix} > :nth-child(1) input`
+            ).should('have.value', province);
+        });
     });
     describe('Worker Create', () => {
         beforeEach(() => {