From 7c9322d52ca971769010817340d326e1b3ddbffa Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 24 Oct 2023 12:49:36 +0200
Subject: [PATCH 001/105] refs #6256 lv breakword

---
 src/components/ui/CardSummary.vue           |  6 +++--
 src/components/ui/VnLv.vue                  | 26 +++++++++++++++++++--
 src/pages/Customer/Card/CustomerSummary.vue |  2 +-
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index b54e44398..a95cc414b 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -93,7 +93,7 @@ watch(props, async () => {
             flex: 2;
         }
         > .q-card.vn-three {
-            flex: 3;
+            flex: 4;
         }
         > .q-card.vn-max {
             width: 100%;
@@ -112,11 +112,13 @@ watch(props, async () => {
                 margin-top: 5px;
                 .label {
                     color: var(--vn-label);
-                    width: 10em;
+                    width: 8em;
                     overflow: hidden;
                     white-space: nowrap;
                     text-overflow: ellipsis;
                     margin-right: 10px;
+                    flex-grow: 0;
+                    flex-shrink: 0;
                 }
                 .value {
                     color: var(--vn-text);
diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue
index 0f9b99713..3863b4f30 100644
--- a/src/components/ui/VnLv.vue
+++ b/src/components/ui/VnLv.vue
@@ -9,14 +9,36 @@ const $props = defineProps({
     titleValue: { type: [Number, String, Boolean], default: null },
     info: { type: String, default: null },
     dash: { type: Boolean, default: true },
+    textOverflow: { type: String, default: 'ellipsis' },
 });
 const isBooleanValue = computed(() => typeof $props.value === 'boolean');
+const textOverflowClass = computed(() => {
+    if ($props.textOverflow === 'ellipsis') return 'line-break-text';
+    return 'ellipsis-text';
+});
 </script>
+<style scoped>
+.ellipsis-text {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+.line-break-text {
+    white-space: pre-line;
+    hyphens: auto;
+    word-wrap: break-word;
+}
+</style>
 <template>
     <div class="vn-label-value">
         <div v-if="$props.label || $slots.label" class="label">
             <slot name="label">
-                <span :title="$props.titleLabel ?? $props.label">{{ $props.label }}</span>
+                <span
+                    :title="$props.titleLabel ?? $props.label"
+                    :class="textOverflowClass"
+                    >{{ $props.label }}</span
+                >
             </slot>
         </div>
         <div class="value">
@@ -28,7 +50,7 @@ const isBooleanValue = computed(() => typeof $props.value === 'boolean');
                 />
             </span>
             <slot v-else name="value">
-                <span :title="$props.value">
+                <span :title="$props.value" :class="textOverflowClass">
                     {{ $props.dash ? dashIfEmpty($props.value) : $props.value }}
                 </span>
             </slot>
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 081bdd157..f2653900d 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -60,7 +60,7 @@ const creditWarning = computed(() => {
 <template>
     <CardSummary ref="summary" :url="`Clients/${entityId}/summary`">
         <template #body="{ entity }">
-            <QCard class="vn-one">
+            <QCard class="vn-two">
                 <a class="header" :href="clientUrl + `basic-data`">
                     {{ t('customer.summary.basicData') }}
                     <QIcon name="open_in_new" color="primary" />

From b6fc7cd0b4a541ded319cfaa527f39d17765d343 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 24 Oct 2023 13:41:24 +0200
Subject: [PATCH 002/105] refs #6256 vn-one

---
 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 f2653900d..081bdd157 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -60,7 +60,7 @@ const creditWarning = computed(() => {
 <template>
     <CardSummary ref="summary" :url="`Clients/${entityId}/summary`">
         <template #body="{ entity }">
-            <QCard class="vn-two">
+            <QCard class="vn-one">
                 <a class="header" :href="clientUrl + `basic-data`">
                     {{ t('customer.summary.basicData') }}
                     <QIcon name="open_in_new" color="primary" />

From d328951ac17989448987e6a69b17db1bf7c00ed7 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 5 Dec 2023 14:26:11 +0100
Subject: [PATCH 003/105] refs #6256 refactor line break

---
 src/components/ui/CardSummary.vue |  3 ---
 src/components/ui/VnLv.vue        | 22 ++++------------------
 2 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index a95cc414b..9f3d9756b 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -122,10 +122,7 @@ watch(props, async () => {
                 }
                 .value {
                     color: var(--vn-text);
-                    width: max-content;
                     overflow: hidden;
-                    white-space: nowrap;
-                    text-overflow: ellipsis;
                 }
             }
             .header {
diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue
index 3863b4f30..add546ab0 100644
--- a/src/components/ui/VnLv.vue
+++ b/src/components/ui/VnLv.vue
@@ -9,22 +9,12 @@ const $props = defineProps({
     titleValue: { type: [Number, String, Boolean], default: null },
     info: { type: String, default: null },
     dash: { type: Boolean, default: true },
-    textOverflow: { type: String, default: 'ellipsis' },
 });
 const isBooleanValue = computed(() => typeof $props.value === 'boolean');
-const textOverflowClass = computed(() => {
-    if ($props.textOverflow === 'ellipsis') return 'line-break-text';
-    return 'ellipsis-text';
-});
 </script>
 <style scoped>
-.ellipsis-text {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-.line-break-text {
+.label,
+.value {
     white-space: pre-line;
     hyphens: auto;
     word-wrap: break-word;
@@ -34,11 +24,7 @@ const textOverflowClass = computed(() => {
     <div class="vn-label-value">
         <div v-if="$props.label || $slots.label" class="label">
             <slot name="label">
-                <span
-                    :title="$props.titleLabel ?? $props.label"
-                    :class="textOverflowClass"
-                    >{{ $props.label }}</span
-                >
+                <span :title="$props.titleLabel ?? $props.label">{{ $props.label }}</span>
             </slot>
         </div>
         <div class="value">
@@ -50,7 +36,7 @@ const textOverflowClass = computed(() => {
                 />
             </span>
             <slot v-else name="value">
-                <span :title="$props.value" :class="textOverflowClass">
+                <span :title="$props.value">
                     {{ $props.dash ? dashIfEmpty($props.value) : $props.value }}
                 </span>
             </slot>

From f7ebb869606cda56632ef04cf1ca1e0ad4ef16f9 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Dec 2023 11:42:37 +0100
Subject: [PATCH 004/105] refs #6576 fix: correct version

---
 CHANGELOG.md | 15 +++++++++------
 package.json |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3316aa441..828d5be48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,15 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2352.01] - 2023-12-28
+## [2350.01] - 2023-12-14
 
 ### Added
-- (carros) => Se añade contador de carros. #6545
-- (Reclamaciones) => Se añade la sección para hacer acciones sobre una reclamación. #5654
-### Changed
-### Fixed
-- (Reclamaciones) => Se corrige el color de la barra según el tema y el evento de actualziar cantidades #6334
 
+-   (Carros) => Se añade contador de carros. #6545
+-   (Reclamaciones) => Se añade la sección para hacer acciones sobre una reclamación. #5654
+
+### Changed
+
+### Fixed
+
+-   (Reclamaciones) => Se corrige el color de la barra según el tema y el evento de actualziar cantidades #6334
 
 ## [2253.01] - 2023-01-05
 
diff --git a/package.json b/package.json
index 583233204..af9ed1ee3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "23.52.01",
+    "version": "23.50.01",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

From 126e1323bf7f074047c781f2533a135327df2ec3 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 14 Dec 2023 12:06:25 +0100
Subject: [PATCH 005/105] refs #6334 refresh

---
 src/pages/Claim/Card/ClaimLines.vue | 116 ++++++----------------------
 1 file changed, 25 insertions(+), 91 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index 9d2a12804..4eaef2958 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -6,9 +6,8 @@ import { useQuasar } from 'quasar';
 import { useRoute } from 'vue-router';
 import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
-import VnPaginate from 'components/ui/VnPaginate.vue';
+import CrudModel from 'components/CrudModel.vue';
 import FetchData from 'components/FetchData.vue';
-import VnConfirm from 'components/ui/VnConfirm.vue';
 
 import { toDate, toCurrency, toPercentage } from 'filters/index';
 import VnDiscount from 'components/common/vnDiscount.vue';
@@ -17,6 +16,7 @@ import ClaimLinesImport from './ClaimLinesImport.vue';
 const quasar = useQuasar();
 const route = useRoute();
 const { t } = useI18n();
+
 const stateStore = useStateStore();
 const arrayData = useArrayData('ClaimLines');
 const store = arrayData.store;
@@ -36,16 +36,17 @@ const linesFilter = {
     },
 };
 
+const claimLinesForm = ref();
 const claim = ref(null);
 async function onFetchClaim(data) {
     claim.value = data;
-
     fetchMana();
 }
 
-const amount = ref(0);
-const amountClaimed = ref(0);
+const amount = ref();
+const amountClaimed = ref();
 async function onFetch(rows) {
+    if (!rows || !rows.length) return;
     amount.value = rows.reduce(
         (acumulator, { sale }) => acumulator + sale.price * sale.quantity,
         0
@@ -141,60 +142,23 @@ function onUpdateDiscount(response) {
     });
 }
 
-async function confirmRemove() {
-    const rows = selected.value;
-    const count = rows.length;
-
-    if (count === 0) {
-        return quasar.notify({
-            message: 'You must select at least one row',
-            type: 'warning',
-        });
-    }
-
-    quasar
-        .dialog({
-            component: VnConfirm,
-            componentProps: {
-                title: t('Delete claimed sales'),
-                message: t('You are about to remove {count} rows', count, { count }),
-                data: { rows },
-                promise: remove,
-            },
-        })
-        .onOk(() => {
-            for (const row of rows) {
-                const orgData = store.data;
-                const index = orgData.findIndex((item) => item.id === row.id);
-                store.data.splice(index, 1);
-                selected.value = [];
-            }
-        });
-}
-
-async function remove({ rows }) {
-    if (!rows.length) return;
-    const body = { deletes: rows.map((row) => row.id) };
-    await axios.post(`ClaimBeginnings/crud`, body);
-    quasar.notify({
-        type: 'positive',
-        message: t('globals.rowRemoved'),
-    });
-}
-
 function showImportDialog() {
     quasar
         .dialog({
             component: ClaimLinesImport,
+            componentProps: {
+                ticketId: claim.value.ticketFk,
+            },
         })
-        .onOk(() => arrayData.refresh());
+        .onOk(() => claimLinesForm.value.reload());
+}
+function isSubToolbarShown() {
+    return amount.value && amountClaimed;
 }
 </script>
 <template>
-    <QPageSticky position="top" :offset="[0, 0]" expand>
-        <QToolbar class="bg-dark text-white">
-            <QToolbarTitle> {{ t('Claimed lines') }} </QToolbarTitle>
-            <QSpace />
+    <Teleport to="#st-data" v-if="isSubToolbarShown()">
+        <QToolbar>
             <div class="row q-gutter-md">
                 <div>
                     {{ t('Amount') }}
@@ -211,7 +175,7 @@ function showImportDialog() {
                 </div>
             </div>
         </QToolbar>
-    </QPageSticky>
+    </Teleport>
 
     <FetchData
         :url="`Claims/${route.params.id}`"
@@ -221,11 +185,16 @@ function showImportDialog() {
     />
     <div class="column items-center">
         <div class="list">
-            <VnPaginate
+            <CrudModel
                 data-key="ClaimLines"
+                ref="claimLinesForm"
                 :url="`Claims/${route.params.id}/lines`"
+                save-url="ClaimBeginnings/crud"
                 :filter="linesFilter"
                 @on-fetch="onFetch"
+                v-model:selected="selected"
+                :default-save="false"
+                :default-reset="false"
                 auto-load
             >
                 <template #body="{ rows }">
@@ -361,46 +330,12 @@ function showImportDialog() {
                         </template>
                     </QTable>
                 </template>
-            </VnPaginate>
+            </CrudModel>
         </div>
     </div>
 
-    <Teleport
-        v-if="stateStore.isHeaderMounted() && !$q.screen.lt.sm"
-        to="#actions-prepend"
-    >
-        <div class="row q-gutter-x-sm">
-            <QBtn
-                v-if="selected.length > 0"
-                @click="confirmRemove"
-                icon="delete"
-                color="primary"
-                flat
-                dense
-                rounded
-            >
-                <QTooltip bottom> {{ t('globals.remove') }} </QTooltip>
-            </QBtn>
-            <QBtn @click="showImportDialog" icon="add" color="primary" flat dense rounded>
-                <QTooltip bottom> {{ t('globals.add') }} </QTooltip>
-            </QBtn>
-            <QSeparator vertical />
-        </div>
-    </Teleport>
-    <!-- v-if="quasar.platform.is.mobile" -->
-    <QPageSticky v-if="$q.screen.lt.sm" position="bottom" :offset="[0, 0]" expand>
-        <QToolbar class="bg-primary text-white q-pa-none">
-            <QTabs class="full-width" align="justify" inline-label narrow-indicator>
-                <QTab @click="showImportDialog" icon="add" :label="t('globals.add')" />
-                <QSeparator vertical inset />
-                <QTab
-                    @click="confirmRemove"
-                    icon="delete"
-                    :label="t('globals.remove')"
-                    :disable="selected.length === 0"
-                />
-            </QTabs>
-        </QToolbar>
+    <QPageSticky position="bottom-right" :offset="[25, 25]">
+        <QBtn fab color="primary" icon="add" @click="showImportDialog()" />
     </QPageSticky>
 </template>
 
@@ -421,7 +356,6 @@ en:
         You are about to remove <strong>{count}</strong> row |
         You are about to remove  <strong>{count}</strong> rows'
 es:
-    Claimed lines: Líneas reclamadas
     Delivered: Entregado
     Quantity: Cantidad
     Claimed: Reclamada

From eed3267a11a746e52e55b67a8d37a77af0bff43f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 15 Dec 2023 08:16:54 +0100
Subject: [PATCH 006/105] refs #6062 test: fixed e2e due to change of style in
 the indexes

---
 .../integration/wagon/wagonCreate.spec.js     | 19 ++++++++-----------
 .../wagonType/wagonTypeCreate.spec.js         | 17 ++++++++---------
 .../integration/worker/workerList.spec.js     |  2 +-
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/test/cypress/integration/wagon/wagonCreate.spec.js b/test/cypress/integration/wagon/wagonCreate.spec.js
index 62eadc5fd..9aff3a819 100644
--- a/test/cypress/integration/wagon/wagonCreate.spec.js
+++ b/test/cypress/integration/wagon/wagonCreate.spec.js
@@ -6,6 +6,7 @@ describe('WagonCreate', () => {
     });
 
     it('should create and delete a new wagon', () => {
+        cy.waitForElement('.q-card');
         cy.get('input').eq(0).type('1234');
         cy.get('input').eq(1).type('1234ABCD');
         cy.get('input').eq(2).type('100');
@@ -16,18 +17,14 @@ describe('WagonCreate', () => {
         cy.get('button[type="submit"]').click();
 
         // Check data has been saved successfully
-        cy.get('div.text-h6').contains('1234').click();
-        cy.get('input').eq(0).should('have.value', '1234');
-        cy.get('input').eq(1).should('have.value', '1234ABCD');
-        cy.get('input').eq(2).should('have.value', '100');
-        cy.get('input').eq(3).should('have.value', 'Wagon Type #1');
+        cy.waitForElement('.q-card');
+
+        cy.get('.title').should('have.text', '1234');
+        cy.get('[title-label="Plate"] > .value > span').should('have.text', '1234ABCD');
+        cy.get(':nth-child(2) > .value > span').should('have.text', '100');
+        cy.get(':nth-child(3) > .value > span').should('have.text', 'Wagon Type #1');
 
         // Delete wagon type created
-        cy.go('back');
-        cy.get('div.text-h6')
-            .contains('1234')
-            .parentsUntil('div.q-card')
-            .find('div.q-card__actions')
-            .find('button').last().click();
+        cy.get('.actions > .q-btn--standard').click();
     });
 });
diff --git a/test/cypress/integration/wagonType/wagonTypeCreate.spec.js b/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
index ae74dff16..bcf7fe841 100644
--- a/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
+++ b/test/cypress/integration/wagonType/wagonTypeCreate.spec.js
@@ -5,13 +5,13 @@ describe('WagonTypeCreate', () => {
         cy.visit('/#/wagon/type/create');
     });
 
-    function chooseColor(color){
+    function chooseColor(color) {
         cy.get('div.shelving-down').eq(1).click();
         cy.get('div.q-color-picker__cube').eq(color).click();
         cy.get('div.q-card__section').find('button').click();
     }
 
-    function addTray(position){
+    function addTray(position) {
         cy.get('div.action-button').last().find('button').click();
         cy.focused().type(position);
         cy.focused().blur();
@@ -38,7 +38,9 @@ describe('WagonTypeCreate', () => {
         cy.get('button[type="submit"]').click();
 
         // Check data has been saved successfully
-        cy.get('div.text-h6').contains('Example for testing').click();
+        cy.get(':nth-child(1) > :nth-child(1) > .justify-between > .flex > .title')
+            .contains('Example for testing')
+            .click();
         cy.get('input').first().should('have.value', 'Example for testing');
         cy.get('div.wagon-tray').should('have.length', 4);
         cy.get('div.position').eq(0).find('input').should('have.value', '150');
@@ -47,11 +49,8 @@ describe('WagonTypeCreate', () => {
 
         // Delete wagon type created
         cy.go('back');
-        cy.get('div.text-h6')
-            .contains('Example for testing')
-            .parentsUntil('div.q-card')
-            .find('div.q-card__actions')
-            .find('button').last().click();
-
+        cy.get(
+            ':nth-child(2) > :nth-child(1) > .card-list-body > .actions > .q-btn--standard'
+        ).click();
     });
 });
diff --git a/test/cypress/integration/worker/workerList.spec.js b/test/cypress/integration/worker/workerList.spec.js
index 2ab84c623..b5c57f920 100644
--- a/test/cypress/integration/worker/workerList.spec.js
+++ b/test/cypress/integration/worker/workerList.spec.js
@@ -1,6 +1,6 @@
 describe('WorkerList', () => {
     const workerFieldNames =
-        '.card-list-body > .list-items > :nth-child(2) > .value > span';
+        '.card-list-body > .list-items > :nth-child(1) > .value > span';
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');

From c9023449c9a70c9517d2973e842fd7ee04aba01b Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 15 Dec 2023 08:18:48 +0100
Subject: [PATCH 007/105] refs #6062 fix: correct version

---
 CHANGELOG.md | 8 ++++++++
 package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 828d5be48..1a679cdfc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2400.01] - 2024-01-04
+
+### Added
+
+### Changed
+
+### Fixed
+
 ## [2350.01] - 2023-12-14
 
 ### Added
diff --git a/package.json b/package.json
index 72b54a7ec..7c966dbb1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "23.50.01",
+    "version": "24.00.01",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

From 94278e2f53ee6ebbaf999004d53875da7b655dcf Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 18 Dec 2023 15:36:56 +0100
Subject: [PATCH 008/105] refactor: refs #5835

---
 src/components/ui/VnLv.vue                    |  2 +-
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue |  2 +-
 src/pages/InvoiceIn/InvoiceInList.vue         | 55 ++++++++-----------
 3 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue
index 9a17fca05..e99ec4b05 100644
--- a/src/components/ui/VnLv.vue
+++ b/src/components/ui/VnLv.vue
@@ -5,7 +5,7 @@ import { dashIfEmpty } from 'src/filters';
 const $props = defineProps({
     label: { type: String, default: null },
     value: {
-        type: [String, Boolean],
+        type: [String, Boolean, Number],
         default: null,
     },
     info: { type: String, default: null },
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index d7039fe3d..6dd8a7ae9 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -265,7 +265,7 @@ function getLink(param) {
                 </QCardSection>
                 <VnLv
                     :label="t('invoiceIn.summary.sage')"
-                    :value="invoiceIn.sageWithholding.withholding"
+                    :value="invoiceIn.sageWithholding?.withholding"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.vat')"
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 692251bff..c3ef866cd 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -84,9 +84,9 @@ function viewSummary(id) {
                         :key="row.id"
                         :title="row.supplierRef"
                         @click="navigate(row.id)"
+                        :id="row.id"
                     >
                         <template #list-items>
-                            <VnLv label="ID" :value="row.id" />
                             <VnLv
                                 :label="t('invoiceIn.list.supplierRef')"
                                 :value="row.supplierRef"
@@ -112,42 +112,35 @@ function viewSummary(id) {
                                 :label="t('invoiceIn.list.amount')"
                                 :value="toCurrency(row.amount)"
                             />
-                            <VnLv :label="t('invoiceIn.list.isBooked')">
-                                <template #value>
-                                    <QCheckbox
-                                        class="no-pointer-events"
-                                        v-model="row.isBooked"
-                                        size="xs"
-                                        :true-value="1"
-                                        :false-value="0"
-                                    />
-                                </template>
-                            </VnLv>
+                            <VnLv
+                                :label="t('invoiceIn.list.isBooked')"
+                                :value="!!row.isBooked"
+                            />
                         </template>
                         <template #actions>
                             <QBtn
-                                flat
-                                icon="arrow_circle_right"
+                                :label="t('components.smartCard.openCard')"
                                 @click.stop="navigate(row.id)"
-                            >
-                                <QTooltip>
-                                    {{ t('components.smartCard.openCard') }}
-                                </QTooltip>
-                            </QBtn>
-                            <QBtn flat icon="preview" @click.stop="viewSummary(row.id)">
-                                <QTooltip>
-                                    {{ t('components.smartCard.openSummary') }}
-                                </QTooltip>
-                            </QBtn>
+                                class="bg-vn-dark"
+                                outline
+                                type="reset"
+                            />
+
                             <QBtn
-                                flat
-                                icon="cloud_download"
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id)"
+                                color="primary"
+                                type="submit"
+                                style="margin-top: 15px"
+                            />
+                            <QBtn
+                                :label="t('components.smartCard.downloadFile')"
+                                style="margin-top: 15px"
+                                outline
                                 @click.stop="downloadFile(row.dmsFk)"
-                            >
-                                <QTooltip>
-                                    {{ t('components.smartCard.downloadFile') }}
-                                </QTooltip>
-                            </QBtn>
+                                type="submit"
+                                color="primary"
+                            />
                         </template>
                     </CardList>
                 </template>

From c84aeed202ceedf2b164f796276a686a8b99e579 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 18 Dec 2023 15:39:26 +0100
Subject: [PATCH 009/105] fix test refs #5835

---
 test/cypress/integration/invoiceIn/invoiceInList.spec.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInList.spec.js b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
index bd722edab..60d8c5be1 100644
--- a/test/cypress/integration/invoiceIn/invoiceInList.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
@@ -1,8 +1,8 @@
 /// <reference types="cypress" />
 describe('InvoiceInList', () => {
     const firstCard = '.q-card:nth-child(1)';
-    const firstId =
-        '.q-card:nth-child(1) .list-items > .vn-label-value:first-child > .value > span';
+    const firstChipId =
+        ':nth-child(1) > :nth-child(1) > .justify-between > .flex > .q-chip > .q-chip__content';
     const firstDetailBtn = '.q-card:nth-child(1) .q-btn:nth-child(2)';
     const summaryHeaders = '.summaryBody .header';
 
@@ -12,9 +12,10 @@ describe('InvoiceInList', () => {
     });
 
     it('should redirect on clicking a invoice', () => {
-        cy.get(firstId)
+        cy.get(firstChipId)
             .invoke('text')
-            .then((id) => {
+            .then((content) => {
+                const id = content.substring(4);
                 cy.get(firstCard).click();
                 cy.url().should('include', `/invoice-in/${id}/summary`);
             });

From 5b79c2ace91690b666cf68ef85cd8c5aec8ae00b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 19 Dec 2023 14:03:58 +0100
Subject: [PATCH 010/105] fix margin: refs #5835

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

diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index c3ef866cd..3efaec7fc 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -131,11 +131,11 @@ function viewSummary(id) {
                                 @click.stop="viewSummary(row.id)"
                                 color="primary"
                                 type="submit"
-                                style="margin-top: 15px"
+                                class="q-mt-sm"
                             />
                             <QBtn
                                 :label="t('components.smartCard.downloadFile')"
-                                style="margin-top: 15px"
+                                class="q-mt-sm"
                                 outline
                                 @click.stop="downloadFile(row.dmsFk)"
                                 type="submit"

From f78d5b41a431e1b4354c6830a78e79c85677aca3 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 20 Dec 2023 09:11:16 +0100
Subject: [PATCH 011/105] refs #6584 hotfix await

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

diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index 44575f1d6..812517231 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -142,12 +142,17 @@ async function regularizeClaim() {
             })
             .onOk(async () => await onUpdateGreugeAccept());
     } else {
+        await claimRef.value.fetch();
         quasar.notify({
             message: t('globals.dataSaved'),
             type: 'positive',
         });
     }
     await arrayData.fetch({ append: false });
+    quasar.notify({
+        message: t('globals.dataSaved'),
+        type: 'positive',
+    });
 }
 
 async function updateGreuge(greuges) {

From da5b78c2fc62d83963aa81d2ca9f4c8879b34271 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 20 Dec 2023 09:12:11 +0100
Subject: [PATCH 012/105] refs #6363: style: fix darkMode for LoginMain

---
 src/css/app.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index 02d4f8946..5b5f53314 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -17,9 +17,9 @@ a {
 // Removes chrome autofill background
 input:-webkit-autofill,
 select:-webkit-autofill {
-    color: $input-text-color !important;
+    color:  var(--vn-text) !important;
     font-family: $typography-font-family;
-    -webkit-text-fill-color: $input-text-color !important;
+    -webkit-text-fill-color: var(--vn-text) !important;
     -webkit-background-clip: text !important;
     background-clip: text !important;
 }

From bce4551847df3080d6f2c190ee6ef9157d3ac781 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 20 Dec 2023 09:51:57 +0100
Subject: [PATCH 013/105] refs #6098 feat: copy userToken to clipboard

---
 src/components/UserPanel.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index a7504705a..aee12d105 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -81,6 +81,10 @@ function logout() {
     session.destroy();
     router.push('/login');
 }
+
+function copyUserToken(){
+    navigator.clipboard.writeText(session.getToken());
+}
 </script>
 
 <template>
@@ -122,7 +126,8 @@ function logout() {
                 <div class="text-subtitle1 q-mt-md">
                     <strong>{{ user.nickname }}</strong>
                 </div>
-                <div class="text-subtitle3 text-grey-7 q-mb-xs">@{{ user.name }}</div>
+                <div class="text-subtitle3 text-grey-7 q-mb-xs copyUserToken" @click="copyUserToken()" >@{{ user.name }}
+            </div>
 
                 <QBtn
                     id="logout"
@@ -143,4 +148,10 @@ function logout() {
 .panel {
     width: 150px;
 }
+
+.copyUserToken {
+   &:hover{
+    cursor: alias;
+   }
+}
 </style>

From db1c9f8c9b7d61dd9e71596ccb2e1853521ace2b Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 20 Dec 2023 10:00:43 +0100
Subject: [PATCH 014/105] refs #6578 order claimState

---
 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 fbf28bc8e..5729ac988 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -84,7 +84,7 @@ function viewDescriptor(id) {
             <VnPaginate
                 data-key="ClaimList"
                 url="Claims/filter"
-                order="id DESC"
+                order="claimStateFk"
                 auto-load
             >
                 <template #body="{ rows }">

From 7ef10bb7a9d09244de7f13e9eae9ac693c96e384 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 20 Dec 2023 12:23:39 +0100
Subject: [PATCH 015/105] refs #6420 change url

---
 src/pages/Claim/Card/ClaimSummary.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 64d7b721b..88559e016 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -205,17 +205,29 @@ function openDialog(dmsId) {
                 </VnLv>
             </QCard>
             <QCard class="vn-one">
-                <a class="header" :href="claimUrl + 'note/index'">
+                <a class="header" :href="`#/claim/${entityId}/notes`">
                     {{ t('claim.summary.notes') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
                 <!-- Use VnNotes and maybe VirtualScroll-->
             </QCard>
             <QCard class="vn-max" v-if="salesClaimed.length > 0">
-                <a class="header" :href="claimUrl + 'note/index'">
+                <a class="header" :href="`#/claim/${entityId}/notes`">
                     {{ t('claim.summary.details') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
+                <q-virtual-scroll
+                    :scroll-target="scrollTarget"
+                    :items="heavyList"
+                    separator
+                    v-slot="{ item, index }"
+                >
+                    <q-item :key="index" dense>
+                        <q-item-section>
+                            <q-item-label> #{{ index }} - {{ item.label }} </q-item-label>
+                        </q-item-section>
+                    </q-item>
+                </q-virtual-scroll>
                 <QTable :columns="detailsColumns" :rows="salesClaimed" flat>
                     <template #header="props">
                         <QTr :props="props">

From d286e35f99b5f43f8a5b2bf042b730b5864549a3 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 20 Dec 2023 13:25:55 +0100
Subject: [PATCH 016/105] refs #6584 refactor

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

diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index 812517231..fb47eeee2 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -127,11 +127,14 @@ async function updateDestination(claimDestinationFk, row, options = {}) {
 }
 
 async function regularizeClaim() {
-    const query = `Claims/${claimId}/regularizeClaim`;
-
-    await axios.post(query);
+    await axios.post(`Claims/${claimId}/regularizeClaim`);
+    await claimRef.value.fetch();
+    await arrayData.fetch({ append: false });
+    quasar.notify({
+        message: t('globals.dataSaved'),
+        type: 'positive',
+    });
     if (claim.value.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2) {
-        await claimRef.value.fetch();
         quasar
             .dialog({
                 component: VnConfirm,
@@ -141,34 +144,19 @@ async function regularizeClaim() {
                 },
             })
             .onOk(async () => await onUpdateGreugeAccept());
-    } else {
-        await claimRef.value.fetch();
-        quasar.notify({
-            message: t('globals.dataSaved'),
-            type: 'positive',
-        });
     }
-    await arrayData.fetch({ append: false });
-    quasar.notify({
-        message: t('globals.dataSaved'),
-        type: 'positive',
-    });
-}
-
-async function updateGreuge(greuges) {
-    const { data } = await axios.post(`Greuges`, greuges);
-    quasar.notify({
-        message: t('globals.dataSaved'),
-        type: 'positive',
-    });
-    return data;
 }
 
 async function onUpdateGreugeAccept() {
-    const greugeTypeFreightId = await getGreugeTypeId();
-    const freightPickUpPrice = await getGreugeConfig();
+    const greugeTypeFreightId = (
+        await axios.get(`GreugeTypes/findOne`, {
+            filter: { where: { code: 'freightPickUp' } },
+        })
+    ).data.id;
+    const freightPickUpPrice = (await axios.get(`GreugeConfigs/findOne`)).data
+        .freightPickUpPrice;
 
-    await updateGreuge({
+    await axios.post(`Greuges`, {
         clientFk: claim.value.clientFk,
         description: `${t('ClaimGreugeDescription')} ${claimId}`.toUpperCase(),
         amount: freightPickUpPrice,
@@ -181,19 +169,6 @@ async function onUpdateGreugeAccept() {
     });
 }
 
-async function getGreugeTypeId() {
-    const params = { filter: { where: { code: 'freightPickUp' } } };
-    const query = `GreugeTypes/findOne`;
-    const { data } = await axios.get(query, { params });
-    return data.id;
-}
-
-async function getGreugeConfig() {
-    const query = `GreugeConfigs/findOne`;
-    const { data } = await axios.get(query);
-    return data.freightPickUpPrice;
-}
-
 async function save(data) {
     const query = `Claims/${claimId}/updateClaimAction`;
     await axios.patch(query, data);

From 9a4a3e846e469f774c593a0a0b319b47f9020809 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 20 Dec 2023 13:28:58 +0100
Subject: [PATCH 017/105] refs #6256 remove hypens

---
 src/components/ui/VnLv.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue
index add546ab0..72375e804 100644
--- a/src/components/ui/VnLv.vue
+++ b/src/components/ui/VnLv.vue
@@ -16,7 +16,6 @@ const isBooleanValue = computed(() => typeof $props.value === 'boolean');
 .label,
 .value {
     white-space: pre-line;
-    hyphens: auto;
     word-wrap: break-word;
 }
 </style>

From ce447b4b762fc00845b2ad86fc8f5787b1b49e70 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 20 Dec 2023 14:12:28 +0100
Subject: [PATCH 018/105] refs #6363: style: remove !important darkMode for
 LoginMain

---
 src/css/app.scss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index 5b5f53314..65db51d30 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -17,9 +17,9 @@ a {
 // Removes chrome autofill background
 input:-webkit-autofill,
 select:-webkit-autofill {
-    color:  var(--vn-text) !important;
+    color:  var(--vn-text) ;
     font-family: $typography-font-family;
-    -webkit-text-fill-color: var(--vn-text) !important;
+    -webkit-text-fill-color: var(--vn-text) ;
     -webkit-background-clip: text !important;
     background-clip: text !important;
 }

From 350bc5a3c9ab7e4c8267ba0fd251c2505563f527 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 20 Dec 2023 15:25:45 +0100
Subject: [PATCH 019/105] refs #6128 recharge photo

---
 src/pages/Claim/Card/ClaimSummary.vue | 43 +++++++++++++++------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 64d7b721b..ab88c4261 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed } from 'vue';
+import { onMounted, ref, computed, watch } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate, toCurrency } from 'src/filters';
@@ -26,12 +26,26 @@ const entityId = computed(() => $props.id || route.params.id);
 
 const claimUrl = ref();
 const salixUrl = ref();
+const claimDmsRef = ref();
+const claimDmsFilter = ref({
+    include: [
+        {
+            relation: 'dms',
+        },
+    ],
+    where: { claimFk: entityId.value },
+});
 
 onMounted(async () => {
     salixUrl.value = await getUrl('');
     claimUrl.value = salixUrl.value + `claim/${entityId.value}/`;
 });
 
+watch(entityId, async (id) => {
+    setDmsFilter(id);
+    await claimDmsRef.value.fetch();
+});
+
 const detailsColumns = ref([
     {
         name: 'item',
@@ -85,15 +99,10 @@ const detailsColumns = ref([
     },
 ]);
 
-const STATE_COLOR = {
-    pending: 'positive',
-
-    managed: 'warning',
-
-    resolved: 'negative',
-};
 function stateColor(code) {
-    return STATE_COLOR[code];
+    if (code === 'pending') return 'green';
+    if (code === 'managed') return 'orange';
+    if (code === 'resolved') return 'red';
 }
 
 const developmentColumns = ref([
@@ -131,18 +140,13 @@ const developmentColumns = ref([
 const claimDms = ref([]);
 const multimediaDialog = ref();
 const multimediaSlide = ref();
-const claimDmsFilter = ref({
-    include: [
-        {
-            relation: 'dms',
-        },
-    ],
-    where: { claimFk: entityId.value },
-});
+
+function setDmsFilter(id = entityId.value) {
+    claimDmsFilter.value.where = { claimFk: id };
+}
 
 function setClaimDms(data) {
-    if (!data) return;
-
+    claimDms.value = [];
     data.forEach((media) => {
         claimDms.value.push({
             isVideo: media.dms.contentType == 'video/mp4',
@@ -165,6 +169,7 @@ function openDialog(dmsId) {
         @on-fetch="(data) => setClaimDms(data)"
         limit="20"
         auto-load
+        ref="claimDmsRef"
     />
     <CardSummary ref="summary" :url="`Claims/${entityId}/getSummary`">
         <template #header="{ entity: { claim } }">

From f3a1800cb0571c298655bc4f8b406ac110468338 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 20 Dec 2023 15:43:09 +0100
Subject: [PATCH 020/105] fix breadcrumbs & header: refs #5835

---
 src/components/NavBar.vue               | 10 +++++-----
 src/components/common/VnBreadcrumbs.vue |  4 ++++
 src/i18n/es/index.js                    |  2 +-
 src/stores/useNavigationStore.js        |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 2368e078e..12366e174 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -24,11 +24,8 @@ const pinnedModulesRef = ref();
 </script>
 
 <template>
-    <QHeader class="bg-dark" color="white" elevated>
-        <QToolbar
-            class="q-py-sm q-px-md"
-            :class="{ 'q-gutter-x-sm': !quasar.platform.is.mobile }"
-        >
+    <QHeader color="white" elevated>
+        <QToolbar class="q-py-sm q-px-md">
             <QBtn @click="stateStore.toggleLeftDrawer()" icon="menu" round dense flat>
                 <QTooltip bottom anchor="bottom right">
                     {{ t('globals.collapseMenu') }}
@@ -108,6 +105,9 @@ const pinnedModulesRef = ref();
 .searchbar {
     width: max-content;
 }
+.q-header {
+    background-color: var(--vn-dark);
+}
 </style>
 <i18n>
 en:
diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 792671e21..666f14c72 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -69,6 +69,10 @@ function getBreadcrumb(param) {
     > div {
         flex-wrap: nowrap;
     }
+    &--last,
+    &__separator {
+        color: var(--vn-label);
+    }
 }
 @media (max-width: $breakpoint-md) {
     .q-breadcrumbs {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 4e570e7b4..0289b7e78 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -371,7 +371,7 @@ export default {
     },
     invoiceOut: {
         pageTitles: {
-            invoiceOuts: 'Fact. emitidas',
+            invoiceOuts: 'Crear factura',
             list: 'Listado',
             negativeBases: 'Bases Negativas',
             globalInvoicing: 'Facturación global',
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index b5947f87b..5daa618d5 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -11,13 +11,13 @@ export const useNavigationStore = defineStore('navigationStore', () => {
         'claim',
         'ticket',
         'invoiceOut',
+        'invoiceIn',
         'worker',
         'shelving',
         'wagon',
         'route',
         'supplier',
         'travel',
-        'invoiceIn',
     ];
     const pinnedModules = ref([]);
     const role = useRole();

From 8499bcbe19f44b5b5d86d13727eeee5145040eba Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 21 Dec 2023 08:28:03 +0100
Subject: [PATCH 021/105] refs #6218 refactor dmsFilter

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

diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index ab88c4261..412bf240c 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -42,7 +42,7 @@ onMounted(async () => {
 });
 
 watch(entityId, async (id) => {
-    setDmsFilter(id);
+    claimDmsFilter.value.where = { claimFk: id };
     await claimDmsRef.value.fetch();
 });
 
@@ -141,10 +141,6 @@ const claimDms = ref([]);
 const multimediaDialog = ref();
 const multimediaSlide = ref();
 
-function setDmsFilter(id = entityId.value) {
-    claimDmsFilter.value.where = { claimFk: id };
-}
-
 function setClaimDms(data) {
     claimDms.value = [];
     data.forEach((media) => {

From f71f341aad72be1e64928e85febbff39e118c848 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 21 Dec 2023 12:15:01 +0100
Subject: [PATCH 022/105] refs #6128 change stateColor

---
 src/pages/Claim/Card/ClaimSummary.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 412bf240c..d6a7f1333 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -99,10 +99,15 @@ const detailsColumns = ref([
     },
 ]);
 
+const STATE_COLOR = {
+    pending: 'positive',
+
+    managed: 'warning',
+
+    resolved: 'negative',
+};
 function stateColor(code) {
-    if (code === 'pending') return 'green';
-    if (code === 'managed') return 'orange';
-    if (code === 'resolved') return 'red';
+    return STATE_COLOR[code];
 }
 
 const developmentColumns = ref([

From 8a36fc03b840baa95b6de7c30ea1db09164ccd6b Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Thu, 21 Dec 2023 18:59:13 +0100
Subject: [PATCH 023/105] refactor(ticketsms): refs #6259 add vnSms create
 customerSms

---
 src/components/ui/VnAvatar.vue                |   3 +
 src/components/ui/VnSms.vue                   | 118 +++++++++++++++++
 src/composables/useArrayData.js               |   4 +-
 src/i18n/en/index.js                          |   1 +
 src/i18n/es/index.js                          |   1 +
 src/pages/Claim/ClaimList.vue                 |   9 --
 src/pages/Customer/Card/CustomerSms.vue       |  25 ++++
 src/pages/Ticket/Card/TicketSms.vue           | 122 ++----------------
 src/router/modules/customer.js                |  11 +-
 .../__tests__/components/common/VnSms.spec.js |  25 ++++
 10 files changed, 200 insertions(+), 119 deletions(-)
 create mode 100644 src/components/ui/VnSms.vue
 create mode 100644 src/pages/Customer/Card/CustomerSms.vue
 create mode 100644 test/vitest/__tests__/components/common/VnSms.spec.js

diff --git a/src/components/ui/VnAvatar.vue b/src/components/ui/VnAvatar.vue
index b385b684f..85bece243 100644
--- a/src/components/ui/VnAvatar.vue
+++ b/src/components/ui/VnAvatar.vue
@@ -1,8 +1,10 @@
 <script setup>
 import { useSession } from 'src/composables/useSession';
+import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 const $props = defineProps({
     worker: { type: Number, required: true },
     description: { type: String, default: null },
+    clickable: { type: Boolean, default: false },
 });
 const session = useSession();
 const token = session.getToken();
@@ -22,5 +24,6 @@ const token = session.getToken();
                 </p>
             </slot>
         </div>
+        <WorkerDescriptorProxy :v-if="$props.clickable" :id="$props.worker" />
     </div>
 </template>
diff --git a/src/components/ui/VnSms.vue b/src/components/ui/VnSms.vue
new file mode 100644
index 000000000..98eec07a1
--- /dev/null
+++ b/src/components/ui/VnSms.vue
@@ -0,0 +1,118 @@
+<script setup>
+import { onBeforeMount } from 'vue';
+import { date } from 'quasar';
+import { useSession } from 'src/composables/useSession';
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnAvatar from '../ui/VnAvatar.vue';
+
+const $props = defineProps({
+    url: { type: String, default: null },
+    where: { type: Object, default: () => {} },
+    body: { type: Object, default: () => {} },
+});
+
+const filter = {
+    fields: ['smsFk'],
+    include: {
+        relation: 'sms',
+        scope: {
+            fields: [
+                'senderFk',
+                'sender',
+                'destination',
+                'message',
+                'statusCode',
+                'status',
+                'created',
+            ],
+            include: {
+                relation: 'sender',
+                scope: {
+                    fields: ['name'],
+                },
+            },
+        },
+    },
+};
+
+onBeforeMount(() => (filter.where = $props.where));
+
+function formatNumber(number) {
+    if (number.length <= 10) return number;
+    return number.slice(0, 4) + ' ' + number.slice(4);
+}
+</script>
+
+<template>
+    <div class="column items-center">
+        <div class="list">
+            <VnPaginate
+                :data-key="$props.url"
+                :url="$props.url"
+                :filter="filter"
+                order="smsFk DESC"
+                :offset="100"
+                :limit="5"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <QCard
+                        flat
+                        bordered
+                        class="card q-pa-md"
+                        id="smsCard"
+                        v-for="row of rows"
+                        :key="row.smsFk"
+                    >
+                        <QItem>
+                            <QItemSection side top>
+                                <VnAvatar
+                                    class="cursor-pointer"
+                                    :worker="row.sms.senderFk"
+                                    :title="row.sms.sender.name"
+                                    :clickable="true"
+                                />
+                            </QItemSection>
+                            <QSeparator />
+                            <QItemSection>
+                                <QItemLabel caption>{{
+                                    formatNumber(row.sms.destination)
+                                }}</QItemLabel>
+                                <QItemLabel>{{ row.sms.message }}</QItemLabel>
+                            </QItemSection>
+                            <QItemSection side top class="center">
+                                <QItemLabel caption>{{
+                                    date.formatDate(
+                                        row.sms.created,
+                                        'YYYY-MM-DD HH:mm:ss'
+                                    )
+                                }}</QItemLabel>
+                                <QItemLabel>
+                                    <QChip
+                                        :color="
+                                            row.sms.status == 'OK'
+                                                ? 'positive'
+                                                : 'negative'
+                                        "
+                                    >
+                                        {{ row.sms.status }}
+                                    </QChip>
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </QCard>
+                </template>
+            </VnPaginate>
+        </div>
+    </div>
+</template>
+<style lang="scss" scoped>
+#smsCard {
+    margin-bottom: 2%;
+    max-width: 80em;
+    width: 100%;
+}
+.center {
+    align-items: center;
+}
+</style>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 523340cc9..ba917a2e1 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -155,7 +155,9 @@ export function useArrayData(key, userOptions) {
                 delete store.userParams[param];
                 delete params[param];
                 if (store.filter?.where) {
-                    delete store.filter.where[Object.keys(exprBuilder ? exprBuilder(param) : param)[0]];
+                    delete store.filter.where[
+                        Object.keys(exprBuilder ? exprBuilder(param) : param)[0]
+                    ];
                     if (Object.keys(store.filter.where).length === 0) {
                         delete store.filter.where;
                     }
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 5e7e116c5..9776ac34c 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -114,6 +114,7 @@ export default {
             createCustomer: 'Create customer',
             summary: 'Summary',
             basicData: 'Basic Data',
+            sms: 'Sms',
         },
         list: {
             phone: 'Phone',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 4e570e7b4..3518afee9 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -113,6 +113,7 @@ export default {
             createCustomer: 'Crear cliente',
             basicData: 'Datos básicos',
             summary: 'Resumen',
+            sms: 'Sms',
         },
         list: {
             phone: 'Teléfono',
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index fbf28bc8e..c4a728aa2 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -38,15 +38,6 @@ function viewSummary(id) {
         },
     });
 }
-
-function viewDescriptor(id) {
-    quasar.dialog({
-        component: CustomerDescriptorProxy,
-        componentProps: {
-            id,
-        },
-    });
-}
 </script>
 
 <template>
diff --git a/src/pages/Customer/Card/CustomerSms.vue b/src/pages/Customer/Card/CustomerSms.vue
new file mode 100644
index 000000000..42bd39ec9
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerSms.vue
@@ -0,0 +1,25 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { useState } from 'src/composables/useState';
+import VnSms from 'src/components/ui/VnSms.vue';
+
+const route = useRoute();
+const state = useState();
+const user = state.getUser();
+const id = route.params.id;
+
+const where = {
+    clientFk: id,
+    ticketFk: null,
+};
+
+const body = {
+    claimFk: id,
+    workerFk: user.value.id,
+};
+</script>
+<template>
+    <div class="column items-center">
+        <VnSms url="clientSms" :where="where" :body="body" />
+    </div>
+</template>
diff --git a/src/pages/Ticket/Card/TicketSms.vue b/src/pages/Ticket/Card/TicketSms.vue
index b145be50e..0146b93ec 100644
--- a/src/pages/Ticket/Card/TicketSms.vue
+++ b/src/pages/Ticket/Card/TicketSms.vue
@@ -1,118 +1,24 @@
 <script setup>
-import { date } from 'quasar';
-import { computed } from 'vue';
-import { useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
+import { useState } from 'src/composables/useState';
+import VnSms from 'src/components/ui/VnSms.vue';
 
-import { useSession } from 'src/composables/useSession';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
+const route = useRoute();
+const state = useState();
+const user = state.getUser();
+const id = route.params.id;
 
-const router = useRouter();
-const session = useSession();
-const token = session.getToken();
-
-const entityId = computed(function () {
-    return router.currentRoute.value.params.id;
-});
-
-const filter = {
-    fields: ['ticketFk', 'smsFk'],
-    include: {
-        relation: 'sms',
-        scope: {
-            fields: [
-                'senderFk',
-                'sender',
-                'destination',
-                'message',
-                'statusCode',
-                'status',
-                'created',
-            ],
-            include: {
-                relation: 'sender',
-                scope: {
-                    fields: ['name'],
-                },
-            },
-        },
-    },
-    where: {
-        ticketFk: entityId,
-    },
+const where = {
+    ticketFk: id,
 };
 
-function formatNumer(number) {
-    if (number.length <= 10) return number;
-    return number.slice(0, 4) + ' ' + number.slice(4);
-}
+const body = {
+    claimFk: id,
+    workerFk: user.value.id,
+};
 </script>
-
 <template>
     <div class="column items-center">
-        <div class="list">
-            <VnPaginate
-                data-key="TicketSms"
-                url="TicketSms"
-                :filter="filter"
-                order="smsFk DESC"
-                :offset="100"
-                :limit="5"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <QCard
-                        flat
-                        bordered
-                        class="card q-pa-md"
-                        v-for="row of rows"
-                        :key="row.smsFk"
-                    >
-                        <QItem>
-                            <QItmSection top avatar>
-                                <QItemLabel class="column items-center">
-                                    <QAvatar>
-                                        <QImg
-                                            :src="`/api/Images/user/160x160/${row.sms.senderFk}/download?access_token=${token}`"
-                                            spinner-color="white"
-                                        />
-                                    </QAvatar>
-                                    <span class="link">
-                                        {{ row.sms.sender.name }}
-                                        <WorkerDescriptorProxy :id="row.sms.senderFk" />
-                                    </span>
-                                </QItemLabel>
-                            </QItmSection>
-                            <QSeparator spaced inset="item" />
-                            <QItemSection>
-                                <QItemLabel caption>{{
-                                    formatNumer(row.sms.destination)
-                                }}</QItemLabel>
-                                <QItemLabel>{{ row.sms.message }}</QItemLabel>
-                            </QItemSection>
-                            <QItemSection side top>
-                                <QItemLabel caption>{{
-                                    date.formatDate(
-                                        row.sms.created,
-                                        'YYYY-MM-DD HH:mm:ss'
-                                    )
-                                }}</QItemLabel>
-                                <QItemLabel>
-                                    <QChip
-                                        :color="
-                                            row.sms.status == 'OK'
-                                                ? 'positive'
-                                                : 'negative'
-                                        "
-                                    >
-                                        {{ row.sms.status }}
-                                    </QChip>
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QCard>
-                </template>
-            </VnPaginate>
-        </div>
+        <VnSms url="clientSms" :where="where" :body="body" />
     </div>
 </template>
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 832a1e0fd..b8be4f3ac 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -11,7 +11,7 @@ export default {
     redirect: { name: 'CustomerMain' },
     menus: {
         main: ['CustomerList', 'CustomerPayments'],
-        card: ['CustomerBasicData'],
+        card: ['CustomerBasicData', 'CustomerSms'],
     },
     children: [
         {
@@ -66,6 +66,15 @@ export default {
                     component: () =>
                         import('src/pages/Customer/Card/CustomerBasicData.vue'),
                 },
+                {
+                    path: 'sms',
+                    name: 'CustomerSms',
+                    meta: {
+                        title: 'sms',
+                        icon: 'sms',
+                    },
+                    component: () => import('src/pages/Customer/Card/CustomerSms.vue'),
+                },
             ],
         },
     ],
diff --git a/test/vitest/__tests__/components/common/VnSms.spec.js b/test/vitest/__tests__/components/common/VnSms.spec.js
new file mode 100644
index 000000000..e0f8c1868
--- /dev/null
+++ b/test/vitest/__tests__/components/common/VnSms.spec.js
@@ -0,0 +1,25 @@
+import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import { createWrapper, axios } from 'app/test/vitest/helper';
+import VnSms from 'src/components/ui/VnSms.vue';
+
+describe('VnSms', () => {
+    let vm;
+
+    beforeAll(() => {
+        vm = createWrapper(VnSms, {
+            global: {
+                stubs: ['VnPaginate'],
+                mocks: {},
+            },
+        }).vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should format number correctly', () => {
+        const formattedNumber = vm.formatNumber('123456789012');
+        expect(formattedNumber).toBe('1234 56789012');
+    });
+});

From c3dcf18596fb0076de37054e3dd87b1edae5e7c2 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 22 Dec 2023 08:31:02 -0300
Subject: [PATCH 024/105] correct qicons size

---
 src/components/CreateBankEntityForm.vue  | 2 +-
 src/components/CreateNewCityForm.vue     | 2 +-
 src/components/CreateNewPostcodeForm.vue | 2 +-
 src/components/CreateNewProvinceForm.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index be213239f..3de4bed63 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -57,7 +57,7 @@ const closeForm = () => {
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="22px" />
+                <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('title') }}</h1>
             <p class="q-mb-md">{{ t('subtitle') }}</p>
diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index b028509e8..f3d6e4509 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -47,7 +47,7 @@ const closeForm = () => {
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="22px" />
+                <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('New city') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 0905f6bc3..18582cd49 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -76,7 +76,7 @@ const closeForm = () => {
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="22px" />
+                <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('New postcode') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index 1896aec3f..3aea81596 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -47,7 +47,7 @@ const closeForm = () => {
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="22px" />
+                <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('New province') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>

From f9b2faf9188bacba8ab639b1aa4132dc90f9ebff Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 26 Dec 2023 09:53:47 +0100
Subject: [PATCH 025/105] feat(VnSms): refs #6259 unify ticket and customer sms

---
 src/components/ui/VnSms.vue             | 16 ++++------------
 src/pages/Customer/Card/CustomerSms.vue | 10 +---------
 src/pages/Ticket/Card/TicketSms.vue     | 10 +---------
 3 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/src/components/ui/VnSms.vue b/src/components/ui/VnSms.vue
index 98eec07a1..625fdec77 100644
--- a/src/components/ui/VnSms.vue
+++ b/src/components/ui/VnSms.vue
@@ -1,14 +1,12 @@
 <script setup>
 import { onBeforeMount } from 'vue';
 import { date } from 'quasar';
-import { useSession } from 'src/composables/useSession';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnAvatar from '../ui/VnAvatar.vue';
 
 const $props = defineProps({
     url: { type: String, default: null },
     where: { type: Object, default: () => {} },
-    body: { type: Object, default: () => {} },
 });
 
 const filter = {
@@ -59,8 +57,7 @@ function formatNumber(number) {
                     <QCard
                         flat
                         bordered
-                        class="card q-pa-md"
-                        id="smsCard"
+                        class="card q-pa-md q-mb-sm smsCard"
                         v-for="row of rows"
                         :key="row.smsFk"
                     >
@@ -80,14 +77,14 @@ function formatNumber(number) {
                                 }}</QItemLabel>
                                 <QItemLabel>{{ row.sms.message }}</QItemLabel>
                             </QItemSection>
-                            <QItemSection side top class="center">
+                            <QItemSection side>
                                 <QItemLabel caption>{{
                                     date.formatDate(
                                         row.sms.created,
                                         'YYYY-MM-DD HH:mm:ss'
                                     )
                                 }}</QItemLabel>
-                                <QItemLabel>
+                                <QItemLabel class="row center">
                                     <QChip
                                         :color="
                                             row.sms.status == 'OK'
@@ -107,12 +104,7 @@ function formatNumber(number) {
     </div>
 </template>
 <style lang="scss" scoped>
-#smsCard {
-    margin-bottom: 2%;
-    max-width: 80em;
-    width: 100%;
-}
-.center {
+.q-item__section--side {
     align-items: center;
 }
 </style>
diff --git a/src/pages/Customer/Card/CustomerSms.vue b/src/pages/Customer/Card/CustomerSms.vue
index 42bd39ec9..a567f6b47 100644
--- a/src/pages/Customer/Card/CustomerSms.vue
+++ b/src/pages/Customer/Card/CustomerSms.vue
@@ -1,25 +1,17 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import { useState } from 'src/composables/useState';
 import VnSms from 'src/components/ui/VnSms.vue';
 
 const route = useRoute();
-const state = useState();
-const user = state.getUser();
 const id = route.params.id;
 
 const where = {
     clientFk: id,
     ticketFk: null,
 };
-
-const body = {
-    claimFk: id,
-    workerFk: user.value.id,
-};
 </script>
 <template>
     <div class="column items-center">
-        <VnSms url="clientSms" :where="where" :body="body" />
+        <VnSms url="clientSms" :where="where" />
     </div>
 </template>
diff --git a/src/pages/Ticket/Card/TicketSms.vue b/src/pages/Ticket/Card/TicketSms.vue
index 0146b93ec..ff7de6611 100644
--- a/src/pages/Ticket/Card/TicketSms.vue
+++ b/src/pages/Ticket/Card/TicketSms.vue
@@ -1,24 +1,16 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import { useState } from 'src/composables/useState';
 import VnSms from 'src/components/ui/VnSms.vue';
 
 const route = useRoute();
-const state = useState();
-const user = state.getUser();
 const id = route.params.id;
 
 const where = {
     ticketFk: id,
 };
-
-const body = {
-    claimFk: id,
-    workerFk: user.value.id,
-};
 </script>
 <template>
     <div class="column items-center">
-        <VnSms url="clientSms" :where="where" :body="body" />
+        <VnSms url="clientSms" :where="where" />
     </div>
 </template>

From 6f78e1a173b1688e428c50896793db5b6383b7b9 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 27 Dec 2023 13:58:30 +0100
Subject: [PATCH 026/105] refs #6420 importClaimNotes

---
 src/pages/Claim/Card/ClaimSummary.vue | 58 ++++++++++++++++-----------
 1 file changed, 34 insertions(+), 24 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 88559e016..6bc0a8b66 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed } from 'vue';
+import { onMounted, ref, computed, watch } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate, toCurrency } from 'src/filters';
@@ -9,6 +9,7 @@ import { getUrl } from 'src/composables/getUrl';
 import { useSession } from 'src/composables/useSession';
 import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
+import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -26,12 +27,35 @@ const entityId = computed(() => $props.id || route.params.id);
 
 const claimUrl = ref();
 const salixUrl = ref();
+const claimDmsRef = ref();
+const claimDmsFilter = ref({
+    include: [
+        {
+            relation: 'dms',
+        },
+    ],
+    where: { claimFk: entityId.value },
+});
+const claimObservationsRef = ref();
+const claimObservationsFilter = ref({
+    include: [
+        {
+            relation: 'observation',
+        },
+    ],
+    where: { claimFk: entityId.value },
+});
 
 onMounted(async () => {
     salixUrl.value = await getUrl('');
     claimUrl.value = salixUrl.value + `claim/${entityId.value}/`;
 });
 
+watch(entityId, async (id) => {
+    claimDmsFilter.value.where = { claimFk: id };
+    await claimDmsRef.value.fetch();
+});
+
 const detailsColumns = ref([
     {
         name: 'item',
@@ -131,18 +155,9 @@ const developmentColumns = ref([
 const claimDms = ref([]);
 const multimediaDialog = ref();
 const multimediaSlide = ref();
-const claimDmsFilter = ref({
-    include: [
-        {
-            relation: 'dms',
-        },
-    ],
-    where: { claimFk: entityId.value },
-});
 
 function setClaimDms(data) {
-    if (!data) return;
-
+    claimDms.value = [];
     data.forEach((media) => {
         claimDms.value.push({
             isVideo: media.dms.contentType == 'video/mp4',
@@ -152,6 +167,11 @@ function setClaimDms(data) {
     });
 }
 
+const claimObservations = ref([]);
+function setClaimObservations(data) {
+    claimObservations.value = [];
+}
+
 function openDialog(dmsId) {
     multimediaSlide.value = dmsId;
     multimediaDialog.value = true;
@@ -165,6 +185,7 @@ function openDialog(dmsId) {
         @on-fetch="(data) => setClaimDms(data)"
         limit="20"
         auto-load
+        ref="claimDmsRef"
     />
     <CardSummary ref="summary" :url="`Claims/${entityId}/getSummary`">
         <template #header="{ entity: { claim } }">
@@ -209,25 +230,14 @@ function openDialog(dmsId) {
                     {{ t('claim.summary.notes') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
-                <!-- Use VnNotes and maybe VirtualScroll-->
+                <ClaimNotes />
+                <QVirtualScroll :items="observations" separator> </QVirtualScroll>
             </QCard>
             <QCard class="vn-max" v-if="salesClaimed.length > 0">
                 <a class="header" :href="`#/claim/${entityId}/notes`">
                     {{ t('claim.summary.details') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
-                <q-virtual-scroll
-                    :scroll-target="scrollTarget"
-                    :items="heavyList"
-                    separator
-                    v-slot="{ item, index }"
-                >
-                    <q-item :key="index" dense>
-                        <q-item-section>
-                            <q-item-label> #{{ index }} - {{ item.label }} </q-item-label>
-                        </q-item-section>
-                    </q-item>
-                </q-virtual-scroll>
                 <QTable :columns="detailsColumns" :rows="salesClaimed" flat>
                     <template #header="props">
                         <QTr :props="props">

From d374709d4a37f5ed844644bfa944b25a976624a1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 29 Dec 2023 08:58:32 +0100
Subject: [PATCH 027/105] logs added: refs #6605

---
 src/pages/InvoiceIn/Card/InvoiceInLog.vue |  6 ++++++
 src/router/modules/invoiceIn.js           | 10 ++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 src/pages/InvoiceIn/Card/InvoiceInLog.vue

diff --git a/src/pages/InvoiceIn/Card/InvoiceInLog.vue b/src/pages/InvoiceIn/Card/InvoiceInLog.vue
new file mode 100644
index 000000000..e48211546
--- /dev/null
+++ b/src/pages/InvoiceIn/Card/InvoiceInLog.vue
@@ -0,0 +1,6 @@
+<script setup>
+import VnLog from 'src/components/common/VnLog.vue';
+</script>
+<template>
+    <VnLog model="InvoiceIn" />
+</template>
diff --git a/src/router/modules/invoiceIn.js b/src/router/modules/invoiceIn.js
index a5509908c..fd77619d0 100644
--- a/src/router/modules/invoiceIn.js
+++ b/src/router/modules/invoiceIn.js
@@ -16,6 +16,7 @@ export default {
             'InvoiceInVat',
             'InvoiceInDueDay',
             'InvoiceInIntrastat',
+            'InvoiceInLog',
         ],
     },
     children: [
@@ -92,6 +93,15 @@ export default {
                     component: () =>
                         import('src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue'),
                 },
+                {
+                    name: 'InvoiceInLog',
+                    path: 'log',
+                    meta: {
+                        title: 'log',
+                        icon: 'history',
+                    },
+                    component: () => import('src/pages/InvoiceIn/Card/InvoiceInLog.vue'),
+                },
             ],
         },
     ],

From 61d69f7cf72f33202cecfec69be8c73cacf801b9 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 2 Jan 2024 09:05:59 +0100
Subject: [PATCH 028/105] change btn & prevent error: refs #5835

---
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 8 ++++----
 src/pages/InvoiceIn/InvoiceInList.vue         | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 6dd8a7ae9..6c202c5a3 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -203,7 +203,7 @@ function getLink(param) {
         @on-fetch="(data) => setData(data)"
     >
         <template #header="{ entity: invoiceIn }">
-            <div>{{ invoiceIn.id }} - {{ invoiceIn.supplier.name }}</div>
+            <div>{{ invoiceIn.id }} - {{ invoiceIn.supplier?.name }}</div>
         </template>
         <template #body="{ entity: invoiceIn }">
             <!--Basic Data-->
@@ -216,7 +216,7 @@ function getLink(param) {
                 </QCardSection>
                 <VnLv
                     :label="t('invoiceIn.summary.supplier')"
-                    :value="invoiceIn.supplier.name"
+                    :value="invoiceIn.supplier?.name"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.supplierRef')"
@@ -224,7 +224,7 @@ function getLink(param) {
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.currency')"
-                    :value="invoiceIn.currency.code"
+                    :value="invoiceIn.currency?.code"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.docNumber')"
@@ -273,7 +273,7 @@ function getLink(param) {
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.company')"
-                    :value="invoiceIn.company.code"
+                    :value="invoiceIn.company?.code"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.booked')"
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 3efaec7fc..effccc830 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -134,9 +134,8 @@ function viewSummary(id) {
                                 class="q-mt-sm"
                             />
                             <QBtn
-                                :label="t('components.smartCard.downloadFile')"
+                                :label="t('Download')"
                                 class="q-mt-sm"
-                                outline
                                 @click.stop="downloadFile(row.dmsFk)"
                                 type="submit"
                                 color="primary"
@@ -169,4 +168,5 @@ function viewSummary(id) {
 es:
     Search invoice: Buscar factura emitida
     You can search by invoice reference: Puedes buscar por referencia de la factura
+    Download: Descargar
 </i18n>

From 24818f5daa816d0bc64e2e1b7e00908d2960e5ec Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 2 Jan 2024 09:19:29 +0100
Subject: [PATCH 029/105] refs #5835 fix(invoiceOutSummary): add ?.

---
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index d7039fe3d..6c202c5a3 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -203,7 +203,7 @@ function getLink(param) {
         @on-fetch="(data) => setData(data)"
     >
         <template #header="{ entity: invoiceIn }">
-            <div>{{ invoiceIn.id }} - {{ invoiceIn.supplier.name }}</div>
+            <div>{{ invoiceIn.id }} - {{ invoiceIn.supplier?.name }}</div>
         </template>
         <template #body="{ entity: invoiceIn }">
             <!--Basic Data-->
@@ -216,7 +216,7 @@ function getLink(param) {
                 </QCardSection>
                 <VnLv
                     :label="t('invoiceIn.summary.supplier')"
-                    :value="invoiceIn.supplier.name"
+                    :value="invoiceIn.supplier?.name"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.supplierRef')"
@@ -224,7 +224,7 @@ function getLink(param) {
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.currency')"
-                    :value="invoiceIn.currency.code"
+                    :value="invoiceIn.currency?.code"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.docNumber')"
@@ -265,7 +265,7 @@ function getLink(param) {
                 </QCardSection>
                 <VnLv
                     :label="t('invoiceIn.summary.sage')"
-                    :value="invoiceIn.sageWithholding.withholding"
+                    :value="invoiceIn.sageWithholding?.withholding"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.vat')"
@@ -273,7 +273,7 @@ function getLink(param) {
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.company')"
-                    :value="invoiceIn.company.code"
+                    :value="invoiceIn.company?.code"
                 />
                 <VnLv
                     :label="t('invoiceIn.summary.booked')"

From 9b069fbddd7189cbe29293f62f723c0048c2ad42 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 2 Jan 2024 11:38:43 +0100
Subject: [PATCH 030/105] add filter: refs #6606

---
 .../InvoiceOut/InvoiceOutNegativeBases.vue    | 30 ++++++++++++++-----
 src/stores/invoiceOutGlobal.js                |  4 +--
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 63385380e..7d07b8217 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -174,7 +174,23 @@ const columns = ref([
 ]);
 
 const downloadCSV = async () => {
-    await invoiceOutGlobalStore.getNegativeBasesCsv(dateRange.from, dateRange.to);
+    const params = filter.value;
+
+    const filterParams = {
+        limit: 20,
+        where: {
+            and: [],
+        },
+    };
+    for (const param in params) {
+        if (params[param]) filterParams.where.and.push({ [param]: params[param] });
+    }
+
+    await invoiceOutGlobalStore.getNegativeBasesCsv(
+        dateRange.from,
+        dateRange.to,
+        JSON.stringify(filterParams)
+    );
 };
 
 const search = async () => {
@@ -187,13 +203,13 @@ const search = async () => {
         }
     });
     const searchFilter = {
-        limit: 20
-    }
+        limit: 20,
+    };
 
     if (and.length) {
         searchFilter.where = {
-            and
-        }
+            and,
+        };
     }
 
     const params = {
@@ -230,9 +246,7 @@ const selectWorkerId = (id) => {
     selectedWorkerId.value = id;
 };
 
-onMounted(async () => {
-    refresh();
-});
+onMounted(() => refresh());
 </script>
 
 <template>
diff --git a/src/stores/invoiceOutGlobal.js b/src/stores/invoiceOutGlobal.js
index d449a577d..71e4c3537 100644
--- a/src/stores/invoiceOutGlobal.js
+++ b/src/stores/invoiceOutGlobal.js
@@ -219,9 +219,9 @@ export const useInvoiceOutGlobalStore = defineStore({
             throw err;
         },
 
-        async getNegativeBasesCsv(from, to) {
+        async getNegativeBasesCsv(from, to, filter = {}) {
             try {
-                const params = { from: from, to: to };
+                const params = { from: from, to: to, filter };
                 const CSVResponse = await invoiceOutService.getNegativeBasesCsv(params);
 
                 if (CSVResponse.data && CSVResponse.data.error) throw new Error();

From a2c96d276e65bea5690cc478280aa4dfe48c13ff Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 2 Jan 2024 08:17:04 -0300
Subject: [PATCH 031/105] Supplier Basic data, Billing data and Fiscal data

---
 src/i18n/en/index.js                          |  30 ++
 src/i18n/es/index.js                          |  30 ++
 .../Customer/CustomerExtendedListFilter.vue   |   1 -
 src/pages/Supplier/Card/SupplierBasicData.vue |  98 +++++-
 .../Supplier/Card/SupplierBillingData.vue     |  69 ++++-
 .../Supplier/Card/SupplierFiscalData.vue      | 293 +++++++++++++++++-
 6 files changed, 517 insertions(+), 4 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index a7567866b..0e34798d7 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -860,6 +860,36 @@ export default {
         create: {
             supplierName: 'Supplier name',
         },
+        basicData: {
+            alias: 'Alias',
+            workerFk: 'Responsible',
+            isSerious: 'Verified',
+            isActive: 'Active',
+            isPayMethodChecked: 'PayMethod checked',
+            note: 'Notes',
+        },
+        fiscalData: {
+            name: 'Social name *',
+            nif: 'Tax number *',
+            account: 'Account',
+            sageTaxTypeFk: 'Sage tax type',
+            sageWithholdingFk: 'Sage withholding',
+            sageTransactionTypeFk: 'Sage transaction type',
+            supplierActivityFk: 'Supplier activity',
+            healthRegister: 'Health register',
+            street: 'Street',
+            postcode: 'Postcode',
+            city: 'City *',
+            provinceFk: 'Province',
+            country: 'Country',
+            isTrucker: 'Trucker',
+            isVies: 'Vies',
+        },
+        billingData: {
+            payMethodFk: 'Billing data',
+            payDemFk: 'Payment deadline',
+            payDay: 'Pay day',
+        },
     },
     travel: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index c4820e70e..c83d25e3f 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -859,6 +859,36 @@ export default {
         create: {
             supplierName: 'Nombre del proveedor',
         },
+        basicData: {
+            alias: 'Alias',
+            workerFk: 'Responsable',
+            isSerious: 'Verificado',
+            isActive: 'Activo',
+            isPayMethodChecked: 'Método de pago validado',
+            note: 'Notas',
+        },
+        fiscalData: {
+            name: 'Razón social *',
+            nif: 'NIF/CIF *',
+            account: 'Cuenta',
+            sageTaxTypeFk: 'Tipo de impuesto sage',
+            sageWithholdingFk: 'Retención sage',
+            sageTransactionTypeFk: 'Tipo de transacción sage',
+            supplierActivityFk: 'Actividad proveedor',
+            healthRegister: 'Pasaporte sanitario',
+            street: 'Calle',
+            postcode: 'Código postal',
+            city: 'Población *',
+            provinceFk: 'Provincia',
+            country: 'País',
+            isTrucker: 'Transportista',
+            isVies: 'Vies',
+        },
+        billingData: {
+            payMethodFk: 'Forma de pago',
+            payDemFk: 'Plazo de pago',
+            payDay: 'Día de pago',
+        },
     },
     travel: {
         pageTitles: {
diff --git a/src/pages/Customer/CustomerExtendedListFilter.vue b/src/pages/Customer/CustomerExtendedListFilter.vue
index 0cf614fca..f7e83a757 100644
--- a/src/pages/Customer/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/CustomerExtendedListFilter.vue
@@ -565,7 +565,6 @@ const shouldRenderColumn = (colName) => {
 </style>
 
 <i18n>
-
 es:
     Social name: Razón social
 </i18n>
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 582da48f3..b73ce9346 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -1 +1,97 @@
-<template>Supplier basic data</template>
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const workersOptions = ref([]);
+</script>
+<template>
+    <FetchData
+        url="Workers/search"
+        :filter="{ fields: ['id', 'nickname'], order: 'nickname ASC', limit: 30 }"
+        @on-fetch="(data) => (workersOptions = data)"
+        auto-load
+    />
+    <FormModel
+        :url="`Suppliers/${route.params.id}`"
+        :url-update="`Suppliers/${route.params.id}`"
+        model="supplier"
+        auto-load
+    >
+        <template #form="{ data, validate }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.nickname"
+                        :label="t('supplier.basicData.alias')"
+                        :rules="validate('supplier.nickname')"
+                        clearable
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.basicData.workerFk')"
+                        v-model="data.workerFk"
+                        :options="workersOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        map-options
+                        :rules="validate('supplier.workerFk')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ scope.opt?.nickname }}, {{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox
+                        v-model="data.isSerious"
+                        :label="t('supplier.basicData.isSerious')"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        v-model="data.isActive"
+                        :label="t('supplier.basicData.isActive')"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        v-model="data.isPayMethodChecked"
+                        :label="t('supplier.basicData.isPayMethodChecked')"
+                    />
+                </div>
+            </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
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
index 849737fa7..1237a0403 100644
--- a/src/pages/Supplier/Card/SupplierBillingData.vue
+++ b/src/pages/Supplier/Card/SupplierBillingData.vue
@@ -1 +1,68 @@
-<template>Supplier billing data</template>
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+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';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const paymethodsOptions = ref([]);
+const payDemsOptions = ref([]);
+</script>
+<template>
+    <FetchData
+        url="Paymethods"
+        @on-fetch="(data) => (paymethodsOptions = data)"
+        auto-load
+    />
+    <FetchData url="PayDems" @on-fetch="(data) => (payDemsOptions = data)" auto-load />
+    <FormModel
+        :url="`Suppliers/${route.params.id}`"
+        :url-update="`Suppliers/${route.params.id}`"
+        model="supplier"
+        auto-load
+    >
+        <template #form="{ data, validate }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.billingData.payMethodFk')"
+                        v-model="data.payMethodFk"
+                        :options="paymethodsOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        map-options
+                        :rules="validate('supplier.payMethodFk')"
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.billingData.payDemFk')"
+                        v-model="data.payDemFk"
+                        :options="payDemsOptions"
+                        option-value="id"
+                        option-label="payDem"
+                        hide-selected
+                        map-options
+                        :rules="validate('supplier.payDemFk')"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QInput
+                        :label="t('supplier.billingData.payDay')"
+                        type="number"
+                        v-model="data.payDay"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index dd018ac60..ebf1b96b6 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -1 +1,292 @@
-<template>Supplier fiscal data</template>
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const postcodeFetchDataRef = ref(null);
+const sageTaxTypesOptions = ref([]);
+const sageWithholdingsOptions = ref([]);
+const sageTransactionTypesOptions = ref([]);
+const supplierActivitiesOptions = ref([]);
+const postcodesOptions = ref([]);
+const provincesLocationOptions = ref([]);
+const townsLocationOptions = ref([]);
+const countriesOptions = ref([]);
+
+const onPostcodeCreated = async () => {
+    postcodeFetchDataRef.value.fetch();
+};
+</script>
+<template>
+    <FetchData
+        url="SageTaxTypes"
+        auto-load
+        @on-fetch="(data) => (sageTaxTypesOptions = data)"
+    />
+    <FetchData
+        url="SageWithholdings"
+        auto-load
+        @on-fetch="(data) => (sageWithholdingsOptions = data)"
+    />
+    <FetchData
+        url="sageTransactionTypes"
+        auto-load
+        @on-fetch="(data) => (sageTransactionTypesOptions = data)"
+    />
+    <FetchData
+        url="SupplierActivities"
+        auto-load
+        @on-fetch="(data) => (supplierActivitiesOptions = data)"
+    />
+    <FetchData
+        ref="postcodeFetchDataRef"
+        url="Postcodes/location"
+        @on-fetch="(data) => (postcodesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        @on-fetch="(data) => (townsLocationOptions = 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"
+    />
+    <FormModel
+        :url="`Suppliers/${route.params.id}`"
+        :url-update="`Suppliers/${route.params.id}/updateFiscalData`"
+        model="supplier"
+        auto-load
+    >
+        <template #form="{ data, validate }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.name"
+                        :label="t('supplier.fiscalData.name')"
+                        clearable
+                    />
+                </div>
+                <div class="col">
+                    <VnInput
+                        v-model="data.nif"
+                        :label="t('supplier.fiscalData.nif')"
+                        clearable
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.account"
+                        :label="t('supplier.fiscalData.account')"
+                        clearable
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.fiscalData.sageTaxTypeFk')"
+                        v-model="data.sageTaxTypeFk"
+                        :options="sageTaxTypesOptions"
+                        option-value="id"
+                        option-label="vat"
+                        hide-selected
+                        map-options
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.fiscalData.sageWithholdingFk')"
+                        v-model="data.sageWithholdingFk"
+                        :options="sageWithholdingsOptions"
+                        option-value="id"
+                        option-label="withholding"
+                        hide-selected
+                        map-options
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.fiscalData.sageTransactionTypeFk')"
+                        v-model="data.sageTransactionTypeFk"
+                        :options="sageTransactionTypesOptions"
+                        option-value="id"
+                        option-label="transaction"
+                        hide-selected
+                        map-options
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.fiscalData.supplierActivityFk')"
+                        v-model="data.supplierActivityFk"
+                        :options="supplierActivitiesOptions"
+                        option-value="code"
+                        option-label="name"
+                        hide-selected
+                        map-options
+                    />
+                </div>
+                <div class="col">
+                    <VnInput
+                        v-model="data.healthRegister"
+                        :label="t('supplier.fiscalData.healthRegister')"
+                        clearable
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.street"
+                        :label="t('supplier.fiscalData.street')"
+                        clearable
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectCreate
+                        v-model="data.postCode"
+                        :label="t('supplier.fiscalData.postcode')"
+                        :rules="validate('supplier.postCode')"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :options="postcodesOptions"
+                        option-label="code"
+                        option-value="code"
+                        map-options
+                        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>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.fiscalData.city')"
+                        :options="townsLocationOptions"
+                        v-model="data.city"
+                        option-value="name"
+                        option-label="name"
+                        hide-selected
+                        :rules="validate('supplier.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">
+                    <VnSelectFilter
+                        :label="t('supplier.fiscalData.provinceFk')"
+                        :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>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('supplier.fiscalData.country')"
+                        :options="countriesOptions"
+                        hide-selected
+                        option-label="country"
+                        option-value="id"
+                        v-model="data.countryFk"
+                        :rules="validate('postcode.countryFk')"
+                    />
+                </div>
+                <div class="col flex justify-around">
+                    <QCheckbox
+                        v-model="data.isTrucker"
+                        :label="t('supplier.fiscalData.isTrucker')"
+                    />
+                    <div class="row items-center">
+                        <QCheckbox
+                            v-model="data.isVies"
+                            :label="t('supplier.fiscalData.isVies')"
+                        />
+                        <QIcon name="info" size="xs" class="cursor-pointer q-ml-sm">
+                            <QTooltip>
+                                {{
+                                    t(
+                                        'When activating it, do not enter the country code in the ID field.'
+                                    )
+                                }}
+                            </QTooltip>
+                        </QIcon>
+                    </div>
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
+
+<i18n>
+es:
+    When activating it, do not enter the country code in the ID field.: Al activarlo, no informar el código del país en el campo nif
+</i18n>

From 9b9ac4dfe11cc2e503865e479988050503c91a1d Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 2 Jan 2024 08:47:38 -0300
Subject: [PATCH 032/105] PR fixes

---
 src/components/CreateBankEntityForm.vue  | 24 +++---------------------
 src/components/CreateNewCityForm.vue     | 18 ++----------------
 src/components/CreateNewPostcodeForm.vue | 18 ++----------------
 src/components/CreateNewProvinceForm.vue | 18 ++----------------
 src/composables/useArrayData.js          |  4 +---
 src/css/app.scss                         | 13 +++++++++++++
 src/i18n/en/index.js                     |  9 ++++-----
 src/i18n/es/index.js                     |  9 ++++-----
 8 files changed, 31 insertions(+), 82 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 3de4bed63..9fb12e95c 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -26,10 +26,6 @@ const closeButton = ref(null);
 const countriesOptions = ref([]);
 const loading = ref(false);
 
-const setCountriesOptions = (data) => {
-    countriesOptions.value = data;
-};
-
 const onDataSaved = (data) => {
     emit('onDataSaved', data);
     closeForm();
@@ -43,9 +39,9 @@ const closeForm = () => {
 <template>
     <FetchData
         url="Countries"
-        @on-fetch="(data) => setCountriesOptions(data)"
         :filter="countriesFilter"
         auto-load
+        @on-fetch="(data) => (countriesOptions = data)"
     />
     <FormModel
         :form-initial-data="bankEntityFormData"
@@ -56,10 +52,10 @@ const closeForm = () => {
         @on-data-saved="onDataSaved($event)"
     >
         <template #form="{ data, validate }">
-            <span ref="closeButton" class="close-icon" v-close-popup>
+            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
-            <h1 class="title">{{ t('title') }}</h1>
+            <h1 class="popup-form-title">{{ t('title') }}</h1>
             <p class="q-mb-md">{{ t('subtitle') }}</p>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
@@ -116,20 +112,6 @@ const closeForm = () => {
     </FormModel>
 </template>
 
-<style lang="scss" scoped>
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}
-.title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-</style>
-
 <i18n>
 en:
     title: New bank entity
diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index f3d6e4509..7ff2ee4f0 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -46,10 +46,10 @@ const closeForm = () => {
         @on-data-saved="onDataSaved()"
     >
         <template #form="{ data, validate }">
-            <span ref="closeButton" class="close-icon" v-close-popup>
+            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
-            <h1 class="title">{{ t('New city') }}</h1>
+            <h1 class="popup-form-title">{{ t('New city') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
@@ -94,20 +94,6 @@ const closeForm = () => {
     </FormModel>
 </template>
 
-<style lang="scss" scoped>
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}
-.title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-</style>
-
 <i18n>
 es:
     New city: Nueva ciudad
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 18582cd49..0991e728b 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -75,10 +75,10 @@ const closeForm = () => {
         @on-data-saved="onDataSaved()"
     >
         <template #form="{ data, validate }">
-            <span ref="closeButton" class="close-icon" v-close-popup>
+            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
-            <h1 class="title">{{ t('New postcode') }}</h1>
+            <h1 class="popup-form-title">{{ t('New postcode') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
@@ -159,20 +159,6 @@ const closeForm = () => {
     </FormModel>
 </template>
 
-<style lang="scss" scoped>
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}
-.title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-</style>
-
 <i18n>
 es:
     New postcode: Nuevo código postal
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index 3aea81596..c2f78c1f5 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -46,10 +46,10 @@ const closeForm = () => {
         @on-data-saved="onDataSaved()"
     >
         <template #form="{ data, validate }">
-            <span ref="closeButton" class="close-icon" v-close-popup>
+            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
-            <h1 class="title">{{ t('New province') }}</h1>
+            <h1 class="popup-form-title">{{ t('New province') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
@@ -95,20 +95,6 @@ const closeForm = () => {
     </FormModel>
 </template>
 
-<style lang="scss" scoped>
-.close-icon {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}
-.title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-</style>
-
 <i18n>
 es:
     New postcode: Nuevo código postal
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 5e80949f3..9f0be6b1d 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -156,9 +156,7 @@ export function useArrayData(key, userOptions) {
                 delete store.userParams[param];
                 delete params[param];
                 if (store.filter?.where) {
-                    delete store.filter.where[
-                        Object.keys(exprBuilder ? exprBuilder(param) : param)[0]
-                    ];
+                    delete store.filter.where[Object.keys(exprBuilder ? exprBuilder(param) : param)[0]];
                     if (Object.keys(store.filter.where).length === 0) {
                         delete store.filter.where;
                     }
diff --git a/src/css/app.scss b/src/css/app.scss
index 02d4f8946..0f1b4673a 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -53,3 +53,16 @@ body.body--dark {
     color: var(--vn-text);
     border-radius: 8px;
 }
+
+.popup-form-title {
+    font-size: 17px;
+    font-weight: bold;
+    line-height: 20px;
+}
+
+.popup-form-close-button {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    cursor: pointer;
+}
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 4a1eea8f4..b1efa1457 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -49,7 +49,6 @@ export default {
         microsip: 'Open in MicroSIP',
         noSelectedRows: `You don't have any line selected`,
         downloadCSVSuccess: 'CSV downloaded successfully',
-        // labels compartidos entre vistas
         reference: 'Reference',
         agency: 'Agency',
         wareHouseOut: 'Warehouse Out',
@@ -566,7 +565,7 @@ export default {
             landed: 'Landed',
             hour: 'Hour',
             agency: 'Agency',
-            total: 'Total'
+            total: 'Total',
         },
         form: {
             clientFk: 'Client',
@@ -575,7 +574,7 @@ export default {
             agencyModeFk: 'Agency',
         },
         list: {
-            newOrder: 'New Order'
+            newOrder: 'New Order',
         },
         summary: {
             basket: 'Basket',
@@ -601,8 +600,8 @@ export default {
             description: 'Description',
             quantity: 'Quantity',
             price: 'Price',
-            amount: 'Amount'
-        }
+            amount: 'Amount',
+        },
     },
     worker: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 3f4ac1c27..701cb3274 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -48,7 +48,6 @@ export default {
         dateFormat: 'es-ES',
         noSelectedRows: `No tienes ninguna línea seleccionada`,
         microsip: 'Abrir en MicroSIP',
-        // labels compartidos entre vistas
         downloadCSVSuccess: 'Descarga de CSV exitosa',
         reference: 'Referencia',
         agency: 'Agencia',
@@ -475,7 +474,7 @@ export default {
             landed: 'F. entrega',
             hour: 'Hora',
             agency: 'Agencia',
-            total: 'Total'
+            total: 'Total',
         },
         form: {
             clientFk: 'Cliente',
@@ -484,7 +483,7 @@ export default {
             agencyModeFk: 'Agencia',
         },
         list: {
-            newOrder: 'Nuevo Pedido'
+            newOrder: 'Nuevo Pedido',
         },
         summary: {
             basket: 'Cesta',
@@ -510,8 +509,8 @@ export default {
             description: 'Descripción',
             quantity: 'Cantidad',
             price: 'Precio',
-            amount: 'Monto'
-        }
+            amount: 'Monto',
+        },
     },
     shelving: {
         pageTitles: {

From bf259b5fadda679d6aafcbe38389b47018f6e4a0 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Tue, 2 Jan 2024 08:12:44 -0500
Subject: [PATCH 033/105] Correcciones a branch pr 2

---
 src/pages/Customer/Defaulter/CustomerDefaulter.vue    |  2 +-
 .../Customer/ExtendedList/CustomerExtendedList.vue    |  2 +-
 .../Customer/Notifications/CustomerNotifications.vue  |  2 +-
 src/pages/InvoiceOut/InvoiceOutGlobal.vue             |  2 +-
 src/pages/InvoiceOut/InvoiceOutNegativeBases.vue      |  2 +-
 src/pages/Order/Card/OrderSearchbar.vue               | 11 ++++-------
 src/pages/Travel/ExtraCommunity.vue                   |  2 +-
 7 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index b35980416..476c612d6 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -233,7 +233,7 @@ const selectAuthorId = (id) => {
 <style lang="scss" scoped>
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 </style>
 
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
index a60b79caf..a1aa47791 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@@ -565,6 +565,6 @@ const selectSalesPersonId = (id) => {
 <style lang="scss" scoped>
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 </style>
diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index f9ff66a7b..e8d779cb5 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -148,7 +148,7 @@ const selectCustomerId = (id) => {
 <style lang="scss" scoped>
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 </style>
 
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobal.vue b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
index 7284ca04e..ea1978702 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
@@ -175,7 +175,7 @@ onUnmounted(() => {
 
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 </style>
 
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 3595a650d..15010c66d 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -255,7 +255,7 @@ const selectWorkerId = (id) => {
 <style lang="scss" scoped>
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 </style>
 
diff --git a/src/pages/Order/Card/OrderSearchbar.vue b/src/pages/Order/Card/OrderSearchbar.vue
index 4d354603b..a768768a5 100644
--- a/src/pages/Order/Card/OrderSearchbar.vue
+++ b/src/pages/Order/Card/OrderSearchbar.vue
@@ -9,17 +9,14 @@ const { t } = useI18n();
     <VnSearchbar
         data-key="OrderList"
         url="Orders/filter"
-        :label="t('search-order')"
-        :info="t('search-order-info')"
+        :label="t('Search order')"
+        :info="t('You can search orders by reference')"
     />
 </template>
 
 <style scoped lang="scss"></style>
 <i18n>
-en:
-    search-order: Search order
-    search-order-info: You can search orders by reference
 es:
-    Search shelving: Buscar orden
-    You can search by shelving reference: Puedes buscar por referencia de la orden
+    Search order: Buscar orden
+    You can search orders by reference: Puedes buscar por referencia de la orden
 </i18n>
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index 245cbc9de..f3cf557c6 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -395,7 +395,7 @@ onMounted(async () => {
 <style lang="scss" scoped>
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 
 .secondary-row {

From b0b8205b5266603ac14affd15edbd234e79bd001 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Tue, 2 Jan 2024 10:28:52 -0500
Subject: [PATCH 034/105] Solucion comentario

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 25 +++++++++------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 46de63abd..814aa49c6 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -67,24 +67,19 @@ function exprBuilder(param, value) {
             return { [param]: value };
     }
 }
+
+const setCategoryList = (data) => {
+    categoryList.value = (data || [])
+        .filter((category) => category.display)
+        .map((category) => ({
+            ...category,
+            icon: `vn:${(category.icon || '').split('-')[1]}`,
+        }));
+};
 </script>
 
 <template>
-    <FetchData
-        url="ItemCategories"
-        limit="30"
-        auto-load
-        @on-fetch="
-            (data) => {
-                categoryList = (data || [])
-                    .filter((category) => category.display)
-                    .map((category) => ({
-                        ...category,
-                        icon: `vn:${(category.icon || '').split('-')[1]}`,
-                    }));
-            }
-        "
-    />
+    <FetchData url="ItemCategories" limit="30" auto-load @on-fetch="setCategoryList" />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"

From 606f4f08920289aebb569bfda030f2bd57b706ab Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 2 Jan 2024 11:40:07 -0400
Subject: [PATCH 035/105] Implement orders catalog tag filter

---
 src/components/ui/VnFilterPanel.vue         |   3 +-
 src/pages/Order/Card/OrderCatalogFilter.vue | 171 ++++++++++++++++++--
 src/pages/Order/OrderCatalog.vue            |  22 ++-
 3 files changed, 183 insertions(+), 13 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 6f6183224..a138e0b64 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -41,7 +41,7 @@ const props = defineProps({
     },
 });
 
-const emit = defineEmits(['refresh', 'clear', 'search', 'init']);
+const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
 
 const arrayData = useArrayData(props.dataKey, {
     exprBuilder: props.exprBuilder,
@@ -116,6 +116,7 @@ const tags = computed(() => {
 async function remove(key) {
     userParams.value[key] = null;
     await search();
+    emit('remove', key)
 }
 
 function formatValue(value) {
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 46de63abd..00606d57c 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -6,6 +6,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import axios from 'axios';
 import { useRoute } from 'vue-router';
+import VnInput from 'components/common/VnInput.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -14,6 +15,10 @@ const props = defineProps({
         type: String,
         required: true,
     },
+    tags: {
+        type: Array,
+        required: true,
+    },
 });
 
 const categoryList = ref(null);
@@ -21,16 +26,27 @@ const selectedCategoryFk = ref(null);
 const typeList = ref(null);
 const selectedTypeFk = ref(null);
 
-const selectCategory = (params, category) => {
+const resetCategory = () => {
+    selectedCategoryFk.value = null;
+    typeList.value = null;
+};
+
+const clearFilter = (key) => {
+    if (key === 'categoryFk') {
+        resetCategory();
+    }
+};
+
+const selectCategory = (params, category, search) => {
     if (params.categoryFk === category?.id) {
-        selectedCategoryFk.value = null;
+        resetCategory();
         params.categoryFk = null;
-        typeList.value = null;
     } else {
         selectedCategoryFk.value = category?.id;
         params.categoryFk = category?.id;
         loadTypes(category?.id);
     }
+    search();
 };
 
 const loadTypes = async (categoryFk) => {
@@ -67,6 +83,27 @@ function exprBuilder(param, value) {
             return { [param]: value };
     }
 }
+
+const selectedTag = ref(null);
+const tagValues = ref([{}]);
+const tagOptions = ref(null);
+
+const applyTagFilter = (params, search) => {
+    if (!tagValues.value?.length) {
+        params.tagGroups = null;
+        search();
+        return;
+    }
+    params.tagGroups = JSON.stringify({
+        values: tagValues.value,
+        tagSelection: {
+            ...selectedTag.value,
+            orgShowField: selectedTag.value.name,
+        },
+        tagFk: selectedTag.value.tagFk,
+    });
+    search();
+};
 </script>
 
 <template>
@@ -87,13 +124,19 @@ function exprBuilder(param, value) {
     />
     <VnFilterPanel
         :data-key="props.dataKey"
-        :search-button="true"
         :hidden-tags="['orderFk', 'orderBy']"
         :expr-builder="exprBuilder"
         @init="onFilterInit"
+        @remove="clearFilter"
     >
         <template #tags="{ tag, formatFn }">
-            <strong v-if="tag.label === 'categoryFk'">
+            <div v-if="tag.label === 'tagGroups'">
+                <strong>
+                    {{ JSON.parse(tag?.value).tagSelection?.name  }}:
+                </strong>
+                <span>{{ (JSON.parse(tag?.value).values || []).map(item => item.value).join(' | ') }}</span>
+            </div>
+            <strong v-else-if="tag.label === 'categoryFk'">
                 {{ t(selectedCategory?.name || '') }}
             </strong>
             <strong v-else-if="tag.label === 'typeFk'">
@@ -104,8 +147,8 @@ function exprBuilder(param, value) {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params }">
-            <QList dense>
+        <template #body="{ params, searchFn }">
+            <QList dense style="max-width: 256px">
                 <QItem class="category-filter q-mt-md">
                     <div
                         v-for="category in categoryList"
@@ -118,7 +161,7 @@ function exprBuilder(param, value) {
                         <QIcon
                             :name="category.icon"
                             class="category-icon"
-                            @click="selectCategory(params, category)"
+                            @click="selectCategory(params, category, searchFn)"
                         >
                             <QTooltip>
                                 {{ t(category.name) }}
@@ -126,7 +169,7 @@ function exprBuilder(param, value) {
                         </QIcon>
                     </div>
                 </QItem>
-                <QItem class="q-mt-md">
+                <QItem class="q-my-md">
                     <QItemSection>
                         <VnSelectFilter
                             :label="t('params.type')"
@@ -140,7 +183,12 @@ function exprBuilder(param, value) {
                             emit-value
                             use-input
                             :disable="!selectedCategoryFk"
-                            @update:model-value="(value) => (selectedTypeFk = value)"
+                            @update:model-value="
+                                (value) => {
+                                    selectedTypeFk = value;
+                                    searchFn();
+                                }
+                            "
                         >
                             <template #option="{ itemProps, opt }">
                                 <QItem v-bind="itemProps">
@@ -155,6 +203,88 @@ function exprBuilder(param, value) {
                         </VnSelectFilter>
                     </QItemSection>
                 </QItem>
+                <QSeparator />
+                <QItem class="q-mt-md">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="t('params.tag')"
+                            v-model="selectedTag"
+                            :options="props.tags || []"
+                            option-value="id"
+                            option-label="name"
+                            dense
+                            outlined
+                            rounded
+                            :emit-value="false"
+                            use-input
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem
+                    v-for="(value, index) in tagValues"
+                    :key="value"
+                    class="q-mt-md filter-value"
+                >
+                    <VnInput
+                        v-if="selectedTag?.isFree"
+                        v-model="value.value"
+                        :label="t('params.value')"
+                        is-outlined
+                        class="filter-input"
+                    />
+                    <VnSelectFilter
+                        v-else
+                        :label="t('params.value')"
+                        v-model="value.value"
+                        :options="tagOptions || []"
+                        option-value="value"
+                        option-label="value"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        use-input
+                        :disable="!selectedTag"
+                        class="filter-input"
+                    />
+
+                    <FetchData
+                        v-if="selectedTag && !selectedTag.isFree"
+                        :url="`Tags/${selectedTag?.id}/filterValue`"
+                        limit="30"
+                        auto-load
+                        @on-fetch="(data) => (tagOptions = data)"
+                    />
+
+                    <QIcon
+                        name="delete"
+                        class="filter-icon"
+                        @click="(tagValues || []).splice(index, 1)"
+                    />
+                </QItem>
+                <QItem class="q-mt-lg">
+                    <QIcon
+                        name="add_circle"
+                        class="filter-icon"
+                        @click="tagValues.push({})"
+                    />
+                </QItem>
+                <QItem>
+                    <QItemSection class="q-py-sm">
+                        <QBtn
+                            :label="t('Search')"
+                            class="full-width"
+                            color="primary"
+                            dense
+                            icon="search"
+                            rounded
+                            type="button"
+                            unelevated
+                            @click.stop="applyTagFilter(params, searchFn)"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QSeparator />
             </QList>
         </template>
     </VnFilterPanel>
@@ -188,6 +318,23 @@ function exprBuilder(param, value) {
         cursor: pointer;
     }
 }
+
+.filter-icon {
+    font-size: 24px;
+    color: $primary;
+    padding: 0 4px;
+    cursor: pointer;
+}
+
+.filter-input {
+    flex-shrink: 1;
+    min-width: 0;
+}
+
+.filter-value {
+    display: flex;
+    align-items: center;
+}
 </style>
 
 <i18n>
@@ -195,10 +342,14 @@ en:
     params:
         type: Type
         orderBy: Order By
+        tag: Tag
+        value: Value
 es:
     params:
         type: Tipo
         orderBy: Ordenar por
+        tag: Etiqueta
+        value: Valor
     Plant: Planta
     Flower: Flor
     Handmade: Confección
diff --git a/src/pages/Order/OrderCatalog.vue b/src/pages/Order/OrderCatalog.vue
index 08075260c..4741f64e6 100644
--- a/src/pages/Order/OrderCatalog.vue
+++ b/src/pages/Order/OrderCatalog.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import { useRoute } from 'vue-router';
-import { onMounted, onUnmounted } from 'vue';
+import {onMounted, onUnmounted, ref} from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
@@ -20,12 +20,29 @@ const catalogParams = {
     orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
 };
 
+const tags = ref([])
+
 function exprBuilder(param, value) {
     switch (param) {
         case 'search':
             return { 'i.name': { like: `%${value}%` } };
     }
 }
+
+function extractTags(items) {
+    const resultTags = [];
+    (items || []).forEach((item) => {
+        (item.tags || []).forEach((tag) => {
+            const index = resultTags.findIndex((item) => item.tagFk === tag.tagFk);
+            if (index === -1) {
+                resultTags.push({ ...tag, priority: 1 });
+            } else {
+                resultTags[index].priority += 1;
+            }
+        });
+    });
+    tags.value = resultTags
+}
 </script>
 
 <template>
@@ -56,7 +73,7 @@ function exprBuilder(param, value) {
     </Teleport>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
-            <OrderCatalogFilter data-key="OrderCatalogList" />
+            <OrderCatalogFilter data-key="OrderCatalogList" :tags="tags" />
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
@@ -67,6 +84,7 @@ function exprBuilder(param, value) {
                 :limit="50"
                 :user-params="catalogParams"
                 auto-load
+                @on-fetch="extractTags"
             >
                 <template #body="{ rows }">
                     <div class="catalog-list">

From 49bb2223438723ac556051fd36015ee4941740ad Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 2 Jan 2024 12:57:13 -0300
Subject: [PATCH 036/105] create form popup reutilizable component

---
 src/components/CreateBankEntityForm.vue  |  45 ++--------
 src/components/CreateNewCityForm.vue     |  45 ++--------
 src/components/CreateNewPostcodeForm.vue |  52 +++--------
 src/components/CreateNewProvinceForm.vue |  50 ++---------
 src/components/FormModelPopup.vue        | 105 +++++++++++++++++++++++
 src/css/app.scss                         |  13 ---
 6 files changed, 138 insertions(+), 172 deletions(-)
 create mode 100644 src/components/FormModelPopup.vue

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 9fb12e95c..f4f5fef7d 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -4,8 +4,8 @@ import { useI18n } from 'vue-i18n';
 
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
-import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from './FormModelPopup.vue';
 
 const emit = defineEmits(['onDataSaved']);
 
@@ -22,17 +22,10 @@ const countriesFilter = {
     fields: ['id', 'country', 'code'],
 };
 
-const closeButton = ref(null);
 const countriesOptions = ref([]);
-const loading = ref(false);
 
 const onDataSaved = (data) => {
     emit('onDataSaved', data);
-    closeForm();
-};
-
-const closeForm = () => {
-    if (closeButton.value) closeButton.value.click();
 };
 </script>
 
@@ -43,20 +36,15 @@ const closeForm = () => {
         auto-load
         @on-fetch="(data) => (countriesOptions = data)"
     />
-    <FormModel
-        :form-initial-data="bankEntityFormData"
-        :observe-form-changes="false"
-        :default-actions="false"
+    <FormModelPopup
         url-create="bankEntities"
         model="bankEntity"
+        :title="t('title')"
+        :subtitle="t('subtitle')"
+        :form-initial-data="bankEntityFormData"
         @on-data-saved="onDataSaved($event)"
     >
-        <template #form="{ data, validate }">
-            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
-                <QIcon name="close" size="sm" />
-            </span>
-            <h1 class="popup-form-title">{{ t('title') }}</h1>
-            <p class="q-mb-md">{{ t('subtitle') }}</p>
+        <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <QInput
@@ -89,27 +77,8 @@ const closeForm = () => {
                     <QInput :label="t('id')" v-model="data.id" />
                 </div>
             </VnRow>
-            <div class="q-mt-lg row justify-end">
-                <QBtn
-                    :label="t('globals.save')"
-                    type="submit"
-                    color="primary"
-                    :disabled="loading"
-                    :loading="loading"
-                />
-                <QBtn
-                    :label="t('globals.cancel')"
-                    type="reset"
-                    color="primary"
-                    flat
-                    class="q-ml-sm"
-                    :disabled="loading"
-                    :loading="loading"
-                    v-close-popup
-                />
-            </div>
         </template>
-    </FormModel>
+    </FormModelPopup>
 </template>
 
 <i18n>
diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index 7ff2ee4f0..ee842e86f 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -6,7 +6,7 @@ import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import FormModel from 'components/FormModel.vue';
+import FormModelPopup from './FormModelPopup.vue';
 
 const emit = defineEmits(['onDataSaved']);
 
@@ -17,17 +17,10 @@ const cityFormData = reactive({
     provinceFk: null,
 });
 
-const closeButton = ref(null);
-const isLoading = ref(false);
 const provincesOptions = ref([]);
 
 const onDataSaved = () => {
     emit('onDataSaved');
-    closeForm();
-};
-
-const closeForm = () => {
-    if (closeButton.value) closeButton.value.click();
 };
 </script>
 
@@ -37,20 +30,15 @@ const closeForm = () => {
         auto-load
         url="Provinces"
     />
-    <FormModel
+    <FormModelPopup
+        :title="t('New city')"
+        :subtitle="t('Please, ensure you put the correct data!')"
         :form-initial-data="cityFormData"
-        :observe-form-changes="false"
-        :default-actions="false"
         url-create="towns"
         model="city"
-        @on-data-saved="onDataSaved()"
+        @on-data-saved="onDataSaved($event)"
     >
-        <template #form="{ data, validate }">
-            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
-                <QIcon name="close" size="sm" />
-            </span>
-            <h1 class="popup-form-title">{{ t('New city') }}</h1>
-            <p>{{ t('Please, ensure you put the correct data!') }}</p>
+        <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <VnInput
@@ -71,27 +59,8 @@ const closeForm = () => {
                     />
                 </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>
         </template>
-    </FormModel>
+    </FormModelPopup>
 </template>
 
 <i18n>
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 0991e728b..3504445f8 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -6,10 +6,10 @@ import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import FormModel from 'components/FormModel.vue';
 import CreateNewCityForm from './CreateNewCityForm.vue';
 import CreateNewProvinceForm from './CreateNewProvinceForm.vue';
 import VnSelectCreate from 'components/common/VnSelectCreate.vue';
+import FormModelPopup from './FormModelPopup.vue';
 
 const emit = defineEmits(['onDataSaved']);
 
@@ -24,15 +24,12 @@ const postcodeFormData = reactive({
 
 const townsFetchDataRef = ref(null);
 const provincesFetchDataRef = ref(null);
-const closeButton = ref(null);
 const countriesOptions = ref([]);
-const isLoading = ref(false);
 const provincesOptions = ref([]);
 const townsLocationOptions = ref([]);
 
 const onDataSaved = () => {
     emit('onDataSaved');
-    closeForm();
 };
 
 const onCityCreated = async () => {
@@ -42,10 +39,6 @@ const onCityCreated = async () => {
 const onProvinceCreated = async () => {
     await provincesFetchDataRef.value.fetch();
 };
-
-const closeForm = () => {
-    if (closeButton.value) closeButton.value.click();
-};
 </script>
 
 <template>
@@ -66,20 +59,15 @@ const closeForm = () => {
         auto-load
         url="Countries"
     />
-    <FormModel
-        :form-initial-data="postcodeFormData"
-        :observe-form-changes="false"
-        :default-actions="false"
+    <FormModelPopup
         url-create="postcodes"
         model="postcode"
-        @on-data-saved="onDataSaved()"
+        :title="t('New postcode')"
+        :subtitle="t('Please, ensure you put the correct data!')"
+        :form-initial-data="postcodeFormData"
+        @on-data-saved="onDataSaved($event)"
     >
-        <template #form="{ data, validate }">
-            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
-                <QIcon name="close" size="sm" />
-            </span>
-            <h1 class="popup-form-title">{{ t('New postcode') }}</h1>
-            <p>{{ t('Please, ensure you put the correct data!') }}</p>
+        <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <VnInput
@@ -134,29 +122,9 @@ const closeForm = () => {
                         v-model="data.countryFk"
                         :rules="validate('postcode.countryFk')"
                     />
-                </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>
-        </template>
-    </FormModel>
+                </div> </VnRow
+        ></template>
+    </FormModelPopup>
 </template>
 
 <i18n>
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index c2f78c1f5..0f88952ea 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -6,7 +6,7 @@ import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import FormModel from 'components/FormModel.vue';
+import FormModelPopup from './FormModelPopup.vue';
 
 const emit = defineEmits(['onDataSaved']);
 
@@ -17,17 +17,10 @@ const provinceFormData = reactive({
     autonomyFk: null,
 });
 
-const closeButton = ref(null);
-const isLoading = ref(false);
 const autonomiesOptions = ref([]);
 
 const onDataSaved = () => {
     emit('onDataSaved');
-    closeForm();
-};
-
-const closeForm = () => {
-    if (closeButton.value) closeButton.value.click();
 };
 </script>
 
@@ -37,20 +30,15 @@ const closeForm = () => {
         auto-load
         url="Autonomies"
     />
-    <FormModel
-        :form-initial-data="provinceFormData"
-        :observe-form-changes="false"
-        :default-actions="false"
+    <FormModelPopup
+        :title="t('New province')"
+        :subtitle="t('Please, ensure you put the correct data!')"
         url-create="provinces"
         model="province"
-        @on-data-saved="onDataSaved()"
+        :form-initial-data="provinceFormData"
+        @on-data-saved="onDataSaved($event)"
     >
-        <template #form="{ data, validate }">
-            <span ref="closeButton" class="popup-form-close-button" v-close-popup>
-                <QIcon name="close" size="sm" />
-            </span>
-            <h1 class="popup-form-title">{{ t('New province') }}</h1>
-            <p>{{ t('Please, ensure you put the correct data!') }}</p>
+        <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <VnInput
@@ -71,33 +59,13 @@ const closeForm = () => {
                     />
                 </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>
         </template>
-    </FormModel>
+    </FormModelPopup>
 </template>
 
 <i18n>
 es:
-    New postcode: Nuevo código postal
+    New province: Nueva provincia
     Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos!
     Name: Nombre
     Autonomy: Autonomía
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
new file mode 100644
index 000000000..9021adc46
--- /dev/null
+++ b/src/components/FormModelPopup.vue
@@ -0,0 +1,105 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const $props = defineProps({
+    title: {
+        type: String,
+        default: '',
+    },
+    subtitle: {
+        type: String,
+        default: '',
+    },
+    url: {
+        type: String,
+        default: '',
+    },
+    model: {
+        type: String,
+        default: '',
+    },
+    filter: {
+        type: Object,
+        default: null,
+    },
+    urlCreate: {
+        type: String,
+        default: null,
+    },
+    formInitialData: {
+        type: Object,
+        default: () => {},
+    },
+});
+
+const { t } = useI18n();
+
+const closeButton = ref(null);
+const isLoading = ref(false);
+
+const onDataSaved = () => {
+    emit('onDataSaved');
+    closeForm();
+};
+
+const closeForm = () => {
+    if (closeButton.value) closeButton.value.click();
+};
+</script>
+
+<template>
+    <FormModel
+        :form-initial-data="formInitialData"
+        :observe-form-changes="false"
+        :default-actions="false"
+        :url-create="urlCreate"
+        :model="model"
+        @on-data-saved="onDataSaved()"
+    >
+        <template #form="{ data, validate }">
+            <span
+                ref="closeButton"
+                class="absolute cursor-pointer"
+                style="top: 20px; right: 20px"
+                v-close-popup
+            >
+                <QIcon name="close" size="sm" />
+            </span>
+            <h1 class="title">{{ title }}</h1>
+            <p>{{ subtitle }}</p>
+            <slot name="form-inputs" :data="data" :validate="validate" />
+            <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>
+        </template>
+    </FormModel>
+</template>
+
+<style lang="scss" scoped>
+.title {
+    font-size: 17px;
+    font-weight: bold;
+    line-height: 20px;
+}
+</style>
diff --git a/src/css/app.scss b/src/css/app.scss
index 0f1b4673a..02d4f8946 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -53,16 +53,3 @@ body.body--dark {
     color: var(--vn-text);
     border-radius: 8px;
 }
-
-.popup-form-title {
-    font-size: 17px;
-    font-weight: bold;
-    line-height: 20px;
-}
-
-.popup-form-close-button {
-    position: absolute;
-    top: 20px;
-    right: 20px;
-    cursor: pointer;
-}

From c29586632c9cceba3d71ac0e3b0a9415bd3c21e5 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 2 Jan 2024 12:29:34 -0400
Subject: [PATCH 037/105] Fix order feedback

---
 src/pages/Order/Card/OrderCatalogFilter.vue   | 11 ++++++----
 src/pages/Order/Card/OrderCatalogItem.vue     |  4 +++-
 .../Order/Card/OrderCatalogItemDialog.vue     |  5 ++---
 src/pages/Order/Card/OrderDescriptor.vue      | 21 +++++++++++--------
 src/pages/Order/Card/OrderSummary.vue         |  2 +-
 5 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 814aa49c6..23accb680 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -76,6 +76,12 @@ const setCategoryList = (data) => {
             icon: `vn:${(category.icon || '').split('-')[1]}`,
         }));
 };
+
+const getCategoryClass = (category, params) => {
+    if (category.id === params?.categoryFk) {
+        return 'active';
+    }
+};
 </script>
 
 <template>
@@ -105,10 +111,7 @@ const setCategoryList = (data) => {
                     <div
                         v-for="category in categoryList"
                         :key="category.name"
-                        :class="[
-                            'category',
-                            category.id === params?.categoryFk && 'active',
-                        ]"
+                        :class="['category', getCategoryClass(category, params)]"
                     >
                         <QIcon
                             :name="category.icon"
diff --git a/src/pages/Order/Card/OrderCatalogItem.vue b/src/pages/Order/Card/OrderCatalogItem.vue
index 6579fc261..e36ba7836 100644
--- a/src/pages/Order/Card/OrderCatalogItem.vue
+++ b/src/pages/Order/Card/OrderCatalogItem.vue
@@ -6,6 +6,8 @@ import OrderCatalogItemDialog from 'pages/Order/Card/OrderCatalogItemDialog.vue'
 import toCurrency from '../../../filters/toCurrency';
 import { ref } from 'vue';
 
+const DEFAULT_PRICE_KG = 0;
+
 const session = useSession();
 const token = session.getToken();
 const { t } = useI18n();
@@ -70,7 +72,7 @@ const dialog = ref(null);
                         </QIcon>
                     </div>
                     <p v-if="item.priceKg" class="price-kg">
-                        {{ t('price-kg') }} {{ toCurrency(item.priceKg) || 1123 }}
+                        {{ t('price-kg') }} {{ toCurrency(item.priceKg) || DEFAULT_PRICE_KG }}
                     </p>
                 </div>
             </div>
diff --git a/src/pages/Order/Card/OrderCatalogItemDialog.vue b/src/pages/Order/Card/OrderCatalogItemDialog.vue
index 8d12824e6..d5464ed1a 100644
--- a/src/pages/Order/Card/OrderCatalogItemDialog.vue
+++ b/src/pages/Order/Card/OrderCatalogItemDialog.vue
@@ -45,8 +45,7 @@ const addToOrder = async () => {
                                 class="link"
                                 @click="
                                     () => {
-                                        item.quantity =
-                                            Number(item.quantity) + item.grouping;
+                                        item.quantity += item.grouping;
                                     }
                                 "
                             >
@@ -56,7 +55,7 @@ const addToOrder = async () => {
                         </td>
                         <td class="text-right">
                             <QInput
-                                v-model="item.quantity"
+                                v-model.number="item.quantity"
                                 type="number"
                                 :step="item.grouping"
                                 min="0"
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 09c87f138..727d74322 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -9,7 +9,9 @@ import useCardDescription from 'src/composables/useCardDescription';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import OrderDescriptorMenu from "pages/Order/Card/OrderDescriptorMenu.vue";
+import OrderDescriptorMenu from 'pages/Order/Card/OrderDescriptorMenu.vue';
+
+const DEFAULT_ITEMS = 0;
 
 const $props = defineProps({
     id: {
@@ -60,6 +62,10 @@ const setData = (entity) => {
     data.value = useCardDescription(entity.client.name, entity.id);
     state.set('ClaimDescriptor', entity);
 };
+
+const getConfirmationValue = (isConfirmed) => {
+    return t(isConfirmed ? 'order.summary.confirmed' : 'order.summary.notConfirmed');
+};
 </script>
 
 <template>
@@ -79,13 +85,7 @@ const setData = (entity) => {
         <template #body="{ entity }">
             <VnLv
                 :label="t('order.summary.state')"
-                :value="
-                    t(
-                        entity.isConfirmed
-                            ? 'order.summary.confirmed'
-                            : 'order.summary.notConfirmed'
-                    )
-                "
+                :value="getConfirmationValue(entity.isConfirmed)"
             />
             <VnLv :label="t('order.field.salesPersonFk')">
                 <template #value>
@@ -98,7 +98,10 @@ const setData = (entity) => {
             <VnLv :label="t('order.summary.landed')" :value="toDate(entity?.landed)" />
             <VnLv :label="t('order.field.agency')" :value="entity?.agencyMode?.name" />
             <VnLv :label="t('order.summary.alias')" :value="entity?.address?.nickname" />
-            <VnLv :label="t('order.summary.items')" :value="(entity?.rows?.length || 0).toString()" />
+            <VnLv
+                :label="t('order.summary.items')"
+                :value="(entity?.rows?.length || DEFAULT_ITEMS).toString()"
+            />
             <VnLv :label="t('order.summary.total')" :value="toCurrency(entity?.total)" />
         </template>
         <template #actions="{ entity }">
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 0efffa3fa..0ddae2d16 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -78,7 +78,7 @@ const detailsColumns = ref([
                 />
                 <VnLv
                     :label="t('order.summary.confirmed')"
-                    :value="entity?.isConfirmed === 1"
+                    :value="Boolean(entity?.isConfirmed)"
                 />
             </QCard>
             <QCard class="vn-one">

From a5cbc55a7e41cfe72750380e6f0abcb305477b92 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 2 Jan 2024 12:36:09 -0400
Subject: [PATCH 038/105] Fix form model feedback

---
 src/components/FormModel.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index e683ce735..691cf63bd 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -97,9 +97,7 @@ const startFormWatcher = () => {
     watch(
         () => formData.value,
         (val) => {
-            if (!isResetting.value && val) {
-                hasChanges.value = true;
-            }
+            hasChanges.value = !isResetting.value && val;
             isResetting.value = false;
         },
         { deep: true }

From 046b69d89e1e6d8401c3ca70fe3842139e7933c7 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 3 Jan 2024 07:47:38 +0100
Subject: [PATCH 039/105] =?UTF-8?q?warmFix(ticketSummary):=20change=20this?=
 =?UTF-8?q?.=20=E2=86=92=20.value?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/composables/useUserConfig.js        | 2 +-
 src/pages/Ticket/Card/TicketSummary.vue | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/composables/useUserConfig.js b/src/composables/useUserConfig.js
index 692943978..e05d7fb5c 100644
--- a/src/composables/useUserConfig.js
+++ b/src/composables/useUserConfig.js
@@ -16,7 +16,7 @@ export function useUserConfig() {
 
             return data;
         } catch (error) {
-            notify('globals.errors.userConfig', 'negative');
+            notify('errors.userConfig', 'negative');
             console.error('Error fetching user config:', error);
         }
     }
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index cfc35c032..4114b0c8e 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -49,7 +49,7 @@ async function setData(data) {
 function formattedAddress() {
     if (!ticket.value) return '';
 
-    const address = this.ticket.address;
+    const address = ticket.value.address;
     const postcode = address.postalCode;
     const province = address.province ? `(${address.province.name})` : '';
 
@@ -58,7 +58,7 @@ function formattedAddress() {
 
 function isEditable() {
     try {
-        return !this.ticket.ticketState.state.alertLevel;
+        return !ticket.value.ticketState.state.alertLevel;
     } catch (e) {
         console.error(e);
     }
@@ -67,10 +67,10 @@ function isEditable() {
 }
 
 async function changeState(value) {
-    if (!this.ticket.id) return;
+    if (!ticket.value.id) return;
 
     const formData = {
-        ticketFk: this.ticket.id,
+        ticketFk: ticket.value.id,
         code: value,
     };
 

From ac660fadd780dff8140e5d3820043cbef8ff7bc1 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 3 Jan 2024 09:17:28 +0100
Subject: [PATCH 040/105] refs #6098 feat: add translate for copyToken

---
 src/i18n/en/index.js | 1 +
 src/i18n/es/index.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 5e7e116c5..4e69f05b7 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -741,6 +741,7 @@ export default {
     components: {
         topbar: {},
         userPanel: {
+            copyToken: 'Token copied to clipboard',
             settings: 'Settings',
             logOut: 'Log Out',
         },
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 4e570e7b4..ae3b8f553 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -740,6 +740,7 @@ export default {
     components: {
         topbar: {},
         userPanel: {
+            copyToken: 'Token copiado al portapapeles',
             settings: 'Configuración',
             logOut: 'Cerrar sesión',
         },

From 899ccc097a91926c19d248695f3f30419a4939f9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 3 Jan 2024 09:18:13 +0100
Subject: [PATCH 041/105] refs #6098 perf: remove import.meta.glob

---
 src/components/UserPanel.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index aee12d105..d02aa7c1f 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -22,14 +22,11 @@ const userLocale = computed({
 
         if (value === 'en') value = 'en-GB';
 
-        // FIXME: Dynamic imports from absolute paths are not compatible with vite:
-        // https://github.com/rollup/plugins/tree/master/packages/dynamic-import-vars#limitations
         try {
-            const langList = import.meta.glob('../../node_modules/quasar/lang/*.mjs');
-            langList[`../../node_modules/quasar/lang/${value}.mjs`]().then((lang) => {
+            import(`../../node_modules/quasar/lang/${value}.mjs`).then((lang) => {
                 Quasar.lang.set(lang.default);
             });
-        } catch (error) {
+       } catch (error) {
             //
         }
     },

From b00b2941c7406413f08d0e4ff64888bad72cb53e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 3 Jan 2024 09:18:35 +0100
Subject: [PATCH 042/105] refs #6098 perf: define locale equivalences in i18n
 folder

---
 src/components/UserPanel.vue | 11 ++++++++---
 src/i18n/index.js            |  4 +++-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index d02aa7c1f..e6251adc9 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -1,17 +1,18 @@
 <script setup>
 import { onMounted, computed } from 'vue';
-import { Dark, Quasar } from 'quasar';
+import { Dark, Quasar, useQuasar } 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";
 
 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
+const quasar = useQuasar();
 
 const userLocale = computed({
     get() {
@@ -20,7 +21,7 @@ const userLocale = computed({
     set(value) {
         locale.value = value;
 
-        if (value === 'en') value = 'en-GB';
+        value = localeEquivalence[value] ?? value
 
         try {
             import(`../../node_modules/quasar/lang/${value}.mjs`).then((lang) => {
@@ -81,6 +82,10 @@ function logout() {
 
 function copyUserToken(){
     navigator.clipboard.writeText(session.getToken());
+    quasar.notify({
+        type: 'positive',
+        message: t('components.userPanel.copyToken'),
+    });
 }
 </script>
 
diff --git a/src/i18n/index.js b/src/i18n/index.js
index 7344be49a..a375812df 100644
--- a/src/i18n/index.js
+++ b/src/i18n/index.js
@@ -1,6 +1,8 @@
 import en from './en';
 import es from './es';
-
+export const localeEquivalence = {
+     'en':'en-GB'
+}
 export default {
     en: en,
     es: es,

From c4cf9842cb8c24fd10a9298f24b12ec2ec895a13 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 3 Jan 2024 09:39:28 +0100
Subject: [PATCH 043/105] refs #6098 perf: add vite-ignore

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

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index e6251adc9..f512ac4c4 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -24,6 +24,7 @@ const userLocale = computed({
         value = localeEquivalence[value] ?? value
 
         try {
+            /* @vite-ignore */
             import(`../../node_modules/quasar/lang/${value}.mjs`).then((lang) => {
                 Quasar.lang.set(lang.default);
             });

From 3acc4b0d58d73c1e421a4f648d1b3d946d3f504e Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 3 Jan 2024 09:59:27 +0100
Subject: [PATCH 044/105] vn qtoolbar

---
 src/pages/Claim/Card/ClaimCard.vue       | 14 +++++++++++++-
 src/pages/Claim/Card/ClaimLines.vue      |  4 +++-
 src/pages/Customer/Card/CustomerCard.vue |  7 +++++++
 src/stores/useStateStore.js              | 11 +++++++----
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index a8c832967..41e4a46cb 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -8,7 +8,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import ClaimDescriptor from './ClaimDescriptor.vue';
 
-import { onMounted } from 'vue';
+import { onMounted, onUnmounted } from 'vue';
 const stateStore = useStateStore();
 const { t } = useI18n();
 const route = useRoute();
@@ -22,6 +22,18 @@ const $props = defineProps({
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
+
+onMounted(() => {
+    console.log('MOUNTED', stateStore.isSubToolbarShown());
+    stateStore.toggleSubToolbar();
+    console.log('MOUNTED', stateStore.isSubToolbarShown());
+});
+
+onUnmounted(() => {
+    console.log('MOUNTED', stateStore.isSubToolbarShown());
+    stateStore.toggleSubToolbar();
+    console.log('MOUNTED', stateStore.isSubToolbarShown());
+});
 </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 4eaef2958..d1022b731 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -18,6 +18,7 @@ const route = useRoute();
 const { t } = useI18n();
 
 const stateStore = useStateStore();
+const subToolbarLoaded = computed(() => stateStore.isSubToolbarShown());
 const arrayData = useArrayData('ClaimLines');
 const store = arrayData.store;
 
@@ -157,7 +158,8 @@ function isSubToolbarShown() {
 }
 </script>
 <template>
-    <Teleport to="#st-data" v-if="isSubToolbarShown()">
+    {{ subToolbarLoaded }}
+    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
         <QToolbar>
             <div class="row q-gutter-md">
                 <div>
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index c833d0cf9..26b8202a2 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -5,10 +5,17 @@ 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 { onMounted } from 'vue';
 
 const stateStore = useStateStore();
 const route = useRoute();
 const { t } = useI18n();
+
+onMounted(() => {
+    console.log('MOUNTED', stateStore.isSubToolbarShown());
+    stateStore.toggleSubToolbar();
+    console.log('MOUNTED', stateStore.isSubToolbarShown());
+});
 </script>
 <template>
     <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
diff --git a/src/stores/useStateStore.js b/src/stores/useStateStore.js
index 74b65e71f..328df9978 100644
--- a/src/stores/useStateStore.js
+++ b/src/stores/useStateStore.js
@@ -5,6 +5,7 @@ export const useStateStore = defineStore('stateStore', () => {
     const isMounted = ref(false);
     const leftDrawer = ref(false);
     const rightDrawer = ref(false);
+    const subToolbar = ref(false);
 
     function toggleLeftDrawer() {
         leftDrawer.value = !leftDrawer.value;
@@ -14,6 +15,10 @@ export const useStateStore = defineStore('stateStore', () => {
         rightDrawer.value = !rightDrawer.value;
     }
 
+    function toggleSubToolbar() {
+        subToolbar.value = !subToolbar.value;
+    }
+
     function setMounted() {
         isMounted.value = true;
     }
@@ -31,10 +36,7 @@ export const useStateStore = defineStore('stateStore', () => {
     }
 
     function isSubToolbarShown() {
-        return (
-            !!document.querySelector('#st-data') &&
-            !!document.querySelector('#st-actions')
-        );
+        return subToolbar.value;
     }
 
     return {
@@ -47,5 +49,6 @@ export const useStateStore = defineStore('stateStore', () => {
         isLeftDrawerShown,
         isRightDrawerShown,
         isSubToolbarShown,
+        toggleSubToolbar,
     };
 });

From 6b23c988b384bde3dba1f5090d541208270345fc Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 3 Jan 2024 11:06:03 +0100
Subject: [PATCH 045/105] refs #6618 component vnSubToolBar

---
 src/components/ui/vnSubToolBar.vue  | 32 +++++++++++++++++++++++++++++
 src/pages/Claim/Card/ClaimLines.vue | 22 ++++++++++++++++++--
 2 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 src/components/ui/vnSubToolBar.vue

diff --git a/src/components/ui/vnSubToolBar.vue b/src/components/ui/vnSubToolBar.vue
new file mode 100644
index 000000000..31c67cf63
--- /dev/null
+++ b/src/components/ui/vnSubToolBar.vue
@@ -0,0 +1,32 @@
+<script setup>
+import { onMounted, onUnmounted, ref } from 'vue';
+import { defineStore } from 'pinia';
+
+const useStateStore = defineStore('stateStore', () => {
+    const subToolbar = ref(false);
+
+    function toggleSubToolbar() {
+        subToolbar.value = !subToolbar.value;
+    }
+
+    return {
+        toggleSubToolbar,
+    };
+});
+
+onMounted(() => {
+    useStateStore();
+});
+
+onUnmounted(() => {
+    useStateStore();
+});
+</script>
+
+<template>
+    <QToolbar class="bg-vn-dark justify-end">
+        <div id="st-data"></div>
+        <QSpace />
+        <div id="st-actions"></div>
+    </QToolbar>
+</template>
diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index d1022b731..a47e18fdf 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -12,6 +12,7 @@ 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';
+import VnSubToolBar from 'src/components/ui/vnSubToolBar.vue';
 
 const quasar = useQuasar();
 const route = useRoute();
@@ -159,7 +160,24 @@ function isSubToolbarShown() {
 </script>
 <template>
     {{ subToolbarLoaded }}
-    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
+    <VnSubToolBar>
+        <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>
+    </VnSubToolBar>
+    <!-- <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
         <QToolbar>
             <div class="row q-gutter-md">
                 <div>
@@ -177,7 +195,7 @@ function isSubToolbarShown() {
                 </div>
             </div>
         </QToolbar>
-    </Teleport>
+    </Teleport> -->
 
     <FetchData
         :url="`Claims/${route.params.id}`"

From 3c98d099b3b31b52753966810bf4a09a76f7d8b4 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 3 Jan 2024 13:00:45 +0100
Subject: [PATCH 046/105] refs #6618 component Cards

---
 src/components/ui/VnSubToolBar.vue           | 21 ++++++++++++
 src/components/ui/vnSubToolBar.vue           | 32 ------------------
 src/pages/Claim/Card/ClaimCard.vue           | 20 ++---------
 src/pages/Claim/Card/ClaimLines.vue          | 35 +++++---------------
 src/pages/Customer/Card/CustomerCard.vue     |  6 ----
 src/pages/InvoiceOut/Card/InvoiceOutCard.vue |  8 ++---
 src/pages/Shelving/Card/ShelvingForm.vue     |  9 ++---
 7 files changed, 36 insertions(+), 95 deletions(-)
 create mode 100644 src/components/ui/VnSubToolBar.vue
 delete mode 100644 src/components/ui/vnSubToolBar.vue

diff --git a/src/components/ui/VnSubToolBar.vue b/src/components/ui/VnSubToolBar.vue
new file mode 100644
index 000000000..81a1820f1
--- /dev/null
+++ b/src/components/ui/VnSubToolBar.vue
@@ -0,0 +1,21 @@
+<script setup>
+import { onMounted, onUnmounted, ref } from 'vue';
+import { useStateStore } from 'stores/useStateStore';
+const stateStore = useStateStore();
+
+onMounted(() => {
+    stateStore.toggleSubToolbar();
+});
+
+onUnmounted(() => {
+    stateStore.toggleSubToolbar();
+});
+</script>
+
+<template>
+    <QToolbar class="bg-vn-dark justify-end">
+        <div id="st-data"></div>
+        <QSpace />
+        <div id="st-actions"></div>
+    </QToolbar>
+</template>
diff --git a/src/components/ui/vnSubToolBar.vue b/src/components/ui/vnSubToolBar.vue
deleted file mode 100644
index 31c67cf63..000000000
--- a/src/components/ui/vnSubToolBar.vue
+++ /dev/null
@@ -1,32 +0,0 @@
-<script setup>
-import { onMounted, onUnmounted, ref } from 'vue';
-import { defineStore } from 'pinia';
-
-const useStateStore = defineStore('stateStore', () => {
-    const subToolbar = ref(false);
-
-    function toggleSubToolbar() {
-        subToolbar.value = !subToolbar.value;
-    }
-
-    return {
-        toggleSubToolbar,
-    };
-});
-
-onMounted(() => {
-    useStateStore();
-});
-
-onUnmounted(() => {
-    useStateStore();
-});
-</script>
-
-<template>
-    <QToolbar class="bg-vn-dark justify-end">
-        <div id="st-data"></div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
-</template>
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index 41e4a46cb..2c0642509 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -7,8 +7,8 @@ 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';
 
-import { onMounted, onUnmounted } from 'vue';
 const stateStore = useStateStore();
 const { t } = useI18n();
 const route = useRoute();
@@ -22,18 +22,6 @@ const $props = defineProps({
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
-
-onMounted(() => {
-    console.log('MOUNTED', stateStore.isSubToolbarShown());
-    stateStore.toggleSubToolbar();
-    console.log('MOUNTED', stateStore.isSubToolbarShown());
-});
-
-onUnmounted(() => {
-    console.log('MOUNTED', stateStore.isSubToolbarShown());
-    stateStore.toggleSubToolbar();
-    console.log('MOUNTED', stateStore.isSubToolbarShown());
-});
 </script>
 <template>
     <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
@@ -53,11 +41,7 @@ onUnmounted(() => {
     </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/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index a47e18fdf..e7f67bcc2 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -12,14 +12,12 @@ 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';
-import VnSubToolBar from 'src/components/ui/vnSubToolBar.vue';
 
 const quasar = useQuasar();
 const route = useRoute();
 const { t } = useI18n();
 
 const stateStore = useStateStore();
-const subToolbarLoaded = computed(() => stateStore.isSubToolbarShown());
 const arrayData = useArrayData('ClaimLines');
 const store = arrayData.store;
 
@@ -48,14 +46,17 @@ async function onFetchClaim(data) {
 const amount = ref();
 const amountClaimed = ref();
 async function onFetch(rows) {
+    amount.value = 0;
+    amountClaimed.value = 0;
     if (!rows || !rows.length) return;
+
     amount.value = rows.reduce(
-        (acumulator, { sale }) => acumulator + sale.price * sale.quantity,
+        (accumulator, { sale }) => accumulator + sale.price * sale.quantity,
         0
     );
 
     amountClaimed.value = rows.reduce(
-        (acumulator, line) => acumulator + line.sale.price * line.quantity,
+        (accumulator, line) => accumulator + line.sale.price * line.quantity,
         0
     );
 }
@@ -154,30 +155,9 @@ function showImportDialog() {
         })
         .onOk(() => claimLinesForm.value.reload());
 }
-function isSubToolbarShown() {
-    return amount.value && amountClaimed;
-}
 </script>
 <template>
-    {{ subToolbarLoaded }}
-    <VnSubToolBar>
-        <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>
-    </VnSubToolBar>
-    <!-- <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
+    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
         <QToolbar>
             <div class="row q-gutter-md">
                 <div>
@@ -195,7 +175,7 @@ function isSubToolbarShown() {
                 </div>
             </div>
         </QToolbar>
-    </Teleport> -->
+    </Teleport>
 
     <FetchData
         :url="`Claims/${route.params.id}`"
@@ -212,6 +192,7 @@ function isSubToolbarShown() {
                 save-url="ClaimBeginnings/crud"
                 :filter="linesFilter"
                 @on-fetch="onFetch"
+                @save-changes="onFetch"
                 v-model:selected="selected"
                 :default-save="false"
                 :default-reset="false"
diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index 26b8202a2..ebe1235b2 100644
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@@ -10,12 +10,6 @@ import { onMounted } from 'vue';
 const stateStore = useStateStore();
 const route = useRoute();
 const { t } = useI18n();
-
-onMounted(() => {
-    console.log('MOUNTED', stateStore.isSubToolbarShown());
-    stateStore.toggleSubToolbar();
-    console.log('MOUNTED', stateStore.isSubToolbarShown());
-});
 </script>
 <template>
     <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
index d24eb3ef2..f5e8e86b8 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
@@ -4,6 +4,7 @@ import { useStateStore } from 'stores/useStateStore';
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import VnSubToolBar from 'src/components/ui/VnSubToolBar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -26,12 +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>
-            <div class="q-pa-md"><RouterView></RouterView></div>
+            <VnSubToolBar />
         </QPage>
     </QPageContainer>
 </template>
diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue
index e30ac1939..c5221aad0 100644
--- a/src/pages/Shelving/Card/ShelvingForm.vue
+++ b/src/pages/Shelving/Card/ShelvingForm.vue
@@ -5,6 +5,7 @@ import { useRoute } from 'vue-router';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
+import VnSubToolBar from 'src/components/ui/VnSubToolBar.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -15,7 +16,7 @@ const defaultInitialData = {
     priority: 0,
     code: null,
     isRecyclable: false,
-}
+};
 
 const parkingFilter = { fields: ['id', 'code'] };
 const parkingList = ref([]);
@@ -58,11 +59,7 @@ const shelvingFilter = {
 };
 </script>
 <template>
-    <QToolbar class="bg-vn-dark justify-end">
-        <div id="st-data"></div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
+    <VnSubToolBar />
     <FetchData
         url="Parkings"
         :filter="parkingFilter"

From 9a9bb2fa4483e738aeed906c8299aa7521c47c32 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 3 Jan 2024 13:24:49 +0100
Subject: [PATCH 047/105] refs #6618 invoiceOut fix

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

diff --git a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
index f5e8e86b8..e20b1345a 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
@@ -4,7 +4,6 @@ import { useStateStore } from 'stores/useStateStore';
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import VnSubToolBar from 'src/components/ui/VnSubToolBar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -28,6 +27,7 @@ const { t } = useI18n();
     <QPageContainer>
         <QPage>
             <VnSubToolBar />
+            <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
 </template>

From 9cd20439a678566b78a941f419422a9cd388cb35 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 3 Jan 2024 14:09:29 +0100
Subject: [PATCH 048/105] refs #6618 fix name

---
 src/components/ui/{VnSubToolBar.vue => VnSubToolbar.vue} | 0
 src/pages/Claim/Card/ClaimCard.vue                       | 4 ++--
 src/pages/InvoiceOut/Card/InvoiceOutCard.vue             | 3 ++-
 src/pages/Shelving/Card/ShelvingForm.vue                 | 4 ++--
 4 files changed, 6 insertions(+), 5 deletions(-)
 rename src/components/ui/{VnSubToolBar.vue => VnSubToolbar.vue} (100%)

diff --git a/src/components/ui/VnSubToolBar.vue b/src/components/ui/VnSubToolbar.vue
similarity index 100%
rename from src/components/ui/VnSubToolBar.vue
rename to src/components/ui/VnSubToolbar.vue
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index 2c0642509..b6c948c96 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -7,7 +7,7 @@ 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';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -41,7 +41,7 @@ const entityId = computed(() => {
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <VnSubToolBar />
+            <VnSubToolbar />
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
index e20b1345a..bfab4b9e1 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutCard.vue
@@ -4,6 +4,7 @@ import { useStateStore } from 'stores/useStateStore';
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -26,7 +27,7 @@ const { t } = useI18n();
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <VnSubToolBar />
+            <VnSubToolbar />
             <div class="q-pa-md"><RouterView></RouterView></div>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue
index c5221aad0..9740e3664 100644
--- a/src/pages/Shelving/Card/ShelvingForm.vue
+++ b/src/pages/Shelving/Card/ShelvingForm.vue
@@ -5,7 +5,7 @@ import { useRoute } from 'vue-router';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
-import VnSubToolBar from 'src/components/ui/VnSubToolBar.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -59,7 +59,7 @@ const shelvingFilter = {
 };
 </script>
 <template>
-    <VnSubToolBar />
+    <VnSubToolbar />
     <FetchData
         url="Parkings"
         :filter="parkingFilter"

From b62a317a6696643c93849593da98b75760a24a34 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 3 Jan 2024 14:17:09 +0100
Subject: [PATCH 049/105] refs #6595 fix: customerExtendedListFilter

---
 .../Customer/ExtendedList/CustomerExtendedListFilter.vue    | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
index a4d26a78a..f7e83a757 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
@@ -565,12 +565,6 @@ const shouldRenderColumn = (colName) => {
 </style>
 
 <i18n>
-<<<<<<< HEAD:src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
 es:
-    Identifier: Identificador
-=======
-
-es:
->>>>>>> dev:src/pages/Customer/CustomerExtendedListFilter.vue
     Social name: Razón social
 </i18n>

From a66b88ba8e8c27a7068916747215b5bef50bdb7f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 3 Jan 2024 10:59:11 -0300
Subject: [PATCH 050/105] add delete department popup translation

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

diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue
index 23faf770f..637b18256 100644
--- a/src/components/ui/VnTree.vue
+++ b/src/components/ui/VnTree.vue
@@ -55,8 +55,8 @@ const fetchNodeLeaves = async (nodeKey) => {
 const removeNode = (node) => {
     quasar
         .dialog({
-            title: 'Are you sure you want to delete it?',
-            message: 'Delete department',
+            title: t('Are you sure you want to delete it?'),
+            message: t('Delete department'),
             ok: {
                 push: true,
                 color: 'primary',

From 2af176a502bff57c95f8e0ef2e0eed37c1458f69 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 3 Jan 2024 10:50:26 -0400
Subject: [PATCH 051/105] Fix catalog filter

---
 src/components/ui/VnFilterPanel.vue         |  3 +-
 src/pages/Order/Card/OrderCatalogFilter.vue | 32 ++++++++++++++++-----
 src/pages/Order/OrderCatalog.vue            |  8 +-----
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 6f6183224..a138e0b64 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -41,7 +41,7 @@ const props = defineProps({
     },
 });
 
-const emit = defineEmits(['refresh', 'clear', 'search', 'init']);
+const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
 
 const arrayData = useArrayData(props.dataKey, {
     exprBuilder: props.exprBuilder,
@@ -116,6 +116,7 @@ const tags = computed(() => {
 async function remove(key) {
     userParams.value[key] = null;
     await search();
+    emit('remove', key)
 }
 
 function formatValue(value) {
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 23accb680..0859e14a6 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -21,16 +21,27 @@ const selectedCategoryFk = ref(null);
 const typeList = ref(null);
 const selectedTypeFk = ref(null);
 
-const selectCategory = (params, category) => {
+const resetCategory = () => {
+    selectedCategoryFk.value = null;
+    typeList.value = null;
+};
+
+const clearFilter = (key) => {
+    if (key === 'categoryFk') {
+        resetCategory();
+    }
+};
+
+const selectCategory = (params, category, search) => {
     if (params.categoryFk === category?.id) {
-        selectedCategoryFk.value = null;
+        resetCategory();
         params.categoryFk = null;
-        typeList.value = null;
     } else {
         selectedCategoryFk.value = category?.id;
         params.categoryFk = category?.id;
         loadTypes(category?.id);
     }
+    search();
 };
 
 const loadTypes = async (categoryFk) => {
@@ -65,6 +76,8 @@ function exprBuilder(param, value) {
         case 'categoryFk':
         case 'typeFk':
             return { [param]: value };
+        case 'search':
+            return { 'i.name': { like: `%${value}%` } };
     }
 }
 
@@ -88,10 +101,10 @@ const getCategoryClass = (category, params) => {
     <FetchData url="ItemCategories" limit="30" auto-load @on-fetch="setCategoryList" />
     <VnFilterPanel
         :data-key="props.dataKey"
-        :search-button="true"
         :hidden-tags="['orderFk', 'orderBy']"
         :expr-builder="exprBuilder"
         @init="onFilterInit"
+        @remove="clearFilter"
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'categoryFk'">
@@ -105,7 +118,7 @@ const getCategoryClass = (category, params) => {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params }">
+        <template #body="{ params, searchFn }">
             <QList dense>
                 <QItem class="category-filter q-mt-md">
                     <div
@@ -116,7 +129,7 @@ const getCategoryClass = (category, params) => {
                         <QIcon
                             :name="category.icon"
                             class="category-icon"
-                            @click="selectCategory(params, category)"
+                            @click="selectCategory(params, category, searchFn)"
                         >
                             <QTooltip>
                                 {{ t(category.name) }}
@@ -138,7 +151,12 @@ const getCategoryClass = (category, params) => {
                             emit-value
                             use-input
                             :disable="!selectedCategoryFk"
-                            @update:model-value="(value) => (selectedTypeFk = value)"
+                            @update:model-value="
+                                (value) => {
+                                    selectedTypeFk = value;
+                                    searchFn();
+                                }
+                            "
                         >
                             <template #option="{ itemProps, opt }">
                                 <QItem v-bind="itemProps">
diff --git a/src/pages/Order/OrderCatalog.vue b/src/pages/Order/OrderCatalog.vue
index ec81c50f1..a257f7627 100644
--- a/src/pages/Order/OrderCatalog.vue
+++ b/src/pages/Order/OrderCatalog.vue
@@ -20,12 +20,6 @@ const catalogParams = {
     orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
 };
 
-function exprBuilder(param, value) {
-    switch (param) {
-        case 'search':
-            return { 'i.name': { like: `%${value}%` } };
-    }
-}
 </script>
 
 <template>
@@ -35,8 +29,8 @@ function exprBuilder(param, value) {
             url="Orders/CatalogFilter"
             :limit="50"
             :user-params="catalogParams"
-            :expr-builder="exprBuilder"
             :static-params="['orderFk', 'orderBy']"
+            :redirect="false"
         />
     </Teleport>
     <Teleport v-if="stateStore.isHeaderMounted()" to="#actions-append">

From 8fc7a5ea12ae38da6fb1b0d973dbfad03b80f7f7 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 3 Jan 2024 16:55:48 -0300
Subject: [PATCH 052/105] Aplicar clases a close-icon en el css

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

diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index 9021adc46..c314f6897 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -62,12 +62,7 @@ const closeForm = () => {
         @on-data-saved="onDataSaved()"
     >
         <template #form="{ data, validate }">
-            <span
-                ref="closeButton"
-                class="absolute cursor-pointer"
-                style="top: 20px; right: 20px"
-                v-close-popup
-            >
+            <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ title }}</h1>
@@ -102,4 +97,11 @@ const closeForm = () => {
     font-weight: bold;
     line-height: 20px;
 }
+
+.close-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    cursor: pointer;
+}
 </style>

From b622f9cca7dfc9bf7b4bb0b2948e4a7f9ca0156a Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 4 Jan 2024 02:27:43 -0400
Subject: [PATCH 053/105] Add order orderBy filter

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 50 +++++++++++++++++++--
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 00606d57c..09e243959 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -31,6 +31,12 @@ const resetCategory = () => {
     typeList.value = null;
 };
 
+const selectedOrder = ref(null);
+const orderList = [
+    { way: 'ASC', name: 'Ascendant' },
+    { way: 'DESC', name: 'Descendant' },
+];
+
 const clearFilter = (key) => {
     if (key === 'categoryFk') {
         resetCategory();
@@ -64,6 +70,10 @@ const onFilterInit = async ({ params }) => {
         await loadTypes(params.categoryFk);
         selectedCategoryFk.value = params.categoryFk;
     }
+    if (params.orderBy) {
+        selectedOrder.value = JSON.parse(params.orderBy).way;
+        orderByParam.value = JSON.parse(params.orderBy);
+    }
 };
 
 const selectedCategory = computed(() =>
@@ -104,6 +114,14 @@ const applyTagFilter = (params, search) => {
     });
     search();
 };
+
+const orderByParam = ref(null);
+
+const onOrderChange = (value, params, search) => {
+    const orderBy = Object.assign({}, orderByParam.value, { way: value.way });
+    params.orderBy = JSON.stringify(orderBy);
+    search();
+};
 </script>
 
 <template>
@@ -131,10 +149,12 @@ const applyTagFilter = (params, search) => {
     >
         <template #tags="{ tag, formatFn }">
             <div v-if="tag.label === 'tagGroups'">
-                <strong>
-                    {{ JSON.parse(tag?.value).tagSelection?.name  }}:
-                </strong>
-                <span>{{ (JSON.parse(tag?.value).values || []).map(item => item.value).join(' | ') }}</span>
+                <strong> {{ JSON.parse(tag?.value).tagSelection?.name }}: </strong>
+                <span>{{
+                    (JSON.parse(tag?.value).values || [])
+                        .map((item) => item.value)
+                        .join(' | ')
+                }}</span>
             </div>
             <strong v-else-if="tag.label === 'categoryFk'">
                 {{ t(selectedCategory?.name || '') }}
@@ -204,6 +224,26 @@ const applyTagFilter = (params, search) => {
                     </QItemSection>
                 </QItem>
                 <QSeparator />
+                <QItem class="q-my-md">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="t('params.order')"
+                            v-model="selectedOrder"
+                            :options="orderList || []"
+                            option-value="way"
+                            option-label="name"
+                            dense
+                            outlined
+                            rounded
+                            :emit-value="false"
+                            use-input
+                            @update:model-value="
+                                (value) => onOrderChange(value, params, searchFn)
+                            "
+                        />
+                    </QItemSection>
+                </QItem>
+                <QSeparator />
                 <QItem class="q-mt-md">
                     <QItemSection>
                         <VnSelectFilter
@@ -344,12 +384,14 @@ en:
         orderBy: Order By
         tag: Tag
         value: Value
+        order: Order
 es:
     params:
         type: Tipo
         orderBy: Ordenar por
         tag: Etiqueta
         value: Valor
+        order: Orden
     Plant: Planta
     Flower: Flor
     Handmade: Confección

From 4306226e5c9fb4cc758fa07c8b5295bfdf389bf6 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 4 Jan 2024 08:08:28 +0100
Subject: [PATCH 054/105] refs #6635 feat: correct version

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9db93eff3..6a60c95c6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "salix-front",
-    "version": "23.52.01",
+    "version": "24.02.01",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "salix-front",
-            "version": "23.52.01",
+            "version": "24.02.01",
             "dependencies": {
                 "@quasar/cli": "^2.3.0",
                 "@quasar/extras": "^1.16.4",
diff --git a/package.json b/package.json
index 7c966dbb1..c4f5b828a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.00.01",
+    "version": "24.02.01",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

From 96acd00469cd62864cc91148d21869beb9076d69 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 4 Jan 2024 10:33:11 +0100
Subject: [PATCH 055/105] refs #6618 remove import

---
 src/pages/Customer/Card/CustomerCard.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerCard.vue b/src/pages/Customer/Card/CustomerCard.vue
index ebe1235b2..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 { onMounted } from 'vue';
 
 const stateStore = useStateStore();
 const route = useRoute();

From de8996d5960d4aaa6a67797098e26b5e7b04c995 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 4 Jan 2024 09:34:24 -0300
Subject: [PATCH 056/105] Fixes PR

---
 src/components/common/TableVisibleColumns.vue | 123 +++++++++++++-----
 src/components/common/VnInput.vue             |   9 ++
 src/components/common/VnSelectCreate.vue      |  16 ++-
 src/components/common/VnSelectFilter.vue      |   9 ++
 src/components/ui/VnTree.vue                  |   9 +-
 src/filters/dateRange.js                      |   8 ++
 src/filters/index.js                          |   2 +
 .../CustomerExtendedListFilter.vue            |  55 +++++++-
 src/pages/Entry/EntryCreate.vue               |  14 +-
 9 files changed, 191 insertions(+), 54 deletions(-)
 create mode 100644 src/filters/dateRange.js

diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index 94e3bfbc7..e0b8ad86f 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -1,11 +1,10 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { ref, computed } from 'vue';
-
-import FetchData from 'components/FetchData.vue';
+import { ref, computed, onMounted } from 'vue';
 
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
 
 const $props = defineProps({
     allColumns: {
@@ -24,17 +23,12 @@ const $props = defineProps({
 
 const emit = defineEmits(['onConfigSaved']);
 
+const { notify } = useNotify();
 const state = useState();
 const { t } = useI18n();
 const popupProxyRef = ref(null);
 const user = state.getUser();
 const initialUserConfigViewData = ref(null);
-const userConfigFilter = {
-    where: {
-        tableCode: $props.tableCode,
-        userFk: user.id,
-    },
-};
 
 const formattedCols = ref([]);
 
@@ -43,16 +37,12 @@ const areAllChecksMarked = computed(() => {
 });
 
 const setUserConfigViewData = (data) => {
-    initialUserConfigViewData.value = data;
-    if (data.length === 0) return;
-    formattedCols.value = $props.allColumns.map((col) => {
-        // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
-        const obj = {
-            name: col,
-            active: data[0].configuration[col],
-        };
-        return obj;
-    });
+    if (!data) return;
+    // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
+    formattedCols.value = $props.allColumns.map((col) => ({
+        name: col,
+        active: data[col],
+    }));
     emitSavedConfig();
 };
 
@@ -60,40 +50,101 @@ const toggleMarkAll = (val) => {
     formattedCols.value.forEach((col) => (col.active = val));
 };
 
-const saveConfig = async () => {
+const fetchViewConfigData = async () => {
     try {
-        const data = {
-            id: initialUserConfigViewData.value[0].id,
-            userFk: 9,
-            tableCode: $props.tableCode,
-            configuration: {},
+        const userConfigFilter = {
+            where: {
+                tableCode: $props.tableCode,
+                userFk: user.id,
+            },
         };
 
-        formattedCols.value.forEach((col) => {
-            data.configuration[col.name] = col.active;
+        const userViewConfigResponse = await axios.get('UserConfigViews', {
+            params: { filter: userConfigFilter },
         });
 
-        await axios.patch('UserConfigViews', data);
+        if (userViewConfigResponse.data && userViewConfigResponse.data.length > 0) {
+            initialUserConfigViewData.value = userViewConfigResponse.data[0];
+            setUserConfigViewData(userViewConfigResponse.data[0].configuration);
+            return;
+        }
+
+        const defaultConfigFilter = {
+            where: {
+                tableCode: $props.tableCode,
+            },
+        };
+
+        const defaultViewConfigResponse = await axios.get('DefaultViewConfigs', {
+            params: { filter: defaultConfigFilter },
+        });
+
+        if (defaultViewConfigResponse.data && defaultViewConfigResponse.data.length > 0) {
+            setUserConfigViewData(defaultViewConfigResponse.data[0].columns);
+            return;
+        }
+    } catch (err) {
+        console.err('Error fetching config view data');
+    }
+};
+
+const saveConfig = async () => {
+    try {
+        const params = {};
+        const configuration = {};
+
+        formattedCols.value.forEach((col) => {
+            const { name, active } = col;
+            configuration[name] = active;
+        });
+
+        // Si existe una view config del usuario hacemos un update si no la creamos
+        if (initialUserConfigViewData.value) {
+            params.updates = [
+                {
+                    data: {
+                        configuration: configuration,
+                    },
+                    where: {
+                        id: initialUserConfigViewData.value.id,
+                    },
+                },
+            ];
+        } else {
+            params.creates = [
+                {
+                    userFk: user.value.id,
+                    tableCode: $props.tableCode,
+                    tableConfig: $props.tableCode,
+                    configuration: configuration,
+                },
+            ];
+        }
+
+        const response = await axios.post('UserConfigViews/crud', params);
+        if (response.data && response.data[0]) {
+            initialUserConfigViewData.value = response.data[0];
+        }
         emitSavedConfig();
+        notify('globals.dataSaved', 'positive');
+
         popupProxyRef.value.hide();
     } catch (err) {
         console.error('Error saving user view config');
     }
 };
+
 const emitSavedConfig = () => {
     const filteredCols = formattedCols.value.filter((col) => col.active);
     const mappedCols = filteredCols.map((col) => col.name);
     emit('onConfigSaved', mappedCols);
 };
+
+onMounted(async () => {
+    await fetchViewConfigData();
+});
 </script>
 <template>
-    <fetch-data
-        v-if="user"
-        url="UserConfigViews"
-        :filter="userConfigFilter"
-        @on-fetch="(data) => setUserConfigViewData(data)"
-        auto-load
-    />
     <QBtn color="primary" icon="view_column">
         <QPopupProxy ref="popupProxyRef">
             <QCard class="column q-pa-md">
@@ -108,7 +159,7 @@ const emitSavedConfig = () => {
                     class="q-mb-sm"
                 />
                 <div
-                    v-if="allColumns.length !== 0 && formattedCols.length !== 0"
+                    v-if="allColumns.length > 0 && formattedCols.length > 0"
                     class="checks-layout"
                 >
                     <QCheckbox
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index e3040a698..bfd0dea40 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -12,6 +12,14 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    label: {
+        type: String,
+        default: '',
+    },
+    required: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const value = computed({
@@ -39,6 +47,7 @@ const styleAttrs = computed(() => {
         ref="vnInputRef"
         v-model="value"
         v-bind="{ ...$attrs, ...styleAttrs }"
+        :label="required ? label + ' *' : label"
         type="text"
     >
         <template v-if="$slots.prepend" #prepend>
diff --git a/src/components/common/VnSelectCreate.vue b/src/components/common/VnSelectCreate.vue
index 0b5694ec5..54d36ceaa 100644
--- a/src/components/common/VnSelectCreate.vue
+++ b/src/components/common/VnSelectCreate.vue
@@ -20,6 +20,14 @@ const $props = defineProps({
         type: Array,
         default: () => ['developer'],
     },
+    label: {
+        type: String,
+        default: '',
+    },
+    required: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const role = useRole();
@@ -44,7 +52,13 @@ const toggleForm = () => {
 </script>
 
 <template>
-    <VnSelectFilter v-model="value" :options="options" v-bind="$attrs">
+    <VnSelectFilter
+        v-model="value"
+        :options="options"
+        :label="label"
+        :required="required"
+        v-bind="$attrs"
+    >
         <template v-if="isAllowedToCreate" #append>
             <QIcon
                 @click.stop.prevent="toggleForm()"
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index a0605bbae..759706d11 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -23,6 +23,14 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    label: {
+        type: String,
+        default: '',
+    },
+    required: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const { optionLabel } = toRefs($props);
@@ -87,6 +95,7 @@ const value = computed({
         hide-selected
         fill-input
         ref="vnSelectRef"
+        :label="required ? label + ' *' : label"
     >
         <template v-if="isClearable" #append>
             <QIcon
diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue
index 637b18256..948a0a8e2 100644
--- a/src/components/ui/VnTree.vue
+++ b/src/components/ui/VnTree.vue
@@ -53,6 +53,7 @@ const fetchNodeLeaves = async (nodeKey) => {
 };
 
 const removeNode = (node) => {
+    const { id, parentFk } = node;
     quasar
         .dialog({
             title: t('Are you sure you want to delete it?'),
@@ -65,9 +66,9 @@ const removeNode = (node) => {
         })
         .onOk(async () => {
             try {
-                await axios.post(`/Departments/${node.id}/removeChild`, node.id);
-                notify('department.departmentRemoved', 'positive');
-                await fetchNodeLeaves(node.parentFk);
+                await axios.post(`/Departments/${id}/removeChild`, id);
+                notify(t('department.departmentRemoved'), 'positive');
+                await fetchNodeLeaves(parentFk);
             } catch (err) {
                 console.log('Error removing department');
             }
@@ -85,7 +86,7 @@ const onNodeCreated = async () => {
 
 const redirectToDepartmentSummary = (id) => {
     if (!id) return;
-    router.push({ name: 'DepartmentSummary', params: { id: id } });
+    router.push({ name: 'DepartmentSummary', params: { id } });
 };
 </script>
 
diff --git a/src/filters/dateRange.js b/src/filters/dateRange.js
new file mode 100644
index 000000000..4c0cfe654
--- /dev/null
+++ b/src/filters/dateRange.js
@@ -0,0 +1,8 @@
+export default function dateRange(value) {
+    const minHour = new Date(value);
+    minHour.setHours(0, 0, 0, 0);
+    const maxHour = new Date(value);
+    maxHour.setHours(23, 59, 59, 59);
+
+    return [minHour, maxHour];
+}
diff --git a/src/filters/index.js b/src/filters/index.js
index b0c441641..f0120e663 100644
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -7,6 +7,7 @@ import toCurrency from './toCurrency';
 import toPercentage from './toPercentage';
 import toLowerCamel from './toLowerCamel';
 import dashIfEmpty from './dashIfEmpty';
+import dateRange from './dateRange';
 
 export {
     toLowerCase,
@@ -18,4 +19,5 @@ export {
     toCurrency,
     toPercentage,
     dashIfEmpty,
+    dateRange,
 };
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
index a4d26a78a..46b4e1e7b 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
@@ -7,6 +7,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import { dateRange } from 'src/filters';
 
 const props = defineProps({
     dataKey: {
@@ -32,6 +33,48 @@ const sageTransactionTypesOptions = ref([]);
 
 const visibleColumnsSet = computed(() => new Set(props.visibleColumns));
 
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'created':
+            return {
+                'c.created': {
+                    between: dateRange(value),
+                },
+            };
+        case 'id':
+        case 'name':
+        case 'socialName':
+        case 'fi':
+        case 'credit':
+        case 'creditInsurance':
+        case 'phone':
+        case 'mobile':
+        case 'street':
+        case 'city':
+        case 'postcode':
+        case 'email':
+        case 'isActive':
+        case 'isVies':
+        case 'isTaxDataChecked':
+        case 'isEqualizated':
+        case 'isFreezed':
+        case 'hasToInvoice':
+        case 'hasToInvoiceByAddress':
+        case 'isToBeMailed':
+        case 'hasSepaVnl':
+        case 'hasLcr':
+        case 'hasCoreVnl':
+        case 'countryFk':
+        case 'provinceFk':
+        case 'salesPersonFk':
+        case 'businessTypeFk':
+        case 'payMethodFk':
+        case 'sageTaxTypeFk':
+        case 'sageTransactionTypeFk':
+            return { [`c.${param}`]: value };
+    }
+};
+
 const shouldRenderColumn = (colName) => {
     return visibleColumnsSet.value.has(colName);
 };
@@ -88,7 +131,11 @@ const shouldRenderColumn = (colName) => {
         auto-load
         @on-fetch="(data) => (sageTransactionTypesOptions = data)"
     />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :expr-builder="exprBuilder"
+    >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong
@@ -565,12 +612,6 @@ const shouldRenderColumn = (colName) => {
 </style>
 
 <i18n>
-<<<<<<< HEAD:src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
 es:
-    Identifier: Identificador
-=======
-
-es:
->>>>>>> dev:src/pages/Customer/CustomerExtendedListFilter.vue
     Social name: Razón social
 </i18n>
diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
index 30b54cb38..fc725447c 100644
--- a/src/pages/Entry/EntryCreate.vue
+++ b/src/pages/Entry/EntryCreate.vue
@@ -60,13 +60,14 @@ const companiesOptions = ref([]);
             <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnSelectFilter
-                        :label="t('Supplier *')"
+                        :label="t('Supplier')"
                         class="full-width"
                         v-model="data.supplierFk"
                         :options="suppliersOptions"
                         option-value="id"
                         option-label="nickname"
                         hide-selected
+                        required
                         :rules="validate('entry.supplierFk')"
                     >
                         <template #option="scope">
@@ -83,7 +84,7 @@ const companiesOptions = ref([]);
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnSelectFilter
-                        :label="t('Travel *')"
+                        :label="t('Travel')"
                         class="full-width"
                         v-model="data.travelFk"
                         :options="travelsOptionsOptions"
@@ -91,6 +92,7 @@ const companiesOptions = ref([]);
                         option-label="warehouseInName"
                         map-options
                         hide-selected
+                        required
                         :rules="validate('entry.travelFk')"
                     >
                         <template #option="scope">
@@ -111,7 +113,7 @@ const companiesOptions = ref([]);
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnSelectFilter
-                        :label="t('Company *')"
+                        :label="t('Company')"
                         class="full-width"
                         v-model="data.companyFk"
                         :options="companiesOptions"
@@ -129,7 +131,7 @@ const companiesOptions = ref([]);
 
 <i18n>
     es:
-        Supplier *: Proveedor *
-        Travel *: Envío *
-        Company *: Empresa *
+        Supplier: Proveedor
+        Travel: Envío
+        Company: Empresa
     </i18n>

From cfac9acbe8bef3edfbeb06570423c57ee2b1082e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 4 Jan 2024 09:58:37 -0300
Subject: [PATCH 057/105] Small corrections

---
 src/components/common/TableVisibleColumns.vue |  7 +++++++
 src/components/ui/VnTree.vue                  | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index e0b8ad86f..7defdb0de 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -174,6 +174,7 @@ onMounted(async () => {
                 }}</QBtn>
             </QCard>
         </QPopupProxy>
+        <QTooltip>{{ t('Visible columns') }}</QTooltip>
     </QBtn>
 </template>
 
@@ -189,3 +190,9 @@ onMounted(async () => {
     grid-template-columns: repeat(3, 200px);
 }
 </style>
+
+<i18n>
+    es:
+        Check the columns you want to see: Marca las columnas que quieres ver
+        Visible columns: Columnas visibles
+</i18n>
diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue
index 948a0a8e2..c382ef9f2 100644
--- a/src/components/ui/VnTree.vue
+++ b/src/components/ui/VnTree.vue
@@ -100,22 +100,22 @@ const redirectToDepartmentSummary = (id) => {
             v-model:expanded="expanded"
             @update:expanded="onNodeExpanded($event)"
         >
-            <template #default-header="prop">
+            <template #default-header="{ node }">
                 <div
                     class="row justify-between full-width q-pr-md cursor-pointer"
-                    @click.stop="redirectToDepartmentSummary(prop.node.id)"
+                    @click.stop="redirectToDepartmentSummary(node.id)"
                 >
                     <span class="text-uppercase">
-                        {{ prop.node.name }}
+                        {{ node.name }}
                     </span>
                     <div class="row justify-between" style="max-width: max-content">
                         <QIcon
-                            v-if="prop.node.id"
+                            v-if="node.id"
                             name="delete"
                             color="primary"
                             size="sm"
                             class="q-pr-xs cursor-pointer"
-                            @click.stop="removeNode(prop.node)"
+                            @click.stop="removeNode(node)"
                         >
                             <QTooltip>
                                 {{ t('Remove') }}
@@ -126,7 +126,7 @@ const redirectToDepartmentSummary = (id) => {
                             color="primary"
                             size="sm"
                             class="cursor-pointer"
-                            @click.stop="showCreateNodeForm(prop.node.id)"
+                            @click.stop="showCreateNodeForm(node.id)"
                         >
                             <QTooltip>
                                 {{ t('Create') }}

From 7ae05f23fccee0345990f0a7554a78a60cb128a7 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 4 Jan 2024 14:38:33 +0100
Subject: [PATCH 058/105] refs #6420 notes

---
 src/components/ui/VnNotes.vue         | 2 +-
 src/components/ui/VnPaginate.vue      | 8 +++++++-
 src/pages/Claim/Card/ClaimNotes.vue   | 6 +++++-
 src/pages/Claim/Card/ClaimSummary.vue | 8 +++++---
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index f02551575..b9a009a32 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -28,7 +28,7 @@ async function insert() {
 }
 </script>
 <template>
-    <div class="column items-center">
+    <div class="column items-center full-height">
         <VnPaginate
             :data-key="$props.url"
             :url="$props.url"
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index c75761462..7470a4d74 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -168,7 +168,13 @@ async function onLoad(...params) {
             </QCard>
         </div>
     </div>
-    <QInfiniteScroll v-if="store.data" @load="onLoad" :offset="offset" class="full-width">
+    <QInfiniteScroll
+        v-if="store.data"
+        @load="onLoad"
+        :offset="offset"
+        class="full-width full-height"
+        style="overflow: auto"
+    >
         <slot name="body" :rows="store.data"></slot>
         <div v-if="isLoading" class="info-row q-pa-md text-center">
             <QSpinner color="orange" size="md" />
diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index 84d350e38..35ecb0451 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -8,6 +8,10 @@ const state = useState();
 const user = state.getUser();
 const id = route.params.id;
 
+const $props = defineProps({
+    addNote: { type: Boolean, default: true },
+});
+
 const claimFilter = {
     where: { claimFk: id },
     fields: ['created', 'workerFk', 'text'],
@@ -27,7 +31,7 @@ const body = {
 <template>
     <div class="column items-center">
         <VnNotes
-            :add-note="true"
+            :add-note="$props.addNote"
             :id="id"
             url="claimObservations"
             :filter="claimFilter"
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 6bc0a8b66..9f2fa20d6 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -225,13 +225,15 @@ function openDialog(dmsId) {
                     </template>
                 </VnLv>
             </QCard>
-            <QCard class="vn-one">
+            <QCard class="vn-max">
                 <a class="header" :href="`#/claim/${entityId}/notes`">
                     {{ t('claim.summary.notes') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
-                <ClaimNotes />
-                <QVirtualScroll :items="observations" separator> </QVirtualScroll>
+                <ClaimNotes :add-note="false" style="height: 600px" />
+                <!-- <QVirtualScroll :items="observations" separator
+                    >
+                </QVirtualScroll> -->
             </QCard>
             <QCard class="vn-max" v-if="salesClaimed.length > 0">
                 <a class="header" :href="`#/claim/${entityId}/notes`">

From 64777bb80467fcf7f117f6b718a4ca2153e6d1c7 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 4 Jan 2024 10:23:55 -0500
Subject: [PATCH 059/105] Se hacen correcciones en base a comentarios en el PR

---
 .../Customer/Defaulter/CustomerDefaulter.vue  | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 0331acfc0..b9c863e56 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -38,14 +38,14 @@ onBeforeMount(async () => {
 const rows = computed(() => arrayData.value.store.data);
 
 const selected = ref([]);
-const worderId = ref(0);
+const workerId = ref(0);
 const customerId = ref(0);
 
 const tableColumnComponents = {
     client: {
         component: QBtn,
         props: () => ({ flat: true, color: 'blue' }),
-        event: (prop) => selectClientId(prop.row.clientFk),
+        event: ({ row }) => selectCustomerId(row.clientFk),
     },
     isWorker: {
         component: QCheckbox,
@@ -58,7 +58,7 @@ const tableColumnComponents = {
     salesperson: {
         component: QBtn,
         props: () => ({ flat: true, color: 'blue' }),
-        event: (prop) => selectSalespersonId(prop.row.salesPersonFk),
+        event: ({ row }) => selectWorkerId(row.salesPersonFk),
     },
     country: {
         component: 'span',
@@ -78,7 +78,7 @@ const tableColumnComponents = {
     author: {
         component: QBtn,
         props: () => ({ flat: true, color: 'blue' }),
-        event: (prop) => selectAuthorId(prop.row.workerFk),
+        event: ({ row }) => selectWorkerId(row.workerFk),
     },
     lastObservation: {
         component: 'span',
@@ -173,19 +173,14 @@ const columns = computed(() => {
     ];
 });
 
-const selectClientId = (id) => {
-    worderId.value = 0;
+const selectCustomerId = (id) => {
+    workerId.value = 0;
     customerId.value = id;
 };
 
-const selectSalespersonId = (id) => {
+const selectWorkerId = (id) => {
     customerId.value = 0;
-    worderId.value = id;
-};
-
-const selectAuthorId = (id) => {
-    customerId.value = 0;
-    worderId.value = id;
+    workerId.value = id;
 };
 </script>
 
@@ -226,7 +221,7 @@ const selectAuthorId = (id) => {
                         >
                             {{ props.value }}
 
-                            <WorkerDescriptorProxy v-if="worderId" :id="worderId" />
+                            <WorkerDescriptorProxy v-if="workerId" :id="workerId" />
                             <CustomerDescriptorProxy v-else :id="customerId" />
                         </component>
                     </QTr>

From 6b3bed008537ac531f6fe3fb267f2c8f3c4b8d47 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 4 Jan 2024 11:37:46 -0500
Subject: [PATCH 060/105] Mejoras en las correcciones de codigo

---
 .../Customer/Defaulter/CustomerBalanceDueTotal.vue  | 13 +++++--------
 src/pages/Customer/Defaulter/CustomerDefaulter.vue  | 12 ++++++------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue b/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue
index c2bfbc2f5..c4a50a10f 100644
--- a/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue
+++ b/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue
@@ -14,8 +14,8 @@ const { t } = useI18n();
 </script>
 
 <template>
-    <div class="card_balance">
-        <h6 class="title_balance">{{ t('Total') }}</h6>
+    <div class="card_balance q-px-md q-py-sm q-my-sm">
+        <h6 class="title_balance text-center">{{ t('Total') }}</h6>
         <div class="row">
             <p class="key_balance">{{ t('Balance due') }}:&ensp;</p>
             <b class="value_balance">
@@ -28,21 +28,18 @@ const { t } = useI18n();
 <style lang="scss">
 .card_balance {
     border: 1px solid black;
-    margin: 7px;
-    padding: 5px 7px;
 }
 .title_balance {
-    color: white;
+    color: var(--vn-text);
     margin-top: 0;
     margin-bottom: 0;
-    text-align: center;
 }
 .key_balance {
-    color: grey;
+    color: var(--vn-label);
     margin-bottom: 0;
 }
 .value_balance {
-    color: white;
+    color: var(--vn-text);
     margin-bottom: 0;
 }
 </style>
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index b9c863e56..e2e14427e 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -49,9 +49,9 @@ const tableColumnComponents = {
     },
     isWorker: {
         component: QCheckbox,
-        props: (prop) => ({
+        props: ({ value }) => ({
             disable: true,
-            'model-value': Boolean(prop.value),
+            'model-value': Boolean(value),
         }),
         event: () => {},
     },
@@ -136,7 +136,7 @@ const columns = computed(() => {
         },
         {
             align: 'left',
-            field: (row) => toCurrency(row.amount),
+            field: ({ amount }) => toCurrency(amount),
             label: t('Balance D.'),
             name: 'balance',
         },
@@ -154,19 +154,19 @@ const columns = computed(() => {
         },
         {
             align: 'left',
-            field: (row) => toDate(row.created),
+            field: ({ created }) => toDate(created),
             label: t('L. O. Date'),
             name: 'date',
         },
         {
             align: 'left',
-            field: (row) => toCurrency(row.creditInsurance),
+            field: ({ creditInsurance }) => toCurrency(creditInsurance),
             label: t('Credit I.'),
             name: 'credit',
         },
         {
             align: 'left',
-            field: (row) => toDate(row.defaulterSinced),
+            field: ({ defaulterSinced }) => toDate(defaulterSinced),
             label: t('From'),
             name: 'from',
         },

From bd8acbe0842df7a478a28d267663c18d36b598ae Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 4 Jan 2024 13:12:58 -0500
Subject: [PATCH 061/105] Correcciones solicitadas

---
 .../Customer/Defaulter/CustomerDefaulter.vue  | 138 +++---
 .../ExtendedList/CustomerExtendedList.vue     | 416 +++++++++---------
 .../Notifications/CustomerNotifications.vue   |  66 ++-
 src/pages/InvoiceOut/InvoiceOutGlobal.vue     |  46 +-
 src/pages/Travel/ExtraCommunity.vue           | 208 +++++----
 5 files changed, 432 insertions(+), 442 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index e2e14427e..d54d5df35 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -102,76 +102,74 @@ const tableColumnComponents = {
     },
 };
 
-const columns = computed(() => {
-    return [
-        {
-            align: 'left',
-            field: 'clientName',
-            label: t('Client'),
-            name: 'client',
-        },
-        {
-            align: 'left',
-            field: 'isWorker',
-            label: t('Is worker'),
-            name: 'isWorker',
-        },
-        {
-            align: 'left',
-            field: 'salesPersonName',
-            label: t('Salesperson'),
-            name: 'salesperson',
-        },
-        {
-            align: 'left',
-            field: 'country',
-            label: t('Country'),
-            name: 'country',
-        },
-        {
-            align: 'left',
-            field: 'payMethod',
-            label: t('P. Method'),
-            name: 'paymentMethod',
-        },
-        {
-            align: 'left',
-            field: ({ amount }) => toCurrency(amount),
-            label: t('Balance D.'),
-            name: 'balance',
-        },
-        {
-            align: 'left',
-            field: 'workerName',
-            label: t('Author'),
-            name: 'author',
-        },
-        {
-            align: 'left',
-            field: 'observation',
-            label: t('Last observation'),
-            name: 'lastObservation',
-        },
-        {
-            align: 'left',
-            field: ({ created }) => toDate(created),
-            label: t('L. O. Date'),
-            name: 'date',
-        },
-        {
-            align: 'left',
-            field: ({ creditInsurance }) => toCurrency(creditInsurance),
-            label: t('Credit I.'),
-            name: 'credit',
-        },
-        {
-            align: 'left',
-            field: ({ defaulterSinced }) => toDate(defaulterSinced),
-            label: t('From'),
-            name: 'from',
-        },
-    ];
-});
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: 'clientName',
+        label: t('Client'),
+        name: 'client',
+    },
+    {
+        align: 'left',
+        field: 'isWorker',
+        label: t('Is worker'),
+        name: 'isWorker',
+    },
+    {
+        align: 'left',
+        field: 'salesPersonName',
+        label: t('Salesperson'),
+        name: 'salesperson',
+    },
+    {
+        align: 'left',
+        field: 'country',
+        label: t('Country'),
+        name: 'country',
+    },
+    {
+        align: 'left',
+        field: 'payMethod',
+        label: t('P. Method'),
+        name: 'paymentMethod',
+    },
+    {
+        align: 'left',
+        field: ({ amount }) => toCurrency(amount),
+        label: t('Balance D.'),
+        name: 'balance',
+    },
+    {
+        align: 'left',
+        field: 'workerName',
+        label: t('Author'),
+        name: 'author',
+    },
+    {
+        align: 'left',
+        field: 'observation',
+        label: t('Last observation'),
+        name: 'lastObservation',
+    },
+    {
+        align: 'left',
+        field: ({ created }) => toDate(created),
+        label: t('L. O. Date'),
+        name: 'date',
+    },
+    {
+        align: 'left',
+        field: ({ creditInsurance }) => toCurrency(creditInsurance),
+        label: t('Credit I.'),
+        name: 'credit',
+    },
+    {
+        align: 'left',
+        field: ({ defaulterSinced }) => toDate(defaulterSinced),
+        label: t('From'),
+        name: 'from',
+    },
+]);
 
 const selectCustomerId = (id) => {
     workerId.value = 0;
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
index a1aa47791..caee06d60 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@@ -262,215 +262,213 @@ const tableColumnComponents = {
     },
 };
 
-const columns = computed(() => {
-    return [
-        {
-            align: 'left',
-            field: '',
-            label: '',
-            name: 'customerStatus',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'id',
-            label: t('customer.extendedList.tableVisibleColumns.id'),
-            name: 'id',
-        },
-        {
-            align: 'left',
-            field: 'name',
-            label: t('customer.extendedList.tableVisibleColumns.name'),
-            name: 'name',
-        },
-        {
-            align: 'left',
-            field: 'fi',
-            label: t('customer.extendedList.tableVisibleColumns.fi'),
-            name: 'fi',
-        },
-        {
-            align: 'left',
-            field: 'salesPerson',
-            label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
-            name: 'salesPersonFk',
-        },
-        {
-            align: 'left',
-            field: 'credit',
-            label: t('customer.extendedList.tableVisibleColumns.credit'),
-            name: 'credit',
-        },
-        {
-            align: 'left',
-            field: 'creditInsurance',
-            label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
-            name: 'creditInsurance',
-        },
-        {
-            align: 'left',
-            field: 'phone',
-            label: t('customer.extendedList.tableVisibleColumns.phone'),
-            name: 'phone',
-        },
-        {
-            align: 'left',
-            field: 'mobile',
-            label: t('customer.extendedList.tableVisibleColumns.mobile'),
-            name: 'mobile',
-        },
-        {
-            align: 'left',
-            field: 'street',
-            label: t('customer.extendedList.tableVisibleColumns.street'),
-            name: 'street',
-        },
-        {
-            align: 'left',
-            field: 'country',
-            label: t('customer.extendedList.tableVisibleColumns.countryFk'),
-            name: 'countryFk',
-        },
-        {
-            align: 'left',
-            field: 'province',
-            label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
-            name: 'provinceFk',
-        },
-        {
-            align: 'left',
-            field: 'city',
-            label: t('customer.extendedList.tableVisibleColumns.city'),
-            name: 'city',
-        },
-        {
-            align: 'left',
-            field: 'postcode',
-            label: t('customer.extendedList.tableVisibleColumns.postcode'),
-            name: 'postcode',
-        },
-        {
-            align: 'left',
-            field: 'email',
-            label: t('customer.extendedList.tableVisibleColumns.email'),
-            name: 'email',
-        },
-        {
-            align: 'left',
-            field: 'created',
-            label: t('customer.extendedList.tableVisibleColumns.created'),
-            name: 'created',
-            format: (value) => toDate(value),
-        },
-        {
-            align: 'left',
-            field: 'businessType',
-            label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
-            name: 'businessTypeFk',
-        },
-        {
-            align: 'left',
-            field: 'payMethod',
-            label: t('customer.extendedList.tableVisibleColumns.payMethodFk'),
-            name: 'payMethodFk',
-        },
-        {
-            align: 'left',
-            field: 'sageTaxType',
-            label: t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk'),
-            name: 'sageTaxTypeFk',
-        },
-        {
-            align: 'left',
-            field: 'sageTransactionType',
-            label: t('customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'),
-            name: 'sageTransactionTypeFk',
-        },
-        {
-            align: 'left',
-            field: 'isActive',
-            label: t('customer.extendedList.tableVisibleColumns.isActive'),
-            name: 'isActive',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isVies',
-            label: t('customer.extendedList.tableVisibleColumns.isVies'),
-            name: 'isVies',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isTaxDataChecked',
-            label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
-            name: 'isTaxDataChecked',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isEqualizated',
-            label: t('customer.extendedList.tableVisibleColumns.isEqualizated'),
-            name: 'isEqualizated',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isFreezed',
-            label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
-            name: 'isFreezed',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasToInvoice',
-            label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
-            name: 'hasToInvoice',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasToInvoiceByAddress',
-            label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
-            name: 'hasToInvoiceByAddress',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isToBeMailed',
-            label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
-            name: 'isToBeMailed',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasLcr',
-            label: t('customer.extendedList.tableVisibleColumns.hasLcr'),
-            name: 'hasLcr',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasCoreVnl',
-            label: t('customer.extendedList.tableVisibleColumns.hasCoreVnl'),
-            name: 'hasCoreVnl',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasSepaVnl',
-            label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
-            name: 'hasSepaVnl',
-            format: () => ' ',
-        },
-        {
-            align: 'right',
-            field: 'actions',
-            label: '',
-            name: 'actions',
-        },
-    ];
-});
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: '',
+        label: '',
+        name: 'customerStatus',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'id',
+        label: t('customer.extendedList.tableVisibleColumns.id'),
+        name: 'id',
+    },
+    {
+        align: 'left',
+        field: 'name',
+        label: t('customer.extendedList.tableVisibleColumns.name'),
+        name: 'name',
+    },
+    {
+        align: 'left',
+        field: 'fi',
+        label: t('customer.extendedList.tableVisibleColumns.fi'),
+        name: 'fi',
+    },
+    {
+        align: 'left',
+        field: 'salesPerson',
+        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
+        name: 'salesPersonFk',
+    },
+    {
+        align: 'left',
+        field: 'credit',
+        label: t('customer.extendedList.tableVisibleColumns.credit'),
+        name: 'credit',
+    },
+    {
+        align: 'left',
+        field: 'creditInsurance',
+        label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
+        name: 'creditInsurance',
+    },
+    {
+        align: 'left',
+        field: 'phone',
+        label: t('customer.extendedList.tableVisibleColumns.phone'),
+        name: 'phone',
+    },
+    {
+        align: 'left',
+        field: 'mobile',
+        label: t('customer.extendedList.tableVisibleColumns.mobile'),
+        name: 'mobile',
+    },
+    {
+        align: 'left',
+        field: 'street',
+        label: t('customer.extendedList.tableVisibleColumns.street'),
+        name: 'street',
+    },
+    {
+        align: 'left',
+        field: 'country',
+        label: t('customer.extendedList.tableVisibleColumns.countryFk'),
+        name: 'countryFk',
+    },
+    {
+        align: 'left',
+        field: 'province',
+        label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
+        name: 'provinceFk',
+    },
+    {
+        align: 'left',
+        field: 'city',
+        label: t('customer.extendedList.tableVisibleColumns.city'),
+        name: 'city',
+    },
+    {
+        align: 'left',
+        field: 'postcode',
+        label: t('customer.extendedList.tableVisibleColumns.postcode'),
+        name: 'postcode',
+    },
+    {
+        align: 'left',
+        field: 'email',
+        label: t('customer.extendedList.tableVisibleColumns.email'),
+        name: 'email',
+    },
+    {
+        align: 'left',
+        field: 'created',
+        label: t('customer.extendedList.tableVisibleColumns.created'),
+        name: 'created',
+        format: (value) => toDate(value),
+    },
+    {
+        align: 'left',
+        field: 'businessType',
+        label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
+        name: 'businessTypeFk',
+    },
+    {
+        align: 'left',
+        field: 'payMethod',
+        label: t('customer.extendedList.tableVisibleColumns.payMethodFk'),
+        name: 'payMethodFk',
+    },
+    {
+        align: 'left',
+        field: 'sageTaxType',
+        label: t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk'),
+        name: 'sageTaxTypeFk',
+    },
+    {
+        align: 'left',
+        field: 'sageTransactionType',
+        label: t('customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'),
+        name: 'sageTransactionTypeFk',
+    },
+    {
+        align: 'left',
+        field: 'isActive',
+        label: t('customer.extendedList.tableVisibleColumns.isActive'),
+        name: 'isActive',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isVies',
+        label: t('customer.extendedList.tableVisibleColumns.isVies'),
+        name: 'isVies',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isTaxDataChecked',
+        label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
+        name: 'isTaxDataChecked',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isEqualizated',
+        label: t('customer.extendedList.tableVisibleColumns.isEqualizated'),
+        name: 'isEqualizated',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isFreezed',
+        label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
+        name: 'isFreezed',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasToInvoice',
+        label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
+        name: 'hasToInvoice',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasToInvoiceByAddress',
+        label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
+        name: 'hasToInvoiceByAddress',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isToBeMailed',
+        label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
+        name: 'isToBeMailed',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasLcr',
+        label: t('customer.extendedList.tableVisibleColumns.hasLcr'),
+        name: 'hasLcr',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasCoreVnl',
+        label: t('customer.extendedList.tableVisibleColumns.hasCoreVnl'),
+        name: 'hasCoreVnl',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasSepaVnl',
+        label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
+        name: 'hasSepaVnl',
+        format: () => ' ',
+    },
+    {
+        align: 'right',
+        field: 'actions',
+        label: '',
+        name: 'actions',
+    },
+]);
 
 const stopEventPropagation = (event, col) => {
     if (!['id', 'salesPersonFk'].includes(col.name)) return;
diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index d93de1c2d..df128cce7 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -57,40 +57,38 @@ const tableColumnComponents = {
     },
 };
 
-const columns = computed(() => {
-    return [
-        {
-            align: 'left',
-            field: 'id',
-            label: t('Identifier'),
-            name: 'id',
-        },
-        {
-            align: 'left',
-            field: 'socialName',
-            label: t('Social name'),
-            name: 'socialName',
-        },
-        {
-            align: 'left',
-            field: 'city',
-            label: t('City'),
-            name: 'city',
-        },
-        {
-            align: 'left',
-            field: 'phone',
-            label: t('Phone'),
-            name: 'phone',
-        },
-        {
-            align: 'left',
-            field: 'email',
-            label: t('Email'),
-            name: 'email',
-        },
-    ];
-});
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: 'id',
+        label: t('Identifier'),
+        name: 'id',
+    },
+    {
+        align: 'left',
+        field: 'socialName',
+        label: t('Social name'),
+        name: 'socialName',
+    },
+    {
+        align: 'left',
+        field: 'city',
+        label: t('City'),
+        name: 'city',
+    },
+    {
+        align: 'left',
+        field: 'phone',
+        label: t('Phone'),
+        name: 'phone',
+    },
+    {
+        align: 'left',
+        field: 'email',
+        label: t('Email'),
+        name: 'email',
+    },
+]);
 
 const selectCustomerId = (id) => {
     selectedCustomerId.value = id;
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobal.vue b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
index ea1978702..7e2b43a76 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
@@ -49,30 +49,28 @@ const tableColumnComponents = {
     },
 };
 
-const columns = computed(() => {
-    return [
-        { label: 'Id', field: 'clientId', name: 'clientId', align: 'left' },
-        {
-            label: t('invoiceOut.globalInvoices.table.client'),
-            field: 'clientName',
-            name: 'clientName',
-            align: 'left',
-        },
-        {
-            label: t('invoiceOut.globalInvoices.table.addressId'),
-            field: 'id',
-            name: 'id',
-            align: 'left',
-        },
-        {
-            label: t('invoiceOut.globalInvoices.table.streetAddress'),
-            field: 'nickname',
-            name: 'nickname',
-            align: 'left',
-        },
-        { label: 'Error', field: 'message', name: 'message', align: 'left' },
-    ];
-});
+const columns = computed(() => [
+    { label: 'Id', field: 'clientId', name: 'clientId', align: 'left' },
+    {
+        label: t('invoiceOut.globalInvoices.table.client'),
+        field: 'clientName',
+        name: 'clientName',
+        align: 'left',
+    },
+    {
+        label: t('invoiceOut.globalInvoices.table.addressId'),
+        field: 'id',
+        name: 'id',
+        align: 'left',
+    },
+    {
+        label: t('invoiceOut.globalInvoices.table.streetAddress'),
+        field: 'nickname',
+        name: 'nickname',
+        align: 'left',
+    },
+    { label: 'Error', field: 'message', name: 'message', align: 'left' },
+]);
 
 const rows = computed(() => {
     if (!errors && !errors.length > 0) return [];
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index f3cf557c6..62292f115 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -103,111 +103,109 @@ const tableColumnComponents = {
     },
 };
 
-const columns = computed(() => {
-    return [
-        {
-            label: 'id',
-            field: 'id',
-            name: 'id',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('supplier.pageTitles.supplier'),
-            field: 'cargoSupplierNickname',
-            name: 'cargoSupplierNickname',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('globals.agency'),
-            field: 'agencyModeName',
-            name: 'agencyModeName',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('globals.amount'),
-            name: 'invoiceAmount',
-            field: 'entries',
-            align: 'left',
-            showValue: true,
-            format: (value) =>
-                toCurrency(
-                    value
-                        ? value.reduce((sum, entry) => {
-                              return sum + (entry.invoiceAmount || 0);
-                          }, 0)
-                        : 0
-                ),
-        },
-        {
-            label: t('globals.reference'),
-            field: 'ref',
-            name: 'ref',
-            align: 'left',
-            showValue: false,
-        },
-        {
-            label: t('globals.packages'),
-            field: 'stickers',
-            name: 'stickers',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('kg'),
-            field: 'kg',
-            name: 'kg',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('physicKg'),
-            field: 'loadedKg',
-            name: 'loadedKg',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: 'KG Vol.',
-            field: 'volumeKg',
-            name: 'volumeKg',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('globals.wareHouseOut'),
-            field: 'warehouseOutName',
-            name: 'warehouseOutName',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('shipped'),
-            field: 'shipped',
-            name: 'shipped',
-            align: 'left',
-            format: (value) => toDate(value.substring(0, 10)),
-            showValue: true,
-        },
-        {
-            label: t('globals.wareHouseIn'),
-            field: 'warehouseInName',
-            name: 'warehouseInName',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('landed'),
-            field: 'landed',
-            name: 'landed',
-            align: 'left',
-            format: (value) => toDate(value.substring(0, 10)),
-            showValue: true,
-        },
-    ];
-});
+const columns = computed(() => [
+    {
+        label: 'id',
+        field: 'id',
+        name: 'id',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('supplier.pageTitles.supplier'),
+        field: 'cargoSupplierNickname',
+        name: 'cargoSupplierNickname',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('globals.agency'),
+        field: 'agencyModeName',
+        name: 'agencyModeName',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('globals.amount'),
+        name: 'invoiceAmount',
+        field: 'entries',
+        align: 'left',
+        showValue: true,
+        format: (value) =>
+            toCurrency(
+                value
+                    ? value.reduce((sum, entry) => {
+                          return sum + (entry.invoiceAmount || 0);
+                      }, 0)
+                    : 0
+            ),
+    },
+    {
+        label: t('globals.reference'),
+        field: 'ref',
+        name: 'ref',
+        align: 'left',
+        showValue: false,
+    },
+    {
+        label: t('globals.packages'),
+        field: 'stickers',
+        name: 'stickers',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('kg'),
+        field: 'kg',
+        name: 'kg',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('physicKg'),
+        field: 'loadedKg',
+        name: 'loadedKg',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: 'KG Vol.',
+        field: 'volumeKg',
+        name: 'volumeKg',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('globals.wareHouseOut'),
+        field: 'warehouseOutName',
+        name: 'warehouseOutName',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('shipped'),
+        field: 'shipped',
+        name: 'shipped',
+        align: 'left',
+        format: (value) => toDate(value.substring(0, 10)),
+        showValue: true,
+    },
+    {
+        label: t('globals.wareHouseIn'),
+        field: 'warehouseInName',
+        name: 'warehouseInName',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('landed'),
+        field: 'landed',
+        name: 'landed',
+        align: 'left',
+        format: (value) => toDate(value.substring(0, 10)),
+        showValue: true,
+    },
+]);
 
 async function getData() {
     await arrayData.fetch({ append: false });

From e8fa564bc2afe79ef318b5e03f3e20ceabeec5cb Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 4 Jan 2024 18:13:31 -0300
Subject: [PATCH 062/105] Agregar * a inputs de campos required via css

---
 src/components/common/VnInput.vue        | 17 ++++++++---------
 src/components/common/VnSelectCreate.vue | 16 +---------------
 src/components/common/VnSelectFilter.vue | 17 ++++++++---------
 src/pages/Entry/EntryCreate.vue          |  7 ++++---
 4 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index bfd0dea40..9684dcc32 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -12,14 +12,6 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-    label: {
-        type: String,
-        default: '',
-    },
-    required: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const value = computed({
@@ -47,8 +39,8 @@ const styleAttrs = computed(() => {
         ref="vnInputRef"
         v-model="value"
         v-bind="{ ...$attrs, ...styleAttrs }"
-        :label="required ? label + ' *' : label"
         type="text"
+        :class="{ required: $attrs.required }"
     >
         <template v-if="$slots.prepend" #prepend>
             <slot name="prepend" />
@@ -58,3 +50,10 @@ const styleAttrs = computed(() => {
         </template>
     </QInput>
 </template>
+
+<style lang="scss">
+/* Estilo para el asterisco en campos requeridos */
+.q-field.required .q-field__label:after {
+    content: ' *';
+}
+</style>
diff --git a/src/components/common/VnSelectCreate.vue b/src/components/common/VnSelectCreate.vue
index cdfb0bfbd..bdc3f5cc8 100644
--- a/src/components/common/VnSelectCreate.vue
+++ b/src/components/common/VnSelectCreate.vue
@@ -20,14 +20,6 @@ const $props = defineProps({
         type: Array,
         default: () => ['developer'],
     },
-    label: {
-        type: String,
-        default: '',
-    },
-    required: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const role = useRole();
@@ -52,13 +44,7 @@ const toggleForm = () => {
 </script>
 
 <template>
-    <VnSelectFilter
-        v-model="value"
-        :options="options"
-        :label="label"
-        :required="required"
-        v-bind="$attrs"
-    >
+    <VnSelectFilter v-model="value" :options="options" v-bind="$attrs">
         <template v-if="isAllowedToCreate" #append>
             <QIcon
                 @click.stop.prevent="toggleForm()"
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index c223571f3..4256118f9 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -23,14 +23,6 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
-    label: {
-        type: String,
-        default: '',
-    },
-    required: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const { optionLabel } = toRefs($props);
@@ -95,7 +87,7 @@ const value = computed({
         hide-selected
         fill-input
         ref="vnSelectRef"
-        :label="required ? label + ' *' : label"
+        :class="{ required: $attrs.required }"
     >
         <template v-if="isClearable" #append>
             <QIcon
@@ -110,3 +102,10 @@ const value = computed({
         </template>
     </QSelect>
 </template>
+
+<style lang="scss">
+/* Estilo para el asterisco en campos requeridos */
+.q-field.required .q-field__label:after {
+    content: ' *';
+}
+</style>
diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
index fc725447c..37cfea1ad 100644
--- a/src/pages/Entry/EntryCreate.vue
+++ b/src/pages/Entry/EntryCreate.vue
@@ -67,7 +67,7 @@ const companiesOptions = ref([]);
                         option-value="id"
                         option-label="nickname"
                         hide-selected
-                        required
+                        :required="true"
                         :rules="validate('entry.supplierFk')"
                     >
                         <template #option="scope">
@@ -92,7 +92,7 @@ const companiesOptions = ref([]);
                         option-label="warehouseInName"
                         map-options
                         hide-selected
-                        required
+                        :required="true"
                         :rules="validate('entry.travelFk')"
                     >
                         <template #option="scope">
@@ -121,6 +121,7 @@ const companiesOptions = ref([]);
                         option-label="code"
                         map-options
                         hide-selected
+                        :required="true"
                         :rules="validate('entry.companyFk')"
                     />
                 </VnRow>
@@ -134,4 +135,4 @@ const companiesOptions = ref([]);
         Supplier: Proveedor
         Travel: Envío
         Company: Empresa
-    </i18n>
+</i18n>

From 8cb6ed136aba46d5617c9958c3ef68b5a22eff79 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 4 Jan 2024 19:37:46 -0300
Subject: [PATCH 063/105] =?UTF-8?q?mover=20clase=20de=20selector=20de=20cs?=
 =?UTF-8?q?s=20para=20a=C3=B1adir=20*=20a=20inputs=20requeridos=20a=20arch?=
 =?UTF-8?q?ivo=20de=20css=20global?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/VnInput.vue        | 7 -------
 src/components/common/VnSelectFilter.vue | 7 -------
 src/css/app.scss                         | 5 +++++
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 9684dcc32..cdc6dd865 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -50,10 +50,3 @@ const styleAttrs = computed(() => {
         </template>
     </QInput>
 </template>
-
-<style lang="scss">
-/* Estilo para el asterisco en campos requeridos */
-.q-field.required .q-field__label:after {
-    content: ' *';
-}
-</style>
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 4256118f9..f2fd2a311 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -102,10 +102,3 @@ const value = computed({
         </template>
     </QSelect>
 </template>
-
-<style lang="scss">
-/* Estilo para el asterisco en campos requeridos */
-.q-field.required .q-field__label:after {
-    content: ' *';
-}
-</style>
diff --git a/src/css/app.scss b/src/css/app.scss
index 02d4f8946..f0c26d482 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -53,3 +53,8 @@ body.body--dark {
     color: var(--vn-text);
     border-radius: 8px;
 }
+
+/* Estilo para el asterisco en campos requeridos */
+.q-field.required .q-field__label:after {
+    content: ' *';
+}

From 4d0d051c8ae3a6ac97329d8d5d8efaf225236c6c Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 5 Jan 2024 08:51:03 -0300
Subject: [PATCH 064/105] supplier log submodule

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

diff --git a/src/pages/Supplier/Card/SupplierLog.vue b/src/pages/Supplier/Card/SupplierLog.vue
index 2733e958d..86ee15fce 100644
--- a/src/pages/Supplier/Card/SupplierLog.vue
+++ b/src/pages/Supplier/Card/SupplierLog.vue
@@ -1 +1,6 @@
-<template>Supplier log</template>
+<script setup>
+import VnLog from 'src/components/common/VnLog.vue';
+</script>
+<template>
+    <VnLog model="Supplier" url="/SupplierLogs"></VnLog>
+</template>

From 27616b9bd456e457341498378968a2f9458177df Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 5 Jan 2024 10:57:43 -0300
Subject: [PATCH 065/105] improve TableVisibleColumns code

---
 src/components/common/TableVisibleColumns.vue | 50 ++++++++-----------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index 7defdb0de..d9a1a2004 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -50,41 +50,35 @@ const toggleMarkAll = (val) => {
     formattedCols.value.forEach((col) => (col.active = val));
 };
 
+const getConfig = async (url, filter) => {
+    const response = await axios.get(url, {
+        params: { filter: filter },
+    });
+    return response.data && response.data.length > 0 ? response.data[0] : null;
+};
+
 const fetchViewConfigData = async () => {
     try {
         const userConfigFilter = {
-            where: {
-                tableCode: $props.tableCode,
-                userFk: user.id,
-            },
+            where: { tableCode: $props.tableCode, userFk: user.id },
         };
+        const userConfig = await getConfig('UserConfigViews', userConfigFilter);
 
-        const userViewConfigResponse = await axios.get('UserConfigViews', {
-            params: { filter: userConfigFilter },
-        });
-
-        if (userViewConfigResponse.data && userViewConfigResponse.data.length > 0) {
-            initialUserConfigViewData.value = userViewConfigResponse.data[0];
-            setUserConfigViewData(userViewConfigResponse.data[0].configuration);
+        if (userConfig) {
+            initialUserConfigViewData.value = userConfig;
+            setUserConfigViewData(userConfig.configuration);
             return;
         }
 
-        const defaultConfigFilter = {
-            where: {
-                tableCode: $props.tableCode,
-            },
-        };
+        const defaultConfigFilter = { where: { tableCode: $props.tableCode } };
+        const defaultConfig = await getConfig('DefaultViewConfigs', defaultConfigFilter);
 
-        const defaultViewConfigResponse = await axios.get('DefaultViewConfigs', {
-            params: { filter: defaultConfigFilter },
-        });
-
-        if (defaultViewConfigResponse.data && defaultViewConfigResponse.data.length > 0) {
-            setUserConfigViewData(defaultViewConfigResponse.data[0].columns);
+        if (defaultConfig) {
+            setUserConfigViewData(defaultConfig.columns);
             return;
         }
     } catch (err) {
-        console.err('Error fetching config view data');
+        console.err('Error fetching config view data', err);
     }
 };
 
@@ -127,17 +121,17 @@ const saveConfig = async () => {
         }
         emitSavedConfig();
         notify('globals.dataSaved', 'positive');
-
         popupProxyRef.value.hide();
     } catch (err) {
-        console.error('Error saving user view config');
+        console.error('Error saving user view config', err);
     }
 };
 
 const emitSavedConfig = () => {
-    const filteredCols = formattedCols.value.filter((col) => col.active);
-    const mappedCols = filteredCols.map((col) => col.name);
-    emit('onConfigSaved', mappedCols);
+    const activeColumns = formattedCols.value
+        .filter((col) => col.active)
+        .map((col) => col.name);
+    emit('onConfigSaved', activeColumns);
 };
 
 onMounted(async () => {

From c997d19a5eb0a8fb8004ecd5253610477dd00553 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Fri, 5 Jan 2024 13:04:06 -0400
Subject: [PATCH 066/105] Implement tag filter

---
 src/components/ui/VnFilterPanel.vue         | 47 +++++++++-----
 src/components/ui/VnFilterPanelChip.vue     |  7 ++
 src/pages/Order/Card/OrderCatalogFilter.vue | 72 +++++++++++++++------
 3 files changed, 91 insertions(+), 35 deletions(-)
 create mode 100644 src/components/ui/VnFilterPanelChip.vue

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index a138e0b64..0a306dc5f 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -4,6 +4,8 @@ import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import toDate from 'filters/toDate';
 
+import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
+
 const { t } = useI18n();
 const props = defineProps({
     dataKey: {
@@ -39,6 +41,10 @@ const props = defineProps({
         type: Array,
         default: () => [],
     },
+    customTags: {
+        type: Array,
+        default: () => [],
+    },
 });
 
 const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
@@ -104,19 +110,26 @@ async function clearFilters() {
     emit('clear');
 }
 
-const tags = computed(() => {
-    return Object.entries(userParams.value)
+const tagsList = computed(() =>
+    Object.entries(userParams.value)
         .filter(([key, value]) => value && !(props.hiddenTags || []).includes(key))
         .map(([key, value]) => ({
             label: key,
             value: value,
-        }));
-});
+        }))
+);
+
+const tags = computed(() =>
+    tagsList.value.filter((tag) => !(props.customTags || []).includes(tag.label))
+);
+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)
+    emit('remove', key);
 }
 
 function formatValue(value) {
@@ -172,21 +185,17 @@ function formatValue(value) {
             </QItem>
             <QItem class="q-mb-sm">
                 <div
-                    v-if="tags.length === 0"
+                    v-if="tagsList.length === 0"
                     class="text-grey font-xs text-center full-width"
                 >
                     {{ t(`No filters applied`) }}
                 </div>
                 <div>
-                    <QChip
-                        :key="chip.label"
-                        @remove="remove(chip.label)"
-                        class="text-dark"
-                        color="primary"
-                        icon="label"
-                        :removable="!unremovableParams.includes(chip.label)"
-                        size="sm"
+                    <VnFilterPanelChip
                         v-for="chip of tags"
+                        :key="chip.label"
+                        :removable="!unremovableParams.includes(chip.label)"
+                        @remove="remove(chip.label)"
                     >
                         <slot name="tags" :tag="chip" :format-fn="formatValue">
                             <div class="q-gutter-x-xs">
@@ -194,7 +203,15 @@ function formatValue(value) {
                                 <span>"{{ chip.value }}"</span>
                             </div>
                         </slot>
-                    </QChip>
+                    </VnFilterPanelChip>
+                    <slot
+                        v-if="$slots.customTags"
+                        name="customTags"
+                        :params="userParams"
+                        :tags="customTags"
+                        :format-fn="formatValue"
+                        :search-fn="search"
+                    />
                 </div>
             </QItem>
             <QSeparator />
diff --git a/src/components/ui/VnFilterPanelChip.vue b/src/components/ui/VnFilterPanelChip.vue
new file mode 100644
index 000000000..89aad39e8
--- /dev/null
+++ b/src/components/ui/VnFilterPanelChip.vue
@@ -0,0 +1,7 @@
+<script setup></script>
+
+<template>
+    <QChip class="text-dark" color="primary" icon="label" size="sm" v-bind="$attrs">
+        <slot />
+    </QChip>
+</template>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 09e243959..c402dd5f4 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -1,12 +1,14 @@
 <script setup>
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import axios from 'axios';
+
+import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
-import axios from 'axios';
-import { useRoute } from 'vue-router';
-import VnInput from 'components/common/VnInput.vue';
+import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -97,6 +99,7 @@ function exprBuilder(param, value) {
 const selectedTag = ref(null);
 const tagValues = ref([{}]);
 const tagOptions = ref(null);
+const isButtonDisabled = computed(()=> !selectedTag.value || tagValues.value.some(item => !item.value))
 
 const applyTagFilter = (params, search) => {
     if (!tagValues.value?.length) {
@@ -104,14 +107,30 @@ const applyTagFilter = (params, search) => {
         search();
         return;
     }
-    params.tagGroups = JSON.stringify({
-        values: tagValues.value,
-        tagSelection: {
-            ...selectedTag.value,
-            orgShowField: selectedTag.value.name,
-        },
-        tagFk: selectedTag.value.tagFk,
-    });
+    if (!params.tagGroups) {
+        params.tagGroups = [];
+    }
+    params.tagGroups.push(
+        JSON.stringify({
+            values: tagValues.value,
+            tagSelection: {
+                ...selectedTag.value,
+                orgShowField: selectedTag.value.name,
+            },
+            tagFk: selectedTag.value.tagFk,
+        })
+    );
+    search();
+    selectedTag.value = null;
+    tagValues.value = [{}]
+};
+
+const removeTagChip = (selection, params, search) => {
+    if (params.tagGroups) {
+        params.tagGroups = (params.tagGroups || []).filter(
+            (value) => value !== selection
+        );
+    }
     search();
 };
 
@@ -144,19 +163,12 @@ const onOrderChange = (value, params, search) => {
         :data-key="props.dataKey"
         :hidden-tags="['orderFk', 'orderBy']"
         :expr-builder="exprBuilder"
+        :custom-tags="['tagGroups']"
         @init="onFilterInit"
         @remove="clearFilter"
     >
         <template #tags="{ tag, formatFn }">
-            <div v-if="tag.label === 'tagGroups'">
-                <strong> {{ JSON.parse(tag?.value).tagSelection?.name }}: </strong>
-                <span>{{
-                    (JSON.parse(tag?.value).values || [])
-                        .map((item) => item.value)
-                        .join(' | ')
-                }}</span>
-            </div>
-            <strong v-else-if="tag.label === 'categoryFk'">
+            <strong v-if="tag.label === 'categoryFk'">
                 {{ t(selectedCategory?.name || '') }}
             </strong>
             <strong v-else-if="tag.label === 'typeFk'">
@@ -167,6 +179,25 @@ const onOrderChange = (value, params, search) => {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
+        <template #customTags="{ tags: customTags, params, searchFn }">
+            <template v-for="tag in customTags" :key="tag.label">
+                <template v-if="tag.label === 'tagGroups'">
+                    <VnFilterPanelChip
+                        v-for="chip in tag.value"
+                        :key="chip"
+                        removable
+                        @remove="removeTagChip(chip, params, searchFn)"
+                    >
+                        <strong> {{ JSON.parse(chip).tagSelection?.name }}: </strong>
+                        <span>{{
+                            (JSON.parse(chip).values || [])
+                                .map((item) => item.value)
+                                .join(' | ')
+                        }}</span>
+                    </VnFilterPanelChip>
+                </template>
+            </template>
+        </template>
         <template #body="{ params, searchFn }">
             <QList dense style="max-width: 256px">
                 <QItem class="category-filter q-mt-md">
@@ -320,6 +351,7 @@ const onOrderChange = (value, params, search) => {
                             rounded
                             type="button"
                             unelevated
+                            :disable="isButtonDisabled"
                             @click.stop="applyTagFilter(params, searchFn)"
                         />
                     </QItemSection>

From 741ce4c27407e5c2bf1c55982c9fffcc008f47d2 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 8 Jan 2024 08:00:06 +0100
Subject: [PATCH 067/105] refs #6062 fix: invoiceOuts translation

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

diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 4b74bc685..ae3b8f553 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -371,7 +371,7 @@ export default {
     },
     invoiceOut: {
         pageTitles: {
-            invoiceOuts: 'Crear factura',
+            invoiceOuts: 'Fact. emitidas',
             list: 'Listado',
             negativeBases: 'Bases Negativas',
             globalInvoicing: 'Facturación global',

From ad2844d88d7c7004772d9cdf560ad4e08b822dfc Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 8 Jan 2024 08:37:36 +0100
Subject: [PATCH 068/105] fix(workerDescriptor): refs #6611 fix workerpopUp

---
 src/components/ui/CardDescriptor.vue |  2 +-
 src/composables/useArrayData.js      | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 2669b53a9..5c911a08e 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -62,7 +62,7 @@ async function getData() {
         filter: $props.filter,
         skip: 0,
     });
-    const { data } = await arrayData.fetch({ append: false });
+    const { data } = await arrayData.fetch({ append: false, updateRouter: false });
     entity.value = data;
     emit('onFetch', data);
 }
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 523340cc9..39c879f98 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -58,7 +58,7 @@ export function useArrayData(key, userOptions) {
         }
     }
 
-    async function fetch({ append = false }) {
+    async function fetch({ append = false, updateRouter = true }) {
         if (!store.url) return;
 
         cancelRequest();
@@ -100,15 +100,12 @@ export function useArrayData(key, userOptions) {
 
         hasMoreData.value = response.data.length === limit;
 
-        if (append === true) {
+        if (append) {
             if (!store.data) store.data = [];
             for (const row of response.data) store.data.push(row);
-        }
-
-        if (append === false) {
+        } else {
             store.data = response.data;
-
-            updateStateParams();
+            updateRouter && updateStateParams();
         }
 
         store.isLoading = false;
@@ -155,7 +152,9 @@ export function useArrayData(key, userOptions) {
                 delete store.userParams[param];
                 delete params[param];
                 if (store.filter?.where) {
-                    delete store.filter.where[Object.keys(exprBuilder ? exprBuilder(param) : param)[0]];
+                    delete store.filter.where[
+                        Object.keys(exprBuilder ? exprBuilder(param) : param)[0]
+                    ];
                     if (Object.keys(store.filter.where).length === 0) {
                         delete store.filter.where;
                     }

From a002231d3d1c0f69c51b76d48d9fd5f3b9798289 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 8 Jan 2024 08:52:17 +0100
Subject: [PATCH 069/105] refactor: refs #6643 drop payments title

---
 src/pages/Customer/CustomerPayments.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/pages/Customer/CustomerPayments.vue b/src/pages/Customer/CustomerPayments.vue
index 24e5efa39..3272ff6b0 100644
--- a/src/pages/Customer/CustomerPayments.vue
+++ b/src/pages/Customer/CustomerPayments.vue
@@ -123,8 +123,7 @@ function stateColor(row) {
     </QDrawer>
     <QPage class="column items-center q-pa-md customer-payments">
         <div class="card-list">
-            <QToolbar class="q-pa-none">
-                <QToolbarTitle>{{ t('Web Payments') }}</QToolbarTitle>
+            <QToolbar class="q-pa-none justify-end">
                 <QBtn
                     @click="arrayData.refresh()"
                     :loading="isLoading"
@@ -133,7 +132,7 @@ function stateColor(row) {
                     class="q-mr-sm"
                     round
                     dense
-                ></QBtn>
+                />
                 <QBtn @click="grid = !grid" icon="list" color="primary" round dense>
                     <QTooltip>{{ t('Change view') }}</QTooltip>
                 </QBtn>

From a9c4d514bcbcc4d3cee62ef4f935119599fe89e4 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 8 Jan 2024 09:27:34 +0100
Subject: [PATCH 070/105] remove ID

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

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 7d7429630..9186eb6ad 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -87,7 +87,7 @@ function viewSummary(id) {
                         v-for="row of rows"
                         :key="row.id"
                         :id="row.id"
-                        :title="`${row.nickname} (${row.id})`"
+                        :title="`${row.nickname}`"
                         @click="navigate(row.id)"
                     >
                         <template #list-items>

From 1775ac85e22d44f7ea35da1bb10827be50f90bcc Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 8 Jan 2024 11:39:21 +0100
Subject: [PATCH 071/105] refs #6062 fix(claimAction): pagination.
 fix(claimDevelopment): alignament. fix(claimSummary): object can be null

---
 src/pages/Claim/Card/ClaimAction.vue      | 42 ++++++++++++-----------
 src/pages/Claim/Card/ClaimDevelopment.vue |  7 +++-
 src/pages/Claim/Card/ClaimSummary.vue     |  2 +-
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index fb47eeee2..87132aa1f 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -134,7 +134,10 @@ async function regularizeClaim() {
         message: t('globals.dataSaved'),
         type: 'positive',
     });
+    console.log(claim.value.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2);
     if (claim.value.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2) {
+        console.log(claimActionsForm.value);
+        // claimActionsForm.value.$el.blur();
         quasar
             .dialog({
                 component: VnConfirm,
@@ -282,6 +285,8 @@ async function importToNewRefundTicket() {
                 selection="multiple"
                 v-model:selected="selectedRows"
                 :grid="$q.screen.lt.md"
+                :pagination="{ rowsPerPage: 0 }"
+                :hide-bottom="true"
             >
                 <template #body-cell-ticket="{ value }">
                     <QTd align="center">
@@ -335,7 +340,23 @@ async function importToNewRefundTicket() {
                                     </QItemSection>
                                     <QItemSection side>
                                         <QItemLabel v-if="column.name === 'destination'">
-                                            {{ column.value.description }}
+                                            <VnSelectFilter
+                                                v-model="props.row.claimDestinationFk"
+                                                :options="destinationTypes"
+                                                option-label="description"
+                                                option-value="id"
+                                                :autofocus="true"
+                                                dense
+                                                input-debounce="0"
+                                                hide-selected
+                                                @update:model-value="
+                                                    (value) =>
+                                                        updateDestination(
+                                                            value,
+                                                            props.row
+                                                        )
+                                                "
+                                            />
                                         </QItemLabel>
                                         <QItemLabel v-else>
                                             {{ column.value }}
@@ -417,25 +438,6 @@ async function importToNewRefundTicket() {
             </QCardActions>
         </QCard>
     </QDialog>
-    <!-- <QDialog v-model="dialogGreuge">
-        <QCardSection>
-            <QItem class="q-pa-sm">
-                <span class="q-pa-sm q-dialog__title text-white">
-                    {{ t('dialogGreuge title') }}
-                </span>
-                <QBtn class="q-pa-sm" icon="close" flat round dense v-close-popup />
-            </QItem>
-            <QCardActions class="justify-end q-mr-sm">
-                <QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
-                <QBtn
-                    :label="t('globals.save')"
-                    color="primary"
-                    v-close-popup
-                    @click="onUpdateGreugeAccept"
-                />
-            </QCardActions>
-        </QCardSection>
-    </QDialog> -->
 </template>
 <style lang="scss" scoped>
 .slider-container {
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index 0ab3c6c90..d1634c709 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -54,6 +54,7 @@ const columns = computed(() => [
         optionValue: 'id',
         optionLabel: 'description',
         tabIndex: 1,
+        align: 'left',
     },
     {
         name: 'claimResult',
@@ -66,6 +67,7 @@ const columns = computed(() => [
         optionValue: 'id',
         optionLabel: 'description',
         tabIndex: 2,
+        align: 'left',
     },
     {
         name: 'claimResponsible',
@@ -78,6 +80,7 @@ const columns = computed(() => [
         optionValue: 'id',
         optionLabel: 'description',
         tabIndex: 3,
+        align: 'left',
     },
     {
         name: 'worker',
@@ -89,6 +92,7 @@ const columns = computed(() => [
         optionValue: 'id',
         optionLabel: 'nickname',
         tabIndex: 4,
+        align: 'left',
     },
     {
         name: 'claimRedelivery',
@@ -101,6 +105,7 @@ const columns = computed(() => [
         optionValue: 'id',
         optionLabel: 'description',
         tabIndex: 5,
+        align: 'left',
     },
 ]);
 </script>
@@ -158,6 +163,7 @@ const columns = computed(() => [
                 hide-pagination
                 v-model:selected="selected"
                 :grid="$q.screen.lt.md"
+                table-header-class="text-left"
             >
                 <template #body-cell="{ row, col }">
                     <QTd
@@ -165,7 +171,6 @@ const columns = computed(() => [
                         @keyup.ctrl.enter.stop="claimDevelopmentForm.saveChanges()"
                     >
                         <VnSelectFilter
-                            :label="col.label"
                             v-model="row[col.model]"
                             :options="col.options"
                             :option-value="col.optionValue"
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 64d7b721b..474cc9728 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -118,7 +118,7 @@ const developmentColumns = ref([
     {
         name: 'worker',
         label: 'claim.summary.worker',
-        field: (row) => row.worker.user.nickname,
+        field: (row) => row.worker?.user.nickname,
         sortable: true,
     },
     {

From 80276100f5935477a05d08af879a8804e70612b1 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 8 Jan 2024 11:42:21 +0100
Subject: [PATCH 072/105] refs #6062 fix: console.logs

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

diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index 87132aa1f..e92e65fc7 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -134,10 +134,7 @@ async function regularizeClaim() {
         message: t('globals.dataSaved'),
         type: 'positive',
     });
-    console.log(claim.value.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2);
     if (claim.value.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2) {
-        console.log(claimActionsForm.value);
-        // claimActionsForm.value.$el.blur();
         quasar
             .dialog({
                 component: VnConfirm,

From 63b1c53ca98e0dc9d1e9c022501f187b18da04bf Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 8 Jan 2024 14:17:40 +0100
Subject: [PATCH 073/105] refs #6420 scss fix

---
 src/components/ui/VnNotes.vue         |  5 +++++
 src/pages/Claim/Card/ClaimSummary.vue | 28 +++++++++------------------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index b9a009a32..84b1b890d 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -115,6 +115,11 @@ async function insert() {
 <style lang="scss" scoped>
 .q-card {
     max-width: 80em;
+
+    &__section {
+        overflow-x: hidden;
+        word-wrap: break-word;
+    }
 }
 .q-dialog .q-card {
     width: 400px;
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 76a7e8d43..fc7bd03b7 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -36,15 +36,6 @@ const claimDmsFilter = ref({
     ],
     where: { claimFk: entityId.value },
 });
-const claimObservationsRef = ref();
-const claimObservationsFilter = ref({
-    include: [
-        {
-            relation: 'observation',
-        },
-    ],
-    where: { claimFk: entityId.value },
-});
 
 onMounted(async () => {
     salixUrl.value = await getUrl('');
@@ -167,11 +158,6 @@ function setClaimDms(data) {
     });
 }
 
-const claimObservations = ref([]);
-function setClaimObservations(data) {
-    claimObservations.value = [];
-}
-
 function openDialog(dmsId) {
     multimediaSlide.value = dmsId;
     multimediaDialog.value = true;
@@ -225,15 +211,12 @@ function openDialog(dmsId) {
                     </template>
                 </VnLv>
             </QCard>
-            <QCard class="vn-max">
+            <QCard class="vn-max claimVnNotes">
                 <a class="header" :href="`#/claim/${entityId}/notes`">
                     {{ t('claim.summary.notes') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>
-                <ClaimNotes :add-note="false" style="height: 600px" />
-                <!-- <QVirtualScroll :items="observations" separator
-                    >
-                </QVirtualScroll> -->
+                <ClaimNotes :add-note="false" style="height: 350px" order="created ASC" />
             </QCard>
             <QCard class="vn-max" v-if="salesClaimed.length > 0">
                 <a class="header" :href="`#/claim/${entityId}/notes`">
@@ -386,6 +369,13 @@ function openDialog(dmsId) {
         </template>
     </CardSummary>
 </template>
+<style lang="scss">
+.claimVnNotes {
+    .q-card {
+        max-width: 100%;
+    }
+}
+</style>
 <style lang="scss" scoped>
 .q-dialog__inner--minimized > div {
     max-width: 80%;

From fbd5abb3300921fffa109f87fd63bd0d3388cd03 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Mon, 8 Jan 2024 10:00:04 -0400
Subject: [PATCH 074/105] Fix fallowing feedback

---
 src/components/FormModel.vue                 |   5 +-
 src/pages/Order/Card/OrderBasicData.vue      |  12 -
 src/pages/Order/Card/OrderCard.vue           |   4 +-
 src/pages/Order/Card/OrderCatalogFilter.vue  |   2 +-
 src/pages/Order/Card/OrderCatalogItem.vue    |   4 +-
 src/pages/Order/Card/OrderDescriptorMenu.vue |   8 +-
 src/pages/Order/Card/OrderForm.vue           | 189 ++++++------
 src/pages/Order/Card/OrderSummary.vue        | 297 ++++++++++---------
 src/pages/Order/OrderLines.vue               |  11 +-
 9 files changed, 270 insertions(+), 262 deletions(-)
 delete mode 100644 src/pages/Order/Card/OrderBasicData.vue

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 691cf63bd..a5560dfc0 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -135,12 +135,11 @@ async function save() {
             await axios.patch($props.urlUpdate || $props.url, body);
         }
         emit('onDataSaved', formData.value);
+        originalData.value = JSON.parse(JSON.stringify(formData.value));
+        hasChanges.value = false;
     } catch (err) {
         notify('errors.create', 'negative');
     }
-
-    originalData.value = JSON.parse(JSON.stringify(formData.value));
-    hasChanges.value = false;
     isLoading.value = false;
 }
 
diff --git a/src/pages/Order/Card/OrderBasicData.vue b/src/pages/Order/Card/OrderBasicData.vue
deleted file mode 100644
index 0611fa874..000000000
--- a/src/pages/Order/Card/OrderBasicData.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<script setup>
-import OrderForm from 'pages/Order/Card/OrderForm.vue';
-</script>
-<template>
-    <QToolbar>
-        <div id="st-data"></div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
-    <OrderForm />
-</template>
-<style lang="scss" scoped></style>
diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index 4163e22a4..e81c6a3eb 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -15,9 +15,7 @@ const stateStore = useStateStore();
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <div class="q-pa-md">
-                <RouterView></RouterView>
-            </div>
+            <RouterView></RouterView>
         </QPage>
     </QPageContainer>
 </template>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 766643eba..ee6859c80 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -384,7 +384,7 @@ const getCategoryClass = (category, params) => {
 
     .category-icon {
         border-radius: 50%;
-        background-color: var(--vn-label);
+        background-color: var(--vn-light-gray);
         font-size: 2.6rem;
         padding: 8px;
         cursor: pointer;
diff --git a/src/pages/Order/Card/OrderCatalogItem.vue b/src/pages/Order/Card/OrderCatalogItem.vue
index e36ba7836..140a4c349 100644
--- a/src/pages/Order/Card/OrderCatalogItem.vue
+++ b/src/pages/Order/Card/OrderCatalogItem.vue
@@ -24,7 +24,7 @@ const dialog = ref(null);
 
 <template>
     <div class="container order-catalog-item overflow-hidden">
-        <div class="card shadow-6 bg-dark">
+        <QCard class="card shadow-6">
             <div class="img-wrapper">
                 <QImg
                     :src="`/api/Images/catalog/200x200/${item.id}/download?access_token=${token}`"
@@ -76,7 +76,7 @@ const dialog = ref(null);
                     </p>
                 </div>
             </div>
-        </div>
+        </QCard>
     </div>
 </template>
 
diff --git a/src/pages/Order/Card/OrderDescriptorMenu.vue b/src/pages/Order/Card/OrderDescriptorMenu.vue
index b432ba4d7..2e36aa3c5 100644
--- a/src/pages/Order/Card/OrderDescriptorMenu.vue
+++ b/src/pages/Order/Card/OrderDescriptorMenu.vue
@@ -51,13 +51,13 @@ async function remove() {
 
 <i18n>
 en:
-    deleteOrder: Delete order,
-    confirmDeletion: Confirm deletion,
+    deleteOrder: Delete order
+    confirmDeletion: Confirm deletion
     confirmDeletionMessage: Are you sure you want to delete this order?
 
 es:
-    deleteOrder: Eliminar pedido,
-    confirmDeletion: Confirmar eliminación,
+    deleteOrder: Eliminar pedido
+    confirmDeletion: Confirmar eliminación
     confirmDeletionMessage: Seguro que quieres eliminar este pedido?
 
 </i18n>
diff --git a/src/pages/Order/Card/OrderForm.vue b/src/pages/Order/Card/OrderForm.vue
index 4c7e2c326..67f77d0ca 100644
--- a/src/pages/Order/Card/OrderForm.vue
+++ b/src/pages/Order/Card/OrderForm.vue
@@ -65,8 +65,8 @@ const fetchAgencyList = async (landed, addressFk) => {
 };
 
 const fetchOrderDetails = (order) => {
-    fetchAddressList(order?.addressFk)
-    fetchAgencyList(order?.landed, order?.addressFk)
+    fetchAddressList(order?.addressFk);
+    fetchAgencyList(order?.landed, order?.addressFk);
 };
 
 const orderMapper = (order) => {
@@ -105,7 +105,7 @@ const orderFilter = {
 </script>
 
 <template>
-    <QToolbar>
+    <QToolbar class="bg-vn-dark justify-end">
         <div id="st-data"></div>
         <QSpace />
         <div id="st-actions"></div>
@@ -116,94 +116,97 @@ const orderFilter = {
         :filter="{ fields: ['id', 'name', 'defaultAddressFk'] }"
         auto-load
     />
-    <FormModel
-        :url="!isNew ? `Orders/${route.params.id}` : null"
-        :url-create="isNew ? 'Orders/new' : null"
-        :model="ORDER_MODEL"
-        :form-initial-data="isNew ? initialFormState : null"
-        :observe-form-changes="!isNew"
-        :mapper="isNew ? orderMapper : null"
-        :filter="orderFilter"
-        @on-fetch="fetchOrderDetails"
-    >
-        <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelectFilter
-                        :label="t('order.form.clientFk')"
-                        v-model="data.clientFk"
-                        :options="clientList"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        @update:model-value="
-                            (client) => fetchAddressList(client.defaultAddressFk)
-                        "
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>
-                                        {{ `${scope.opt.id}: ${scope.opt.name}` }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelectFilter>
-                </div>
-                <div class="col">
-                    <VnSelectFilter
-                        :label="t('order.form.addressFk')"
-                        v-model="data.addressFk"
-                        :options="addressList"
-                        option-value="id"
-                        option-label="nickname"
-                        hide-selected
-                        :disable="!addressList?.length"
-                        @update:model-value="
-                            () => fetchAgencyList(data.landed, data.addressFk)
-                        "
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>
-                                        {{
-                                            `${scope.opt.nickname}: ${scope.opt.street},${scope.opt.city}`
-                                        }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelectFilter>
-                </div>
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInputDate
-                        placeholder="dd-mm-aaa"
-                        :label="t('order.form.landed')"
-                        v-model="data.landed"
-                        @update:model-value="
-                            () => fetchAgencyList(data.landed, data.addressFk)
-                        "
-                    />
-                </div>
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelectFilter
-                        :label="t('order.form.agencyModeFk')"
-                        v-model="data.agencyModeFk"
-                        :options="agencyList"
-                        option-value="agencyModeFk"
-                        option-label="agencyMode"
-                        hide-selected
-                        :disable="!agencyList?.length"
-                    >
-                    </VnSelectFilter>
-                </div>
-            </VnRow>
-        </template>
-    </FormModel>
+
+    <div class="q-pa-md">
+        <FormModel
+            :url="!isNew ? `Orders/${route.params.id}` : null"
+            :url-create="isNew ? 'Orders/new' : null"
+            :model="ORDER_MODEL"
+            :form-initial-data="isNew ? initialFormState : null"
+            :observe-form-changes="!isNew"
+            :mapper="isNew ? orderMapper : null"
+            :filter="orderFilter"
+            @on-fetch="fetchOrderDetails"
+        >
+            <template #form="{ data }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('order.form.clientFk')"
+                            v-model="data.clientFk"
+                            :options="clientList"
+                            option-value="id"
+                            option-label="name"
+                            hide-selected
+                            @update:model-value="
+                                (client) => fetchAddressList(client.defaultAddressFk)
+                            "
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>
+                                            {{ `${scope.opt.id}: ${scope.opt.name}` }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectFilter>
+                    </div>
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('order.form.addressFk')"
+                            v-model="data.addressFk"
+                            :options="addressList"
+                            option-value="id"
+                            option-label="nickname"
+                            hide-selected
+                            :disable="!addressList?.length"
+                            @update:model-value="
+                                () => fetchAgencyList(data.landed, data.addressFk)
+                            "
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>
+                                            {{
+                                                `${scope.opt.nickname}: ${scope.opt.street},${scope.opt.city}`
+                                            }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectFilter>
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnInputDate
+                            placeholder="dd-mm-aaa"
+                            :label="t('order.form.landed')"
+                            v-model="data.landed"
+                            @update:model-value="
+                                () => fetchAgencyList(data.landed, data.addressFk)
+                            "
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('order.form.agencyModeFk')"
+                            v-model="data.agencyModeFk"
+                            :options="agencyList"
+                            option-value="agencyModeFk"
+                            option-label="agencyMode"
+                            hide-selected
+                            :disable="!agencyList?.length"
+                        >
+                        </VnSelectFilter>
+                    </div>
+                </VnRow>
+            </template>
+        </FormModel>
+    </div>
 </template>
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 0ddae2d16..9b26891a1 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -56,148 +56,161 @@ const detailsColumns = ref([
     <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
         <OrderSearchbar />
     </Teleport>
-    <CardSummary ref="summary" :url="`Orders/${entityId}/summary`">
-        <template #header="{ entity }">
-            {{ t('order.summary.basket') }} #{{ entity?.id }} -
-            {{ entity?.client?.name }} ({{ entity?.clientFk }})
-        </template>
-        <template #body="{ entity }">
-            <QCard class="vn-one">
-                <VnLv label="ID" :value="entity.id" />
-                <VnLv :label="t('order.summary.nickname')" dash>
-                    <template #value>
-                        <span class="link">
-                            {{ dashIfEmpty(entity?.address?.nickname) }}
-                            <CustomerDescriptorProxy :id="entity?.clientFk" />
-                        </span>
-                    </template>
-                </VnLv>
-                <VnLv
-                    :label="t('order.summary.company')"
-                    :value="entity?.address?.companyFk"
-                />
-                <VnLv
-                    :label="t('order.summary.confirmed')"
-                    :value="Boolean(entity?.isConfirmed)"
-                />
-            </QCard>
-            <QCard class="vn-one">
-                <VnLv
-                    :label="t('order.summary.created')"
-                    :value="toDateHour(entity?.created)"
-                />
-                <VnLv
-                    :label="t('order.summary.confirmed')"
-                    :value="toDateHour(entity?.confirmed)"
-                />
-                <VnLv
-                    :label="t('order.summary.landed')"
-                    :value="toDateHour(entity?.landed)"
-                />
-                <VnLv :label="t('order.summary.phone')">
-                    <template #value>
-                        {{ dashIfEmpty(entity?.address?.phone) }}
-                        <a
-                            v-if="entity?.address?.phone"
-                            :href="`tel:${entity?.address?.phone}`"
-                            class="text-primary"
-                        >
-                            <QIcon name="phone" />
-                        </a>
-                    </template>
-                </VnLv>
-                <VnLv
-                    :label="t('order.summary.createdFrom')"
-                    :value="entity?.sourceApp"
-                />
-                <VnLv
-                    :label="t('order.summary.address')"
-                    :value="`${entity?.address?.street} - ${entity?.address?.city} (${entity?.address?.province?.name})`"
-                    class="order-summary-address"
-                />
-            </QCard>
-            <QCard class="vn-one">
-                <p class="header">
-                    {{ t('order.summary.notes') }}
-                </p>
-                <p v-if="entity?.note" class="no-margin">
-                    {{ entity?.note }}
-                </p>
-            </QCard>
-            <QCard class="vn-one">
-                <VnLv>
-                    <template #label>
-                        <span class="text-h6">{{ t('order.summary.subtotal') }}</span>
-                    </template>
-                    <template #value>
-                        <span class="text-h6">{{ toCurrency(entity?.subTotal) }}</span>
-                    </template>
-                </VnLv>
-                <VnLv>
-                    <template #label>
-                        <span class="text-h6">{{ t('order.summary.vat') }}</span>
-                    </template>
-                    <template #value>
-                        <span class="text-h6">{{ toCurrency(entity?.VAT) }}</span>
-                    </template>
-                </VnLv>
-                <VnLv>
-                    <template #label>
-                        <span class="text-h6">{{ t('order.summary.total') }}</span>
-                    </template>
-                    <template #value>
-                        <span class="text-h6">{{ toCurrency(entity?.total) }}</span>
-                    </template>
-                </VnLv>
-            </QCard>
-            <QCard>
-                <p class="header">
-                    {{ t('order.summary.details') }}
-                </p>
-                <QTable
-                    :columns="detailsColumns"
-                    :rows="entity?.rows"
-                    flat
-                    hide-pagination
-                >
-                    <template #header="props">
-                        <QTr :props="props">
-                            <QTh auto-width>{{ t('order.summary.item') }}</QTh>
-                            <QTh>{{ t('order.summary.description') }}</QTh>
-                            <QTh auto-width>{{ t('order.summary.quantity') }}</QTh>
-                            <QTh auto-width>{{ t('order.summary.price') }}</QTh>
-                            <QTh auto-width>{{ t('order.summary.amount') }}</QTh>
-                        </QTr>
-                    </template>
-                    <template #body="props">
-                        <QTr :props="props">
-                            <QTd key="item" :props="props" class="item">
-                                {{ props.row.item?.id }}
-                            </QTd>
-                            <QTd key="description" :props="props" class="description">
-                                <div class="name">
-                                    <span>{{ props.row.item.name }}</span>
-                                    <span v-if="props.row.item.subName" class="subName">
-                                        {{ props.row.item.subName }}
-                                    </span>
-                                </div>
-                                <fetched-tags :item="props.row.item" :max-length="5" />
-                            </QTd>
-                            <QTd key="quantity" :props="props">
-                                {{ props.row.quantity }}
-                            </QTd>
-                            <QTd key="price" :props="props">
-                                {{ props.row.price }}
-                            </QTd>
-                            <QTd key="amount" :props="props">
-                                {{ toCurrency(props.row?.quantity * props.row?.price) }}
-                            </QTd>
-                        </QTr>
-                    </template>
-                </QTable>
-            </QCard>
-        </template>
-    </CardSummary>
+
+    <div class="q-pa-md">
+        <CardSummary ref="summary" :url="`Orders/${entityId}/summary`">
+            <template #header="{ entity }">
+                {{ t('order.summary.basket') }} #{{ entity?.id }} -
+                {{ entity?.client?.name }} ({{ entity?.clientFk }})
+            </template>
+            <template #body="{ entity }">
+                <QCard class="vn-one">
+                    <VnLv label="ID" :value="entity.id" />
+                    <VnLv :label="t('order.summary.nickname')" dash>
+                        <template #value>
+                            <span class="link">
+                                {{ dashIfEmpty(entity?.address?.nickname) }}
+                                <CustomerDescriptorProxy :id="entity?.clientFk" />
+                            </span>
+                        </template>
+                    </VnLv>
+                    <VnLv
+                        :label="t('order.summary.company')"
+                        :value="entity?.address?.companyFk"
+                    />
+                    <VnLv
+                        :label="t('order.summary.confirmed')"
+                        :value="Boolean(entity?.isConfirmed)"
+                    />
+                </QCard>
+                <QCard class="vn-one">
+                    <VnLv
+                        :label="t('order.summary.created')"
+                        :value="toDateHour(entity?.created)"
+                    />
+                    <VnLv
+                        :label="t('order.summary.confirmed')"
+                        :value="toDateHour(entity?.confirmed)"
+                    />
+                    <VnLv
+                        :label="t('order.summary.landed')"
+                        :value="toDateHour(entity?.landed)"
+                    />
+                    <VnLv :label="t('order.summary.phone')">
+                        <template #value>
+                            {{ dashIfEmpty(entity?.address?.phone) }}
+                            <a
+                                v-if="entity?.address?.phone"
+                                :href="`tel:${entity?.address?.phone}`"
+                                class="text-primary"
+                            >
+                                <QIcon name="phone" />
+                            </a>
+                        </template>
+                    </VnLv>
+                    <VnLv
+                        :label="t('order.summary.createdFrom')"
+                        :value="entity?.sourceApp"
+                    />
+                    <VnLv
+                        :label="t('order.summary.address')"
+                        :value="`${entity?.address?.street} - ${entity?.address?.city} (${entity?.address?.province?.name})`"
+                        class="order-summary-address"
+                    />
+                </QCard>
+                <QCard class="vn-one">
+                    <p class="header">
+                        {{ t('order.summary.notes') }}
+                    </p>
+                    <p v-if="entity?.note" class="no-margin">
+                        {{ entity?.note }}
+                    </p>
+                </QCard>
+                <QCard class="vn-one">
+                    <VnLv>
+                        <template #label>
+                            <span class="text-h6">{{ t('order.summary.subtotal') }}</span>
+                        </template>
+                        <template #value>
+                            <span class="text-h6">{{
+                                toCurrency(entity?.subTotal)
+                            }}</span>
+                        </template>
+                    </VnLv>
+                    <VnLv>
+                        <template #label>
+                            <span class="text-h6">{{ t('order.summary.vat') }}</span>
+                        </template>
+                        <template #value>
+                            <span class="text-h6">{{ toCurrency(entity?.VAT) }}</span>
+                        </template>
+                    </VnLv>
+                    <VnLv>
+                        <template #label>
+                            <span class="text-h6">{{ t('order.summary.total') }}</span>
+                        </template>
+                        <template #value>
+                            <span class="text-h6">{{ toCurrency(entity?.total) }}</span>
+                        </template>
+                    </VnLv>
+                </QCard>
+                <QCard>
+                    <p class="header">
+                        {{ t('order.summary.details') }}
+                    </p>
+                    <QTable
+                        :columns="detailsColumns"
+                        :rows="entity?.rows"
+                        flat
+                        hide-pagination
+                    >
+                        <template #header="props">
+                            <QTr :props="props">
+                                <QTh auto-width>{{ t('order.summary.item') }}</QTh>
+                                <QTh>{{ t('order.summary.description') }}</QTh>
+                                <QTh auto-width>{{ t('order.summary.quantity') }}</QTh>
+                                <QTh auto-width>{{ t('order.summary.price') }}</QTh>
+                                <QTh auto-width>{{ t('order.summary.amount') }}</QTh>
+                            </QTr>
+                        </template>
+                        <template #body="props">
+                            <QTr :props="props">
+                                <QTd key="item" :props="props" class="item">
+                                    {{ props.row.item?.id }}
+                                </QTd>
+                                <QTd key="description" :props="props" class="description">
+                                    <div class="name">
+                                        <span>{{ props.row.item.name }}</span>
+                                        <span
+                                            v-if="props.row.item.subName"
+                                            class="subName"
+                                        >
+                                            {{ props.row.item.subName }}
+                                        </span>
+                                    </div>
+                                    <fetched-tags
+                                        :item="props.row.item"
+                                        :max-length="5"
+                                    />
+                                </QTd>
+                                <QTd key="quantity" :props="props">
+                                    {{ props.row.quantity }}
+                                </QTd>
+                                <QTd key="price" :props="props">
+                                    {{ props.row.price }}
+                                </QTd>
+                                <QTd key="amount" :props="props">
+                                    {{
+                                        toCurrency(props.row?.quantity * props.row?.price)
+                                    }}
+                                </QTd>
+                            </QTr>
+                        </template>
+                    </QTable>
+                </QCard>
+            </template>
+        </CardSummary>
+    </div>
 </template>
 <style lang="scss">
 .cardSummary .summaryBody .vn-label-value.order-summary-address {
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
index 48d0e548c..0dce70831 100644
--- a/src/pages/Order/OrderLines.vue
+++ b/src/pages/Order/OrderLines.vue
@@ -25,6 +25,7 @@ const orderSummary = ref({
     vat: null,
 });
 const componentKey = ref(0);
+const order = ref(0);
 
 const refresh = () => {
     componentKey.value += 1;
@@ -63,6 +64,12 @@ async function confirmOrder() {
 </script>
 
 <template>
+    <FetchData
+        :key="componentKey"
+        :url="`Orders/${route.params.id}`"
+        @on-fetch="(data) => (order = data)"
+        auto-load
+    />
     <FetchData
         :key="componentKey"
         :url="`Orders/${route.params.id}/getTotal`"
@@ -177,7 +184,7 @@ async function confirmOrder() {
                                     :value="toCurrency(row.price * row.quantity)"
                                 />
                             </template>
-                            <template #actions>
+                            <template #actions v-if="!order?.isConfirmed">
                                 <QBtn
                                     :label="t('remove')"
                                     @click.stop="confirmRemove(row)"
@@ -190,7 +197,7 @@ async function confirmOrder() {
                 </template>
             </VnPaginate>
         </div>
-        <QPageSticky :offset="[20, 20]">
+        <QPageSticky :offset="[20, 20]" v-if="!order?.isConfirmed">
             <QBtn fab icon="check" color="primary" @click="confirmOrder()" />
             <QTooltip>
                 {{ t('confirm') }}

From 5c2b99565949cb0d1b14f7e91c8da4500b2b9dd9 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Mon, 8 Jan 2024 10:28:55 -0400
Subject: [PATCH 075/105] Add order catalog sort filter

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 44 +++++++++++++++++++--
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index ee6859c80..c325a9b05 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -39,6 +39,14 @@ const orderList = [
     { way: 'DESC', name: 'Descendant' },
 ];
 
+const selectedOrderField = ref(null);
+const OrderFields = [
+    { field: 'relevancy DESC, name', name: 'Relevancy', priority: 999 },
+    { field: 'showOrder, price', name: 'Color and price', priority: 999 },
+    { field: 'name', name: 'Name', priority: 999 },
+    { field: 'price', name: 'Price', priority: 999 },
+];
+
 const clearFilter = (key) => {
     if (key === 'categoryFk') {
         resetCategory();
@@ -73,8 +81,9 @@ const onFilterInit = async ({ params }) => {
         selectedCategoryFk.value = params.categoryFk;
     }
     if (params.orderBy) {
-        selectedOrder.value = JSON.parse(params.orderBy).way;
         orderByParam.value = JSON.parse(params.orderBy);
+        selectedOrder.value = orderByParam.value?.way;
+        selectedOrderField.value = orderByParam.value?.field;
     }
 };
 
@@ -101,7 +110,9 @@ function exprBuilder(param, value) {
 const selectedTag = ref(null);
 const tagValues = ref([{}]);
 const tagOptions = ref(null);
-const isButtonDisabled = computed(()=> !selectedTag.value || tagValues.value.some(item => !item.value))
+const isButtonDisabled = computed(
+    () => !selectedTag.value || tagValues.value.some((item) => !item.value)
+);
 
 const applyTagFilter = (params, search) => {
     if (!tagValues.value?.length) {
@@ -124,7 +135,7 @@ const applyTagFilter = (params, search) => {
     );
     search();
     selectedTag.value = null;
-    tagValues.value = [{}]
+    tagValues.value = [{}];
 };
 
 const removeTagChip = (selection, params, search) => {
@@ -138,6 +149,12 @@ const removeTagChip = (selection, params, search) => {
 
 const orderByParam = ref(null);
 
+const onOrderFieldChange = (value, params, search) => {
+    const orderBy = Object.assign({}, orderByParam.value, { field: value.field });
+    params.orderBy = JSON.stringify(orderBy);
+    search();
+};
+
 const onOrderChange = (value, params, search) => {
     const orderBy = Object.assign({}, orderByParam.value, { way: value.way });
     params.orderBy = JSON.stringify(orderBy);
@@ -268,12 +285,33 @@ const getCategoryClass = (category, params) => {
                             rounded
                             :emit-value="false"
                             use-input
+                            :is-clearable="false"
                             @update:model-value="
                                 (value) => onOrderChange(value, params, searchFn)
                             "
                         />
                     </QItemSection>
                 </QItem>
+                <QItem class="q-mb-md">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="t('params.order')"
+                            v-model="selectedOrderField"
+                            :options="OrderFields || []"
+                            option-value="field"
+                            option-label="name"
+                            dense
+                            outlined
+                            rounded
+                            :emit-value="false"
+                            use-input
+                            :is-clearable="false"
+                            @update:model-value="
+                                (value) => onOrderFieldChange(value, params, searchFn)
+                            "
+                        />
+                    </QItemSection>
+                </QItem>
                 <QSeparator />
                 <QItem class="q-mt-md">
                     <QItemSection>

From 473e96ffb41525a16d7f6d92c66c5bc75b71463c Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 8 Jan 2024 11:32:42 -0300
Subject: [PATCH 076/105] wip

---
 src/components/CreateBankEntityForm.vue       |   9 +-
 src/i18n/en/index.js                          |  19 +-
 src/i18n/es/index.js                          |  19 +-
 src/pages/Supplier/Card/SupplierAccounts.vue  | 178 +++++++++++++++++-
 src/pages/Supplier/Card/SupplierAddresses.vue |  90 ++++++++-
 src/pages/Supplier/Card/SupplierCard.vue      |   4 +-
 src/pages/Supplier/Card/SupplierContacts.vue  | 118 +++++++++++-
 7 files changed, 430 insertions(+), 7 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index f4f5fef7d..2a1385945 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -7,6 +7,13 @@ import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
+const props = defineProps({
+    showEntityField: {
+        type: Boolean,
+        default: true,
+    },
+});
+
 const emit = defineEmits(['onDataSaved']);
 
 const { t } = useI18n();
@@ -73,7 +80,7 @@ const onDataSaved = (data) => {
                         :rules="validate('bankEntity.countryFk')"
                     />
                 </div>
-                <div class="col">
+                <div v-if="showEntityField" class="col">
                     <QInput :label="t('id')" v-model="data.id" />
                 </div>
             </VnRow>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index d6c569618..5682113b2 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -62,7 +62,7 @@ export default {
         selectRows: 'Select all { numberRows } row(s)',
         allRows: 'All { numberRows } row(s)',
         markAll: 'Mark all',
-        noResults: 'No results'
+        noResults: 'No results',
     },
     errors: {
         statusUnauthorized: 'Access denied',
@@ -905,6 +905,23 @@ export default {
             payDemFk: 'Payment deadline',
             payDay: 'Pay day',
         },
+        accounts: {
+            iban: 'Iban',
+            bankEntity: 'Bank entity',
+            beneficiary: 'Beneficiary',
+        },
+        contacts: {
+            name: 'Name',
+            phone: 'Phone',
+            mobile: 'Mobile',
+            email: 'Email',
+            observation: 'Notes',
+        },
+        addresses: {
+            street: 'Street',
+            postcode: 'Postcode',
+            phone: 'Phone',
+        },
     },
     travel: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6fd60bfd9..e3a2ec5db 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -62,7 +62,7 @@ export default {
         selectRows: 'Seleccionar las { numberRows } filas(s)',
         allRows: 'Todo { numberRows } filas(s)',
         markAll: 'Marcar todo',
-        noResults: 'Sin resultados'
+        noResults: 'Sin resultados',
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',
@@ -904,6 +904,23 @@ export default {
             payDemFk: 'Plazo de pago',
             payDay: 'Día de pago',
         },
+        accounts: {
+            iban: 'Iban',
+            bankEntity: 'Entidad bancaria',
+            beneficiary: 'Beneficiario',
+        },
+        contacts: {
+            name: 'Nombre',
+            phone: 'Teléfono',
+            mobile: 'Móvil',
+            email: 'Email',
+            observation: 'Notas',
+        },
+        addresses: {
+            street: 'Dirección',
+            postcode: 'Código postal',
+            phone: 'Teléfono',
+        },
     },
     travel: {
         pageTitles: {
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 2b7059ea3..30edfb2fd 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -1 +1,177 @@
-<template>Supplier accounts</template>
+<script setup>
+import { ref, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import CrudModel from 'components/CrudModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
+import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import { useQuasar } from 'quasar';
+
+const quasar = useQuasar();
+const { notify } = useNotify();
+const route = useRoute();
+const { t } = useI18n();
+const supplier = ref(null);
+const supplierAccountRef = ref(null);
+const wireTransferFk = ref(null);
+const bankEntitiesOptions = ref([]);
+
+const onBankEntityCreated = (data) => {
+    bankEntitiesOptions.value.push(data);
+};
+
+const onChangesSaved = () => {
+    if (supplier.value.payMethodFk !== wireTransferFk.value)
+        quasar
+            .dialog({
+                message: t('Do you want to change the pay method to wire transfer?'),
+                ok: {
+                    push: true,
+                    color: 'primary',
+                },
+                cancel: true,
+            })
+            .onOk(async () => {
+                await setWireTransfer();
+            });
+};
+
+const setWireTransfer = async () => {
+    try {
+        const params = {
+            id: route.params.id,
+            payMethodFk: wireTransferFk.value,
+        };
+
+        await axios.patch(`Suppliers/${route.params.id}`, params);
+        notify('globals.dataSaved', 'positive');
+    } catch (err) {
+        console.error('Error setting wire transfer', err);
+    }
+};
+
+onMounted(() => {
+    if (supplierAccountRef.value) supplierAccountRef.value.reload();
+});
+</script>
+<template>
+    <FetchData
+        url="BankEntities"
+        @on-fetch="(data) => (bankEntitiesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="payMethods/findOne"
+        @on-fetch="(data) => (wireTransferFk = data.id)"
+        :filter="{ where: { code: 'wireTransfer' } }"
+        auto-load
+    />
+    <FetchData
+        :url="`Suppliers/${route.params.id}`"
+        @on-fetch="(data) => (supplier = data)"
+        auto-load
+    />
+    <CrudModel
+        data-key="SupplierAccount"
+        url="SupplierAccounts"
+        model="SupplierAccounts"
+        :filter="{
+            fields: ['id', 'supplierFk', 'iban', 'bankEntityFk', 'beneficiary'],
+            where: { supplierFk: route.params.id },
+        }"
+        ref="supplierAccountRef"
+        :default-remove="false"
+        :data-required="{ supplierFk: route.params.id }"
+        @save-changes="onChangesSaved()"
+    >
+        <template #body="{ rows }">
+            <QCard class="q-pa-md">
+                <VnRow
+                    v-for="(row, index) in rows"
+                    :key="index"
+                    class="row q-gutter-md q-mb-md"
+                >
+                    <div class="col">
+                        <VnInput
+                            :label="t('supplier.accounts.iban')"
+                            v-model="row.iban"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnSelectCreate
+                            :label="t('worker.create.bankEntity')"
+                            v-model="row.bankEntityFk"
+                            :options="bankEntitiesOptions"
+                            option-label="name"
+                            option-value="id"
+                            hide-selected
+                        >
+                            <template #form>
+                                <CreateBankEntityForm
+                                    @on-data-saved="onBankEntityCreated($event)"
+                                    :show-entity-field="false"
+                                />
+                            </template>
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection v-if="scope.opt">
+                                        <QItemLabel
+                                            >{{ scope.opt.bic }}
+                                            {{ scope.opt.name }}</QItemLabel
+                                        >
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectCreate>
+                    </div>
+                    <div class="col">
+                        <VnInput
+                            :label="t('supplier.accounts.beneficiary')"
+                            v-model="row.beneficiary"
+                        />
+                    </div>
+                    <div class="col-1 row justify-center items-center">
+                        <QIcon
+                            name="delete"
+                            size="sm"
+                            class="cursor-pointer"
+                            color="primary"
+                            @click="supplierAccountRef.remove([row])"
+                        >
+                            <QTooltip>
+                                {{ t('Remove account') }}
+                            </QTooltip>
+                        </QIcon>
+                    </div>
+                </VnRow>
+                <VnRow>
+                    <QIcon
+                        name="add"
+                        size="sm"
+                        class="cursor-pointer"
+                        color="primary"
+                        @click="supplierAccountRef.insert()"
+                    >
+                        <QTooltip>
+                            {{ t('Add account') }}
+                        </QTooltip>
+                    </QIcon>
+                </VnRow>
+            </QCard>
+        </template>
+    </CrudModel>
+</template>
+
+<i18n>
+    es:
+        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
+</i18n>
diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
index dd82abe78..17c9e7c4c 100644
--- a/src/pages/Supplier/Card/SupplierAddresses.vue
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -1 +1,89 @@
-<template>Supplier addresses</template>
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRouter, useRoute } from 'vue-router';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+const router = useRouter();
+const route = useRoute();
+const { t } = useI18n();
+
+const addressesFilter = {
+    fields: [
+        'id',
+        'nickname',
+        'street',
+        'city',
+        'provinceFk',
+        'phone',
+        'mobile',
+        'postalCode',
+    ],
+    order: ['nickname ASC'],
+    include: [
+        {
+            relation: 'province',
+            scope: {
+                fields: ['id', 'name'],
+            },
+        },
+    ],
+};
+
+const redirectToCreateView = () => {
+    router.push({ name: 'SupplierCreate' });
+};
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="card-list">
+            <VnPaginate
+                data-key="SupplierAddress"
+                :url="`Suppliers/${route.params.id}/addresses`"
+                :filter="addressesFilter"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :key="row.id"
+                        :title="row.nickname"
+                        :id="row.id"
+                        @click="redirectToCreateView(row.id)"
+                    >
+                        <template #list-items>
+                            <VnLv
+                                :label="t('supplier.addresses.street')"
+                                :value="row.street"
+                            />
+                            <VnLv
+                                :label="t('supplier.addresses.postcode')"
+                                :value="`${row.postalCode} - ${row.city}, ${row.province.name}`"
+                            />
+                            <VnLv
+                                :label="t('supplier.addresses.phone')"
+                                :value="`${row.phone}, ${row.mobile}`"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QPageSticky :offset="[20, 20]">
+            <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
+            <QTooltip>
+                {{ t('supplier.list.newSupplier') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.card-list {
+    width: 100%;
+    max-width: 60em;
+}
+</style>
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index 04115cc3d..8eeb79e6c 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -32,7 +32,9 @@ const { t } = useI18n();
                 <QSpace />
                 <div id="st-actions"></div>
             </QToolbar>
-            <div class="q-pa-md"><RouterView></RouterView></div>
+            <div class="q-pa-md">
+                <RouterView />
+            </div>
         </QPage>
     </QPageContainer>
 </template>
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index ca58d4ab7..2331bd7e9 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -1 +1,117 @@
-<template>Supplier contacts</template>
+<script setup>
+import { ref, onMounted } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CrudModel from 'components/CrudModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+const supplierContactRef = ref(null);
+
+onMounted(() => {
+    if (supplierContactRef.value) supplierContactRef.value.reload();
+});
+</script>
+<template>
+    <CrudModel
+        data-key="SupplierContact"
+        url="SupplierContacts"
+        model="SupplierContact"
+        :filter="{
+            where: { supplierFk: route.params.id },
+        }"
+        ref="supplierContactRef"
+        :default-remove="false"
+        :data-required="{ supplierFk: route.params.id }"
+    >
+        <template #body="{ rows }">
+            <QCard class="q-pa-md">
+                <QCardSection
+                    v-for="(row, index) in rows"
+                    :key="index"
+                    class="border q-pa-md q-mb-md"
+                >
+                    <VnRow class="row q-gutter-md">
+                        <div class="col">
+                            <VnInput
+                                :label="t('supplier.contacts.name')"
+                                v-model="row.name"
+                            />
+                        </div>
+                        <div class="col">
+                            <VnInput
+                                :label="t('supplier.contacts.phone')"
+                                v-model="row.phone"
+                            />
+                        </div>
+                        <div class="col">
+                            <VnInput
+                                :label="t('supplier.contacts.mobile')"
+                                v-model="row.mobile"
+                            />
+                        </div>
+                        <div class="col">
+                            <VnInput
+                                :label="t('supplier.contacts.email')"
+                                v-model="row.email"
+                            />
+                        </div>
+                    </VnRow>
+                    <VnRow class="row q-gutter-md">
+                        <div class="col">
+                            <QInput
+                                :label="t('supplier.contacts.observation')"
+                                type="textarea"
+                                v-model="row.observation"
+                                fill-input
+                                autogrow
+                            />
+                        </div>
+                        <div class="col-1 row justify-center items-center">
+                            <QIcon
+                                name="delete"
+                                size="sm"
+                                class="cursor-pointer"
+                                color="primary"
+                                @click="supplierContactRef.remove([row])"
+                            >
+                                <QTooltip>
+                                    {{ t('Remove contact') }}
+                                </QTooltip>
+                            </QIcon>
+                        </div>
+                    </VnRow>
+                </QCardSection>
+                <VnRow>
+                    <QIcon
+                        name="add"
+                        size="sm"
+                        class="cursor-pointer"
+                        color="primary"
+                        @click="supplierContactRef.insert()"
+                    >
+                        <QTooltip>
+                            {{ t('Add contact') }}
+                        </QTooltip>
+                    </QIcon>
+                </VnRow>
+            </QCard>
+        </template>
+    </CrudModel>
+</template>
+
+<style lang="scss" scoped>
+.border {
+    border-radius: 0px !important;
+    border: 1px solid var(--vn-text) !important;
+}
+</style>
+
+<i18n>
+    es:
+        Add contact: Añadir contacto
+        Remove contact: Remover contacto
+</i18n>

From 8a2a6fe1c92592db2d2b2f3ef0f8c2614c2ac8fd Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 8 Jan 2024 11:51:20 -0300
Subject: [PATCH 077/105] =?UTF-8?q?Cambiar=20traducci=C3=B3n=20de=20fiscal?=
 =?UTF-8?q?Data?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/es/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6b1e22263..d5f4691a1 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -62,7 +62,7 @@ export default {
         selectRows: 'Seleccionar las { numberRows } filas(s)',
         allRows: 'Todo { numberRows } filas(s)',
         markAll: 'Marcar todo',
-        noResults: 'Sin resultados'
+        noResults: 'Sin resultados',
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',
@@ -856,7 +856,7 @@ export default {
             payDeadline: 'Plazo de pago',
             payDay: 'Día de pago',
             account: 'Cuenta',
-            fiscalData: 'Data fiscal',
+            fiscalData: 'Datos fiscales',
             sageTaxType: 'Tipo de impuesto Sage',
             sageTransactionType: 'Tipo de transacción Sage',
             sageWithholding: 'Retención sage',

From 865a13aafa6215ed9c97cfefead3c928f2b898ad Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 8 Jan 2024 16:16:42 -0300
Subject: [PATCH 078/105] Submodulos de suppliers: Accounts, Contacts y
 Addresses

---
 src/components/CreateNewPostcodeForm.vue      |   2 +-
 src/i18n/en/index.js                          |   4 +
 src/i18n/es/index.js                          |   4 +
 src/pages/Supplier/Card/SupplierAddresses.vue |  12 +-
 .../Supplier/Card/SupplierAddressesCreate.vue | 182 ++++++++++++++++++
 src/pages/Supplier/Card/SupplierContacts.vue  |   1 +
 src/router/modules/Supplier.js                |   6 +
 7 files changed, 208 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/Supplier/Card/SupplierAddressesCreate.vue

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 3504445f8..a8e999ae1 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -131,7 +131,7 @@ const onProvinceCreated = async () => {
 es:
     New postcode: Nuevo código postal
     Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos!
-    City: Ciudad
+    City: Población
     Province: Provincia
     Country: País
     Postcode: Código postal
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 5682113b2..85a82ebe5 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -921,6 +921,10 @@ export default {
             street: 'Street',
             postcode: 'Postcode',
             phone: 'Phone',
+            name: 'Name',
+            city: 'City',
+            province: 'Province',
+            mobile: 'Mobile',
         },
     },
     travel: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index e3a2ec5db..44ce18cc9 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -920,6 +920,10 @@ export default {
             street: 'Dirección',
             postcode: 'Código postal',
             phone: 'Teléfono',
+            name: 'Nombre',
+            city: 'Población',
+            province: 'Provincia',
+            mobile: 'Móvil',
         },
     },
     travel: {
diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
index 17c9e7c4c..df7cff932 100644
--- a/src/pages/Supplier/Card/SupplierAddresses.vue
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -33,7 +33,15 @@ const addressesFilter = {
 };
 
 const redirectToCreateView = () => {
-    router.push({ name: 'SupplierCreate' });
+    router.push({ name: 'SupplierAddressesCreate' });
+};
+
+const redirectToUpdateView = (addressData) => {
+    const stringifiedAddressData = JSON.stringify(addressData);
+    router.push({
+        name: 'SupplierAddressesCreate',
+        query: { addressData: stringifiedAddressData },
+    });
 };
 </script>
 
@@ -52,7 +60,7 @@ const redirectToCreateView = () => {
                         :key="row.id"
                         :title="row.nickname"
                         :id="row.id"
-                        @click="redirectToCreateView(row.id)"
+                        @click="redirectToUpdateView(row)"
                     >
                         <template #list-items>
                             <VnLv
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
new file mode 100644
index 000000000..8ad0959f5
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -0,0 +1,182 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { reactive, ref, onMounted, onBeforeMount } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import FormModel from 'components/FormModel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+
+const provincesOptions = ref([]);
+const postcodesOptions = ref([]);
+const townsLocationOptions = ref([]);
+const viewAction = ref();
+const updateAddressId = ref(null);
+const newAddressForm = reactive({
+    nickname: null,
+    street: null,
+    postalCode: null,
+    city: null,
+    provinceFk: null,
+    phone: null,
+    mobile: null,
+});
+
+const onDataSaved = () => {
+    router.push({ name: 'SupplierAddresses' });
+};
+
+const updateAddressForm = (addressData) => {
+    for (let key in newAddressForm) {
+        if (key in addressData) {
+            newAddressForm[key] = addressData[key];
+        }
+    }
+};
+
+onBeforeMount(() => {
+    viewAction.value = route.query.addressData ? 'update' : 'create';
+
+    if (viewAction.value === 'create') newAddressForm.supplierFk = route.params.id;
+});
+
+onMounted(() => {
+    if (viewAction.value === 'update' && route.query.addressData) {
+        const addressData = JSON.parse(route.query.addressData);
+        updateAddressId.value = addressData.id;
+        updateAddressForm(addressData);
+    }
+});
+</script>
+
+<template>
+    <FetchData
+        ref="postcodeFetchDataRef"
+        url="Postcodes/location"
+        @on-fetch="(data) => (postcodesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        ref="provincesFetchDataRef"
+        @on-fetch="(data) => (provincesOptions = data)"
+        auto-load
+        url="Provinces"
+    />
+    <FetchData
+        ref="townsFetchDataRef"
+        @on-fetch="(data) => (townsLocationOptions = data)"
+        auto-load
+        url="Towns/location"
+    />
+    <QPage>
+        <FormModel
+            model="supplierAddresses"
+            :form-initial-data="newAddressForm"
+            :url-update="
+                viewAction !== 'create' ? `SupplierAddresses/${updateAddressId}` : null
+            "
+            :url-create="viewAction === 'create' ? 'SupplierAddresses' : null"
+            :observe-form-changes="viewAction === 'create'"
+            @on-data-saved="onDataSaved()"
+        >
+            <template #form="{ data, validate }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnInput
+                            v-model="data.nickname"
+                            :label="t('supplier.addresses.name')"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnInput
+                            v-model="data.street"
+                            :label="t('supplier.addresses.street')"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectCreate
+                            v-model="data.postalCode"
+                            :label="t('supplier.addresses.postcode')"
+                            :rules="validate('supplierAddress.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('supplier.addresses.city')"
+                            :options="townsLocationOptions"
+                            v-model="data.city"
+                            hide-selected
+                            option-label="name"
+                            option-value="id"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('supplier.addresses.province')"
+                            :options="provincesOptions"
+                            hide-selected
+                            map-options
+                            option-label="name"
+                            option-value="id"
+                            v-model="data.provinceFk"
+                        />
+                    </div>
+                    <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>
+    </QPage>
+</template>
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index 2331bd7e9..d69b74a4c 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -15,6 +15,7 @@ onMounted(() => {
     if (supplierContactRef.value) supplierContactRef.value.reload();
 });
 </script>
+
 <template>
     <CrudModel
         data-key="SupplierContact"
diff --git a/src/router/modules/Supplier.js b/src/router/modules/Supplier.js
index 6ce1a7688..76b485d6b 100644
--- a/src/router/modules/Supplier.js
+++ b/src/router/modules/Supplier.js
@@ -134,6 +134,12 @@ export default {
                     component: () =>
                         import('src/pages/Supplier/Card/SupplierAddresses.vue'),
                 },
+                {
+                    path: 'address/create',
+                    name: 'SupplierAddressesCreate',
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierAddressesCreate.vue'),
+                },
                 {
                     path: 'consumption',
                     name: 'SupplierConsumption',

From c21afccf7533955dfad64ea6ef85178481560291 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Mon, 8 Jan 2024 14:25:21 -0500
Subject: [PATCH 079/105] Se crea el formulario para agregar nuevas
 observaciones en la tablade morosos

---
 .../Customer/Defaulter/CustomerDefaulter.vue  | 44 +++++++----
 .../CustomerDefaulterAddObservation.vue       | 79 +++++++++++++++++++
 2 files changed, 108 insertions(+), 15 deletions(-)
 create mode 100644 src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index d54d5df35..aff57318f 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -2,7 +2,7 @@
 import { ref, computed, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-import { QBtn, QCheckbox } from 'quasar';
+import { QBtn, QCheckbox, useQuasar } from 'quasar';
 
 import { toCurrency, toDate } from 'filters/index';
 import { useArrayData } from 'composables/useArrayData';
@@ -12,12 +12,19 @@ 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 CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
+const quasar = useQuasar();
 
 const arrayData = ref(null);
 const balanceDueTotal = ref(0);
+const customerId = ref(0);
+const selected = ref([]);
+const workerId = ref(0);
+
+const rows = computed(() => arrayData.value.store.data);
 
 onBeforeMount(async () => {
     arrayData.value = useArrayData('CustomerDefaulter', {
@@ -31,16 +38,9 @@ onBeforeMount(async () => {
         },
         0
     );
-    console.log(balanceDueTotal.value);
     stateStore.rightDrawer = true;
 });
 
-const rows = computed(() => arrayData.value.store.data);
-
-const selected = ref([]);
-const workerId = ref(0);
-const customerId = ref(0);
-
 const tableColumnComponents = {
     client: {
         component: QBtn,
@@ -49,11 +49,10 @@ const tableColumnComponents = {
     },
     isWorker: {
         component: QCheckbox,
-        props: ({ value }) => ({
+        props: ({ row }) => ({
             disable: true,
-            'model-value': Boolean(value),
+            'model-value': Boolean(row.selected),
         }),
-        event: () => {},
     },
     salesperson: {
         component: QBtn,
@@ -180,6 +179,15 @@ const selectWorkerId = (id) => {
     customerId.value = 0;
     workerId.value = id;
 };
+
+const viewAddObservation = (rowsSelected) => {
+    quasar.dialog({
+        component: CustomerDefaulterAddObservation,
+        componentProps: {
+            clients: rowsSelected,
+        },
+    });
+};
 </script>
 
 <template>
@@ -190,11 +198,17 @@ const selectWorkerId = (id) => {
     </QDrawer>
 
     <QToolbar class="bg-vn-dark">
-        <div id="st-data">
+        <div id="st-data" class="row">
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />
+            <div class="flex items-center q-ml-lg">
+                <QBtn
+                    color="primary"
+                    icon="vn:notes"
+                    :disabled="!selected.length"
+                    @click.stop="viewAddObservation(selected)"
+                />
+            </div>
         </div>
-        <QSpace />
-        <div id="st-actions"></div>
     </QToolbar>
 
     <QPage class="column items-center q-pa-md">
@@ -204,7 +218,7 @@ const selectWorkerId = (id) => {
             :rows="rows"
             class="full-width q-mt-md"
             hide-bottom
-            row-key="id"
+            row-key="clientFk"
             selection="multiple"
             v-model:selected="selected"
         >
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
new file mode 100644
index 000000000..4a828b492
--- /dev/null
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
@@ -0,0 +1,79 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import axios from 'axios';
+
+import VnRow from 'components/ui/VnRow.vue';
+
+const $props = defineProps({
+    clients: {
+        type: Array,
+        required: true,
+    },
+});
+
+const { t } = useI18n();
+
+const newObservation = ref(null);
+
+const onSubmit = async () => {
+    const data = $props.clients.map((item) => {
+        return { clientFk: item.clientFk, text: newObservation.value };
+    });
+    await axios.post('ClientObservations', data);
+    const payload = {
+        defaulters: $props.clients,
+        observation: newObservation.value,
+    };
+    await axios.post('Defaulters/observationEmail', payload);
+};
+</script>
+
+<template>
+    <QDialog ref="dialogRef">
+        <QCard class="q-pa-md q-mb-md">
+            <QCardSection>
+                <QForm @submit="onSubmit()" class="q-pa-sm">
+                    <div>
+                        {{
+                            t('Add observation to all selected clients', {
+                                numberClients: t($props.clients.length),
+                            })
+                        }}
+                    </div>
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <div class="col">
+                            <QInput
+                                :label="t('Message')"
+                                type="textarea"
+                                v-model="newObservation"
+                            />
+                        </div>
+                    </VnRow>
+                    <div class="q-mt-lg row justify-end">
+                        <QBtn
+                            :label="t('globals.cancel')"
+                            color="primary"
+                            flat
+                            class="q-mr-md"
+                            v-close-popup
+                        />
+                        <QBtn
+                            :label="t('globals.save')"
+                            type="submit"
+                            color="primary"
+                            v-close-popup
+                        />
+                    </div>
+                </QForm>
+            </QCardSection>
+        </QCard>
+    </QDialog>
+</template>
+
+<i18n>
+    es:
+        Add observation to all selected clients: Añadir observación a { numberClients } cliente(s) seleccionado(s)
+        Message: Mensaje
+</i18n>

From dd8373ea2208990497205a21fa232e221b4cacfe Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Mon, 8 Jan 2024 17:28:56 -0500
Subject: [PATCH 080/105] Se hacen mejoras al momento de hacer las peticiones y
 se refresca la data actualizada

---
 .../Customer/Defaulter/CustomerDefaulter.vue  | 39 ++++++++++++-------
 .../CustomerDefaulterAddObservation.vue       | 39 ++++++++++++++-----
 2 files changed, 54 insertions(+), 24 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index aff57318f..bf7480985 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -26,21 +26,6 @@ const workerId = ref(0);
 
 const rows = computed(() => arrayData.value.store.data);
 
-onBeforeMount(async () => {
-    arrayData.value = useArrayData('CustomerDefaulter', {
-        url: 'Defaulters/filter',
-        limit: 0,
-    });
-    await arrayData.value.fetch({ append: false });
-    balanceDueTotal.value = arrayData.value.store.data.reduce(
-        (accumulator, currentValue) => {
-            return accumulator + (currentValue['amount'] || 0);
-        },
-        0
-    );
-    stateStore.rightDrawer = true;
-});
-
 const tableColumnComponents = {
     client: {
         component: QBtn,
@@ -170,6 +155,25 @@ const columns = computed(() => [
     },
 ]);
 
+onBeforeMount(() => {
+    getArrayData();
+});
+
+const getArrayData = async () => {
+    arrayData.value = useArrayData('CustomerDefaulter', {
+        url: 'Defaulters/filter',
+        limit: 0,
+    });
+    await arrayData.value.fetch({ append: false });
+    balanceDueTotal.value = arrayData.value.store.data.reduce(
+        (accumulator, currentValue) => {
+            return accumulator + (currentValue['amount'] || 0);
+        },
+        0
+    );
+    stateStore.rightDrawer = true;
+};
+
 const selectCustomerId = (id) => {
     workerId.value = 0;
     customerId.value = id;
@@ -185,9 +189,14 @@ const viewAddObservation = (rowsSelected) => {
         component: CustomerDefaulterAddObservation,
         componentProps: {
             clients: rowsSelected,
+            promise: refreshData,
         },
     });
 };
+
+const refreshData = () => {
+    getArrayData();
+};
 </script>
 
 <template>
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
index 4a828b492..b150f4d8b 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterAddObservation.vue
@@ -3,6 +3,7 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import axios from 'axios';
+import { useQuasar } from 'quasar';
 
 import VnRow from 'components/ui/VnRow.vue';
 
@@ -11,22 +12,42 @@ const $props = defineProps({
         type: Array,
         required: true,
     },
+    promise: {
+        type: Function,
+        required: true,
+    },
 });
 
 const { t } = useI18n();
+const quasar = useQuasar();
 
 const newObservation = ref(null);
 
 const onSubmit = async () => {
-    const data = $props.clients.map((item) => {
-        return { clientFk: item.clientFk, text: newObservation.value };
-    });
-    await axios.post('ClientObservations', data);
-    const payload = {
-        defaulters: $props.clients,
-        observation: newObservation.value,
-    };
-    await axios.post('Defaulters/observationEmail', payload);
+    try {
+        const data = $props.clients.map((item) => {
+            return { clientFk: item.clientFk, text: newObservation.value };
+        });
+        await axios.post('ClientObservations', data);
+
+        const payload = {
+            defaulters: $props.clients,
+            observation: newObservation.value,
+        };
+        await axios.post('Defaulters/observationEmail', payload);
+
+        await $props.promise();
+
+        quasar.notify({
+            message: t('globals.dataSaved'),
+            type: 'positive',
+        });
+    } catch (error) {
+        quasar.notify({
+            message: t(`${error.message}`),
+            type: 'negative',
+        });
+    }
 };
 </script>
 

From a59a86dfd6e47986962819a7d1e1bdb50df41952 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 9 Jan 2024 08:36:50 +0100
Subject: [PATCH 081/105] refs #6383 darkMode

---
 src/layouts/MainLayout.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index 9c076d98c..e4da463c5 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -1,8 +1,17 @@
 <script setup>
-import { useQuasar } from 'quasar';
+import { onMounted, computed } from 'vue';
+import { Dark, Quasar, useQuasar } from 'quasar';
 import Navbar from 'src/components/NavBar.vue';
 
 const quasar = useQuasar();
+const darkMode = computed({
+    get() {
+        return Dark.isActive;
+    },
+    set(value) {
+        Dark.set(value);
+    },
+});
 </script>
 
 <template>

From 091446178bb743bd07500c9f2c291cedb80b05ae Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Tue, 9 Jan 2024 08:23:19 -0500
Subject: [PATCH 082/105] Se crea tarjeta de data fiscal

---
 .../Customer/Card/CustomerFiscalData.vue      | 282 +++++++++++++++++-
 1 file changed, 281 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index ced6012b8..b4fe1fd30 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -1,3 +1,283 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const typesTaxes = ref([]);
+const typesTransactions = ref([]);
+const postcodeFetchDataRef = ref(null);
+const citiesLocationOptions = ref([]);
+const provincesLocationOptions = ref([]);
+const countriesOptions = ref([]);
+const postcodesOptions = ref([]);
+
+const onPostcodeCreated = async () => {
+    postcodeFetchDataRef.value.fetch();
+};
+</script>
+
 <template>
-    <div class="flex justify-center">Fiscal data</div>
+    <fetch-data auto-load @on-fetch="(data) => (typesTaxes = data)" url="SageTaxTypes" />
+    <fetch-data
+        auto-load
+        @on-fetch="(data) => (typesTransactions = data)"
+        url="SageTransactionTypes"
+    />
+    <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"
+    />
+
+    <FormModel
+        :url-update="`Clients/${route.params.id}/updateFiscalData`"
+        :url="`Clients/${route.params.id}/getCard`"
+        auto-load
+        model="customer"
+    >
+        <template #form="{ data, validate }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        :label="t('Social name')"
+                        :rules="validate('client.socialName')"
+                        v-model="data.socialName"
+                    />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Tax number')" v-model="data.fi" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput :label="t('Street')" v-model="data.street" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Sage tax type')"
+                        :options="typesTaxes"
+                        hide-selected
+                        option-label="vat"
+                        option-value="id"
+                        v-model="data.sageTaxTypeFk"
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Sage transaction type')"
+                        :options="typesTransactions"
+                        hide-selected
+                        option-label="vat"
+                        option-value="id"
+                        v-model="data.sageTransactionTypeFk"
+                    />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectCreate
+                        :label="t('Postcode')"
+                        :options="postcodesOptions"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :rules="validate('Worker.postcode')"
+                        hide-selected
+                        option-label="code"
+                        option-value="code"
+                        v-model="data.postcode"
+                    >
+                        <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.province"
+                    >
+                        <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.country"
+                    />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox :label="t('Active')" v-model="data.isActive" />
+                </div>
+                <div class="col">
+                    <QCheckbox :label="t('Frozen')" v-model="data.isFreezed" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox :label="t('Has to invoice')" v-model="data.hasToInvoice" />
+                </div>
+                <div class="col">
+                    <QCheckbox :label="t('Vies')" v-model="data.isVies" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox
+                        :label="t('Notify by email')"
+                        v-model="data.isToBeMailed"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        :label="t('Invoice by address')"
+                        v-model="data.hasToInvoiceByAddress"
+                    />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox
+                        :label="t('Is equalizated')"
+                        v-model="data.isEqualizated"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        :label="t('Verified data')"
+                        v-model="data.isTaxDataChecked"
+                    />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox
+                        :label="t('Incoterms authorization')"
+                        v-model="data.hasIncoterms"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        :label="t('Electronic invoice')"
+                        v-model="data.hasElectronicInvoice"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
 </template>
+
+<i18n>
+es:
+    Social name: Razón social
+    Tax number: NIF / CIF
+    Street: Dirección fiscal
+    Sage tax type: Tipo de impuesto Sage
+    Sage transaction type: Tipo de transacción Sage
+    Postcode: Código postal
+    City: Población
+    Province: Provincia
+    Country: País
+    Active: Activo
+    Frozen: Congelado
+    Has to invoice: Factura
+    Vies: Vies
+    Notify by email: Notificar vía e-mail
+    Invoice by address: Facturar por consignatario
+    Is equalizated: Recargo de equivalencia
+    Verified data: Datos comprobados
+    Incoterms authorization: Autorización incoterms
+    Electronic invoice: Factura electrónica
+</i18n>

From 9e314276bd85abb8e5a9fc360ba154afc70f125c Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 9 Jan 2024 14:37:44 +0100
Subject: [PATCH 083/105] refs #6383 set dark

---
 src/App.vue                | 3 ++-
 src/layouts/MainLayout.vue | 9 ---------
 src/layouts/OutLayout.vue  | 1 +
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 8e9bea2e4..d0d8c9358 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,10 +1,11 @@
 <script setup>
 import { onMounted } from 'vue';
-import { useQuasar } from 'quasar';
+import { useQuasar, Dark } from 'quasar';
 import { useI18n } from 'vue-i18n';
 
 const quasar = useQuasar();
 const { availableLocales, locale, fallbackLocale } = useI18n();
+Dark.set(true);
 
 onMounted(() => {
     let userLang = window.navigator.language;
diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index e4da463c5..a0873b7f1 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -2,16 +2,7 @@
 import { onMounted, computed } from 'vue';
 import { Dark, Quasar, useQuasar } from 'quasar';
 import Navbar from 'src/components/NavBar.vue';
-
 const quasar = useQuasar();
-const darkMode = computed({
-    get() {
-        return Dark.isActive;
-    },
-    set(value) {
-        Dark.set(value);
-    },
-});
 </script>
 
 <template>
diff --git a/src/layouts/OutLayout.vue b/src/layouts/OutLayout.vue
index f21e6e568..8e9ab3e41 100644
--- a/src/layouts/OutLayout.vue
+++ b/src/layouts/OutLayout.vue
@@ -26,6 +26,7 @@ const userLocale = computed({
         }
     },
 });
+
 const darkMode = computed({
     get() {
         return Dark.isActive;

From 5511e365aa868a0e53881868d8bfe93670a47238 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 9 Jan 2024 10:46:27 -0300
Subject: [PATCH 084/105] WIP

---
 src/components/CrudModel.vue                  |   8 +-
 src/i18n/en/index.js                          |   9 ++
 src/i18n/es/index.js                          |   9 ++
 .../Supplier/Card/SupplierAgencyTerm.vue      | 140 +++++++++++++++++-
 .../Card/SupplierAgencyTermCreate.vue         | 113 ++++++++++++++
 .../Supplier/Card/SupplierConsumption.vue     |  37 ++++-
 src/router/modules/Supplier.js                |   6 +
 7 files changed, 318 insertions(+), 4 deletions(-)
 create mode 100644 src/pages/Supplier/Card/SupplierAgencyTermCreate.vue

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index 75353a35a..17fc8fc4a 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -225,15 +225,19 @@ function getDifferences(obj1, obj2) {
     delete obj2.$index;
 
     for (let key in obj1) {
-        if (obj2[key] && obj1[key] !== obj2[key]) {
+        if (obj2[key] && JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])) {
             diff[key] = obj2[key];
         }
     }
     for (let key in obj2) {
-        if (obj1[key] === undefined || obj1[key] !== obj2[key]) {
+        if (
+            obj1[key] === undefined ||
+            JSON.stringify(obj1[key]) !== JSON.stringify(obj2[key])
+        ) {
             diff[key] = obj2[key];
         }
     }
+
     return diff;
 }
 
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 85a82ebe5..8d0e0a9cc 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -926,6 +926,15 @@ export default {
             province: 'Province',
             mobile: 'Mobile',
         },
+        agencyTerms: {
+            agencyFk: 'Agency',
+            minimumM3: 'Minimum M3',
+            packagePrice: 'Package Price',
+            kmPrice: 'Km Price',
+            m3Price: 'M3 Price',
+            routePrice: 'Route price',
+            minimumKm: 'Minimum Km',
+        },
     },
     travel: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 44ce18cc9..96e0177a5 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -925,6 +925,15 @@ export default {
             province: 'Provincia',
             mobile: 'Móvil',
         },
+        agencyTerms: {
+            agencyFk: 'Agencia',
+            minimumM3: 'M3 mínimos',
+            packagePrice: 'Precio bulto',
+            kmPrice: 'Precio Km',
+            m3Price: 'Precio M3',
+            routePrice: 'Precio ruta',
+            minimumKm: 'Km mínimos',
+        },
     },
     travel: {
         pageTitles: {
diff --git a/src/pages/Supplier/Card/SupplierAgencyTerm.vue b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
index 2a0c341cf..a300ae8e7 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTerm.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
@@ -1 +1,139 @@
-<template>Supplier agency term</template>
+<script setup>
+import { ref, onMounted } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import CrudModel from 'components/CrudModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+
+const route = useRoute();
+const router = useRouter();
+const { t } = useI18n();
+const supplierAgencyTermRef = ref(null);
+const agenciesOptions = ref(null);
+
+const supplierAgencyFilter = {
+    include: {
+        relation: 'agency',
+        scope: {
+            fields: ['id', 'name'],
+        },
+    },
+    where: { supplierFk: route.params.id },
+};
+
+const redirectToCreateView = () => {
+    router.push({ name: 'SupplierAgencyTermCreate' });
+};
+
+onMounted(() => {
+    if (supplierAgencyTermRef.value) supplierAgencyTermRef.value.reload();
+});
+</script>
+<template>
+    <FetchData
+        url="Suppliers/freeAgencies"
+        @on-fetch="(data) => (agenciesOptions = data)"
+        auto-load
+    />
+    <CrudModel
+        ref="supplierAgencyTermRef"
+        data-key="SupplierAgencyTerm"
+        save-url="SupplierAgencyTerms/crud"
+        url="SupplierAgencyTerms"
+        model="SupplierAgencyTerm"
+        primary-key="agencyFk"
+        :filter="supplierAgencyFilter"
+        :default-remove="false"
+        :data-required="{
+            supplierFk: route.params.id,
+        }"
+    >
+        <template #body="{ rows }">
+            <QCard class="q-pa-md">
+                <VnRow
+                    v-for="(row, index) in rows"
+                    :key="index"
+                    class="row q-gutter-md q-mb-md"
+                >
+                    <div class="col">
+                        <QField :label="t('supplier.agencyTerms.agencyFk')" stack-label>
+                            <template #control>
+                                <div tabindex="0">
+                                    {{ row.agency?.name }}
+                                </div>
+                            </template>
+                        </QField>
+                    </div>
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.minimumM3')"
+                            v-model.number="row.minimumM3"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.packagePrice')"
+                            v-model.number="row.packagePrice"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.kmPrice')"
+                            v-model.number="row.kmPrice"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.m3Price')"
+                            v-model.number="row.m3Price"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.routePrice')"
+                            v-model.number="row.routePrice"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.minimumKm')"
+                            v-model.number="row.minimumKm"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col-1 row justify-center items-center">
+                        <QIcon
+                            name="delete"
+                            size="sm"
+                            class="cursor-pointer"
+                            color="primary"
+                            @click="supplierAgencyTermRef.remove([row])"
+                        >
+                            <QTooltip>
+                                {{ t('Remove row') }}
+                            </QTooltip>
+                        </QIcon>
+                    </div>
+                </VnRow>
+            </QCard>
+        </template>
+    </CrudModel>
+    <QPageSticky :offset="[20, 20]">
+        <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
+        <QTooltip>
+            {{ t('supplier.list.newSupplier') }}
+        </QTooltip>
+    </QPageSticky>
+</template>
+
+<i18n>
+    es:
+        Remove row: Eliminar fila
+</i18n>
diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
new file mode 100644
index 000000000..00f0b868f
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
@@ -0,0 +1,113 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { reactive, ref } from 'vue';
+import { useRouter, useRoute } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+
+const { t } = useI18n();
+const router = useRouter();
+const route = useRoute();
+
+const agenciesOptions = ref(null);
+const newAgencyTermForm = reactive({
+    agencyFk: null,
+    minimumM3: null,
+    packagePrice: null,
+    kmPrice: null,
+    m3Price: null,
+    routePrice: null,
+    minimumKm: null,
+    supplierFk: route.params.id,
+});
+
+const onDataSaved = () => {
+    router.push({ name: 'SupplierAgencyTerm' });
+};
+</script>
+
+<template>
+    <FetchData
+        url="Suppliers/freeAgencies"
+        @on-fetch="(data) => (agenciesOptions = data)"
+        auto-load
+    />
+
+    <QPage>
+        <FormModel
+            model="supplierAgencyTerm"
+            :form-initial-data="newAgencyTermForm"
+            url-create="SupplierAgencyTerms"
+            :observe-form-changes="true"
+            @on-data-saved="onDataSaved()"
+        >
+            <template #form="{ data }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('supplier.agencyTerms.agencyFk')"
+                            v-model="data.agencyFk"
+                            :options="agenciesOptions"
+                            option-label="name"
+                            option-value="id"
+                            hide-selected
+                            rounded
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.minimumM3')"
+                            v-model.number="data.minimumM3"
+                            type="number"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.packagePrice')"
+                            v-model.number="data.packagePrice"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.kmPrice')"
+                            v-model.number="data.kmPrice"
+                            type="number"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.m3Price')"
+                            v-model.number="data.m3Price"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.routePrice')"
+                            v-model.number="data.routePrice"
+                            type="number"
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QInput
+                            :label="t('supplier.agencyTerms.minimumKm')"
+                            v-model.number="data.minimumKm"
+                            type="number"
+                        />
+                    </div>
+                    <div class="col" />
+                </VnRow>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index df1dead17..4504c8251 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -1 +1,36 @@
-<template>Supplier consumption</template>
+<script setup>
+import { useRoute } from 'vue-router';
+import { ref } from 'vue';
+
+import FetchData from 'components/FetchData.vue';
+
+const route = useRoute();
+
+const suppliersConsumption = ref();
+</script>
+
+<template>
+    <FetchData
+        url="Suppliers/consumption"
+        @on-fetch="(data) => (suppliersConsumption = data)"
+        :filter="{
+            where: { supplierFk: route.params.id },
+            order: ['itemTypeFk', 'itemName', 'itemSize'],
+        }"
+        auto-load
+    />
+    <QToolbar class="bg-vn-dark justify-end">
+        <div id="st-data"></div>
+        <QSpace />
+        <div id="st-actions">
+            <QBtn color="primary" icon-right="archive" no-caps />
+        </div>
+    </QToolbar>
+    <QPage class="column items-center q-pa-md"> </QPage>
+</template>
+
+<style lang="scss" scoped></style>
+
+<i18n>
+es:
+</i18n>
diff --git a/src/router/modules/Supplier.js b/src/router/modules/Supplier.js
index 76b485d6b..d341ddc25 100644
--- a/src/router/modules/Supplier.js
+++ b/src/router/modules/Supplier.js
@@ -160,6 +160,12 @@ export default {
                     component: () =>
                         import('src/pages/Supplier/Card/SupplierAgencyTerm.vue'),
                 },
+                {
+                    path: 'agency-term/create',
+                    name: 'SupplierAgencyTermCreate',
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierAgencyTermCreate.vue'),
+                },
             ],
         },
     ],

From a4a7a48fb617a655e14523347d20f59074425d02 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 9 Jan 2024 14:48:47 +0100
Subject: [PATCH 085/105] refs #6383 fix

---
 src/layouts/MainLayout.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/layouts/MainLayout.vue b/src/layouts/MainLayout.vue
index a0873b7f1..021ee685a 100644
--- a/src/layouts/MainLayout.vue
+++ b/src/layouts/MainLayout.vue
@@ -1,6 +1,5 @@
 <script setup>
-import { onMounted, computed } from 'vue';
-import { Dark, Quasar, useQuasar } from 'quasar';
+import { useQuasar } from 'quasar';
 import Navbar from 'src/components/NavBar.vue';
 const quasar = useQuasar();
 </script>

From b83a773278e5f58aa5534f2633616db631191b19 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 9 Jan 2024 14:55:52 +0100
Subject: [PATCH 086/105] refs #6420 fix pr

---
 src/components/ui/VnNotes.vue         | 1 -
 src/components/ui/VnPaginate.vue      | 3 +--
 src/pages/Claim/Card/ClaimSummary.vue | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 84b1b890d..88348e45a 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -117,7 +117,6 @@ async function insert() {
     max-width: 80em;
 
     &__section {
-        overflow-x: hidden;
         word-wrap: break-word;
     }
 }
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 7470a4d74..3b530dbb1 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -172,8 +172,7 @@ async function onLoad(...params) {
         v-if="store.data"
         @load="onLoad"
         :offset="offset"
-        class="full-width full-height"
-        style="overflow: auto"
+        class="full-width full-height overflow-auto"
     >
         <slot name="body" :rows="store.data"></slot>
         <div v-if="isLoading" class="info-row q-pa-md text-center">
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index fc7bd03b7..906a41bca 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -219,7 +219,7 @@ function openDialog(dmsId) {
                 <ClaimNotes :add-note="false" style="height: 350px" order="created ASC" />
             </QCard>
             <QCard class="vn-max" v-if="salesClaimed.length > 0">
-                <a class="header" :href="`#/claim/${entityId}/notes`">
+                <a class="header" :href="`#/claim/${entityId}/lines`">
                     {{ t('claim.summary.details') }}
                     <QIcon name="open_in_new" color="primary" />
                 </a>

From dfb716eb041f8a74e00c08df43d223f9978d737e Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Tue, 9 Jan 2024 09:22:29 -0500
Subject: [PATCH 087/105] Mejora solicitada

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

diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index b4fe1fd30..ab778670a 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -61,6 +61,7 @@ const onPostcodeCreated = async () => {
                 <div class="col">
                     <VnInput
                         :label="t('Social name')"
+                        :required="true"
                         :rules="validate('client.socialName')"
                         v-model="data.socialName"
                     />

From 9bc60ff3c3322a05b3452868cd9815885a722470 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Tue, 9 Jan 2024 11:59:36 -0500
Subject: [PATCH 088/105] Se crea tarjeta de formas de pago

---
 .../Customer/Card/CustomerBillingData.vue     | 120 +++++++++++++++++-
 1 file changed, 119 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index c14f3b499..cee583f39 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -1,3 +1,121 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const payMethods = ref([]);
+const bankEntitiesOptions = ref([]);
+
+const onBankEntityCreated = (data) => {
+    bankEntitiesOptions.value.push(data);
+};
+</script>
+
 <template>
-    <div class="flex justify-center">Billing data</div>
+    <fetch-data @on-fetch="(data) => (payMethods = data)" auto-load url="PayMethods" />
+    <FetchData
+        @on-fetch="(data) => (bankEntitiesOptions = data)"
+        auto-load
+        url="BankEntities"
+    />
+
+    <FormModel
+        :url-update="`Clients/${route.params.id}`"
+        :url="`Clients/${route.params.id}/getCard`"
+        auto-load
+        model="customer"
+    >
+        <template #form="{ data, validate }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Billing data')"
+                        :options="payMethods"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.payMethod"
+                    />
+                </div>
+                <div class="col">
+                    <VnInput
+                        :label="t('Due day')"
+                        :rules="validate('client.socialName')"
+                        v-model="data.dueDay"
+                    />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput :label="t('IBAN')" v-model="data.iban" />
+                </div>
+                <div class="col">
+                    <VnSelectCreate
+                        :label="t('Swift / BIC')"
+                        :options="bankEntitiesOptions"
+                        :roles-allowed-to-create="['salesAssistant', 'hr']"
+                        :rules="validate('Worker.bankEntity')"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.bankEntityFk"
+                    >
+                        <template #form>
+                            <CreateBankEntityForm
+                                @on-data-saved="onBankEntityCreated($event)"
+                            />
+                        </template>
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection v-if="scope.opt">
+                                    <QItemLabel
+                                        >{{ scope.opt.bic }}
+                                        {{ scope.opt.name }}</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectCreate>
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox :label="t('Received LCR')" v-model="data.hasLcr" />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        :label="t('VNL core received')"
+                        v-model="data.hasCoreVnl"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox :label="t('VNL B2B received')" v-model="data.hasSepaVnl" />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
 </template>
+
+<i18n>
+es:
+    Billing data: Forma de pago
+    Due day: Vencimiento
+    IBAN: IBAN
+    Swift / BIC: Swift / BIC
+    Received LCR: Recibido LCR
+    VNL core received: Recibido core VNL
+    VNL B2B received: Recibido B2B VNL
+</i18n>

From 2555d2b2d1a64c444969b47c305abdfffaf091d4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 10 Jan 2024 11:21:02 +0100
Subject: [PATCH 089/105] feat: refs #6643 create VnUserLink

---
 src/components/common/VnLog.vue               | 22 ++++++-------
 src/components/ui/VnAvatar.vue                |  8 ++---
 src/components/ui/VnNotes.vue                 | 13 ++++----
 src/components/ui/VnSms.vue                   | 16 ++++++----
 src/components/ui/VnUserLink.vue              | 21 ++++++++++++
 src/i18n/en/index.js                          |  1 +
 src/i18n/es/index.js                          |  1 +
 src/pages/Claim/Card/ClaimDescriptor.vue      | 20 ++++++------
 src/pages/Claim/Card/ClaimSummary.vue         | 32 ++++++-------------
 src/pages/Claim/ClaimList.vue                 | 10 +++---
 .../Customer/Card/CustomerDescriptor.vue      | 10 +++---
 src/pages/InvoiceIn/Card/InvoiceInCard.vue    |  7 ++--
 .../InvoiceOut/InvoiceOutNegativeBases.vue    |  6 ++--
 .../Shelving/Card/ShelvingDescriptor.vue      | 14 ++++----
 src/pages/Supplier/Card/SupplierSummary.vue   | 13 +++-----
 src/pages/Ticket/Card/TicketDescriptor.vue    | 13 +++-----
 src/pages/Ticket/Card/TicketSummary.vue       | 13 +++-----
 src/pages/Worker/Card/WorkerSummary.vue       | 18 +++++------
 src/stores/useStateStore.js                   |  1 +
 19 files changed, 118 insertions(+), 121 deletions(-)
 create mode 100644 src/components/ui/VnUserLink.vue

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 0949fb5cb..781d78ba8 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -12,8 +12,8 @@ import { useValidator } from 'src/composables/useValidator';
 import VnAvatar from '../ui/VnAvatar.vue';
 import VnJsonValue from '../common/VnJsonValue.vue';
 import FetchData from '../FetchData.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import VnSelectFilter from './VnSelectFilter.vue';
+import VnUserLink from '../ui/VnUserLink.vue';
 
 const stateStore = useStateStore();
 const validationsStore = useValidator();
@@ -421,15 +421,15 @@ setLogTree();
         >
             <div class="timeline">
                 <div class="user-avatar">
-                    <VnAvatar
-                        class="cursor-pointer"
-                        :worker="userLog.user.id"
-                        :title="userLog.user.nickname"
-                    />
-                    <WorkerDescriptorProxy
-                        v-if="userLog.user.image"
-                        :id="userLog.user.id"
-                    />
+                    <VnUserLink v-if="userLog.user.image" :worker-id="userLog.user.id">
+                        <template #link>
+                            <VnAvatar
+                                :class="{ 'cursor-pointer': userLog.user.id }"
+                                :worker-id="userLog.user.id"
+                                :title="userLog.user.nickname"
+                            />
+                        </template>
+                    </VnUserLink>
                 </div>
                 <div class="arrow bg-panel" v-if="byRecord"></div>
                 <div class="line"></div>
@@ -704,7 +704,7 @@ setLogTree();
                                     class="q-pa-xs row items-center"
                                 >
                                     <QItemSection class="col-3 items-center">
-                                        <VnAvatar :worker="opt.id" />
+                                        <VnAvatar :worker-id="opt.id" />
                                     </QItemSection>
                                     <QItemSection class="col-9 justify-center">
                                         <span>{{ opt.name }}</span>
diff --git a/src/components/ui/VnAvatar.vue b/src/components/ui/VnAvatar.vue
index 85bece243..8915eba2c 100644
--- a/src/components/ui/VnAvatar.vue
+++ b/src/components/ui/VnAvatar.vue
@@ -1,10 +1,9 @@
 <script setup>
 import { useSession } from 'src/composables/useSession';
-import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
+
 const $props = defineProps({
-    worker: { type: Number, required: true },
+    workerId: { type: Number, required: true },
     description: { type: String, default: null },
-    clickable: { type: Boolean, default: false },
 });
 const session = useSession();
 const token = session.getToken();
@@ -13,7 +12,7 @@ const token = session.getToken();
     <div class="avatar-picture column items-center">
         <QAvatar color="orange">
             <QImg
-                :src="`/api/Images/user/160x160/${$props.worker}/download?access_token=${token}`"
+                :src="`/api/Images/user/160x160/${$props.workerId}/download?access_token=${token}`"
                 spinner-color="white"
             />
         </QAvatar>
@@ -24,6 +23,5 @@ const token = session.getToken();
                 </p>
             </slot>
         </div>
-        <WorkerDescriptorProxy :v-if="$props.clickable" :id="$props.worker" />
     </div>
 </template>
diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 88348e45a..fac74837f 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -1,11 +1,11 @@
 <script setup>
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import VnAvatar from 'src/components/ui/VnAvatar.vue';
 import { toDateHour } from 'src/filters';
 import { ref } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from './VnPaginate.vue';
+import VnUserLink from '../ui/VnUserLink.vue';
 
 const $props = defineProps({
     id: { type: String, required: true },
@@ -42,13 +42,14 @@ async function insert() {
                 <QCard class="q-pa-md q-mb-md" v-for="(note, index) in rows" :key="index">
                     <QCardSection horizontal>
                         <slot name="picture">
-                            <VnAvatar :worker="note.workerFk" />
+                            <VnAvatar :descriptor="false" :worker-id="note.workerFk" />
                         </slot>
                         <QItem class="full-width justify-between items-start">
-                            <span class="link">
-                                {{ `${note.worker.firstName} ${note.worker.lastName}` }}
-                                <WorkerDescriptorProxy :id="note.worker.id" />
-                            </span>
+                            <VnUserLink
+                                :name="`${note.worker.firstName} ${note.worker.lastName}`"
+                                :worker-id="note.worker.id"
+                            />
+
                             <slot name="actions">
                                 {{ toDateHour(note.created) }}
                             </slot>
diff --git a/src/components/ui/VnSms.vue b/src/components/ui/VnSms.vue
index 625fdec77..ceb24b2bb 100644
--- a/src/components/ui/VnSms.vue
+++ b/src/components/ui/VnSms.vue
@@ -3,6 +3,7 @@ import { onBeforeMount } from 'vue';
 import { date } from 'quasar';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnAvatar from '../ui/VnAvatar.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const $props = defineProps({
     url: { type: String, default: null },
@@ -63,12 +64,15 @@ function formatNumber(number) {
                     >
                         <QItem>
                             <QItemSection side top>
-                                <VnAvatar
-                                    class="cursor-pointer"
-                                    :worker="row.sms.senderFk"
-                                    :title="row.sms.sender.name"
-                                    :clickable="true"
-                                />
+                                <VnUserLink :worker-id="row.sms?.senderFk">
+                                    <template #link>
+                                        <VnAvatar
+                                            :worker-id="row.sms?.senderFk"
+                                            class="cursor-pointer"
+                                            :title="row.sms?.sender?.name"
+                                        />
+                                    </template>
+                                </VnUserLink>
                             </QItemSection>
                             <QSeparator />
                             <QItemSection>
diff --git a/src/components/ui/VnUserLink.vue b/src/components/ui/VnUserLink.vue
new file mode 100644
index 000000000..33836550a
--- /dev/null
+++ b/src/components/ui/VnUserLink.vue
@@ -0,0 +1,21 @@
+<script setup>
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import { useI18n } from 'vue-i18n';
+
+const $props = defineProps({
+    name: { type: String, default: null },
+    workerId: { type: Number, default: null },
+    defaultName: { type: Boolean, default: false },
+});
+
+const { t } = useI18n();
+</script>
+<template>
+    <slot name="link">
+        <span :class="{ link: $props.workerId }">
+            {{ $props.defaultName ? $props.name ?? t('globals.system') : $props.name }}
+        </span>
+    </slot>
+    <WorkerDescriptorProxy v-if="$props.workerId" :id="$props.workerId" />
+</template>
+<style scoped></style>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 679387aa6..815a7b3b4 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -63,6 +63,7 @@ export default {
         selectRows: 'Select all { numberRows } row(s)',
         allRows: 'All { numberRows } row(s)',
         markAll: 'Mark all',
+        system: 'System',
     },
     errors: {
         statusUnauthorized: 'Access denied',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index c2d3c2dd9..f3ece1065 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -62,6 +62,7 @@ export default {
         selectRows: 'Seleccionar las { numberRows } filas(s)',
         allRows: 'Todo { numberRows } filas(s)',
         markAll: 'Marcar todo',
+        system: 'Sistema',
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 85ae9f7e1..4f2703e71 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -4,14 +4,12 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'src/filters';
 import { useState } from 'src/composables/useState';
-
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const $props = defineProps({
     id: {
@@ -118,18 +116,18 @@ const setData = (entity) => {
                 :value="entity.worker.user.name"
             >
                 <template #value>
-                    <span class="link">
-                        {{ entity.worker.user.name }}
-                        <WorkerDescriptorProxy :id="entity.worker.user.id" />
-                    </span>
+                    <VnUserLink
+                        :name="entity.worker.user.name"
+                        :worker-id="entity.worker.id"
+                    />
                 </template>
             </VnLv>
             <VnLv :label="t('claim.card.commercial')">
                 <template #value>
-                    <span class="link">
-                        {{ entity.client?.salesPersonUser?.name }}
-                        <WorkerDescriptorProxy :id="entity.client?.salesPersonFk" />
-                    </span>
+                    <VnUserLink
+                        :name="entity.client?.salesPersonUser?.name"
+                        :worker-id="entity.client?.salesPersonFk"
+                    />
                 </template>
             </VnLv>
             <VnLv
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 906a41bca..dcd236027 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -7,9 +7,9 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import FetchData from 'components/FetchData.vue';
 import { getUrl } from 'src/composables/getUrl';
 import { useSession } from 'src/composables/useSession';
-import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -196,18 +196,18 @@ function openDialog(dmsId) {
                 </VnLv>
                 <VnLv :label="t('claim.summary.assignedTo')">
                     <template #value>
-                        <span class="link">
-                            {{ claim.worker.user.nickname }}
-                            <WorkerDescriptorProxy :id="claim.workerFk" />
-                        </span>
+                        <VnUserLink
+                            :name="claim.worker?.user?.nickname"
+                            :worker-id="claim.workerFk"
+                        />
                     </template>
                 </VnLv>
                 <VnLv :label="t('claim.summary.attendedBy')">
                     <template #value>
-                        <span class="link">
-                            {{ claim.client.salesPersonUser.name }}
-                            <WorkerDescriptorProxy :id="claim.client.salesPersonFk" />
-                        </span>
+                        <VnUserLink
+                            :name="claim.client?.salesPersonUser?.name"
+                            :worker-id="claim.client?.salesPersonFk"
+                        />
                     </template>
                 </VnLv>
             </QCard>
@@ -313,20 +313,6 @@ function openDialog(dmsId) {
                     />
                 </div>
             </QCard>
-            <!-- <QCardSection class="q-pa-md" v-if="observations.length > 0">
-                <h6>{{ t('claim.summary.notes') }}</h6>
-                <div class="note-list" v-for="note in observations" :key="note.id">
-                    <div class="note-caption">
-                        <span
-                            >{{ note.worker.firstName }} {{ note.worker.lastName }}
-                        </span>
-                        <span>{{ toDate(note.created) }}</span>
-                    </div>
-                    <div class="note-text">
-                        <span>{{ note.text }}</span>
-                    </div>
-                </div>
-            </QCardSection> -->
             <QDialog
                 v-model="multimediaDialog"
                 transition-show="slide-up"
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index 22f6fb8f0..55a244995 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -11,7 +11,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import ClaimSummaryDialog from './Card/ClaimSummaryDialog.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
-import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -98,10 +98,10 @@ function viewSummary(id) {
                             </VnLv>
                             <VnLv :label="t('claim.list.assignedTo')" @click.stop>
                                 <template #value>
-                                    <span class="link">
-                                        {{ row.workerName }}
-                                        <WorkerDescriptorProxy :id="row.workerFk" />
-                                    </span>
+                                    <VnUserLink
+                                        :name="row.workerName"
+                                        :worker-id="row.workerFk"
+                                    />
                                 </template>
                             </VnLv>
                             <VnLv
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 282a4b958..222406d8a 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -4,9 +4,9 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toCurrency } from 'src/filters';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const $props = defineProps({
     id: {
@@ -44,10 +44,10 @@ const setData = (entity) => (data.value = useCardDescription(entity.name, entity
         <template #body="{ entity }">
             <VnLv v-if="entity.salesPersonUser" :label="t('customer.card.salesPerson')">
                 <template #value>
-                    <span class="link">
-                        {{ entity.salesPersonUser.name }}
-                        <WorkerDescriptorProxy :id="entity.salesPersonFk" />
-                    </span>
+                    <VnUserLink
+                        :name="entity.salesPersonUser?.name"
+                        :worker-id="entity.salesPersonFk"
+                    />
                 </template>
             </VnLv>
             <VnLv :label="t('customer.card.credit')" :value="toCurrency(entity.credit)" />
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index 4d06cb41e..d76352fcf 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -7,6 +7,7 @@ import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { onMounted, watch } from 'vue';
 import { useRoute } from 'vue-router';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -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/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 7d07b8217..783023316 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -2,12 +2,12 @@
 import { onMounted, ref, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import invoiceOutService from 'src/services/invoiceOut.service';
 import { toCurrency } from 'src/filters';
 import { QCheckbox, QBtn } from 'quasar';
 import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const invoiceOutGlobalStore = useInvoiceOutGlobalStore();
 
@@ -345,9 +345,9 @@ onMounted(() => refresh());
                             v-if="props.col.name === 'clientId'"
                             :id="selectedCustomerId"
                         />
-                        <WorkerDescriptorProxy
+                        <VnUserLink
                             v-if="props.col.name === 'comercial'"
-                            :id="selectedWorkerId"
+                            :worker-id="selectedWorkerId"
                         />
                     </component>
                 </QTd>
diff --git a/src/pages/Shelving/Card/ShelvingDescriptor.vue b/src/pages/Shelving/Card/ShelvingDescriptor.vue
index 34c374117..6beca6d88 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptor.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptor.vue
@@ -5,8 +5,8 @@ import { useI18n } from 'vue-i18n';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import useCardDescription from 'composables/useCardDescription';
-import WorkerDescriptorProxy from "pages/Worker/Card/WorkerDescriptorProxy.vue";
-import ShelvingDescriptorMenu from "pages/Shelving/Card/ShelvingDescriptorMenu.vue";
+import ShelvingDescriptorMenu from 'pages/Shelving/Card/ShelvingDescriptorMenu.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const $props = defineProps({
     id: {
@@ -57,14 +57,14 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
             <VnLv :label="t('shelving.summary.parking')" :value="entity.parking?.code" />
             <VnLv v-if="entity.worker" :label="t('shelving.summary.worker')">
                 <template #value>
-                    <span class="link">
-                        {{ entity.worker?.user?.nickname }}
-                        <WorkerDescriptorProxy :id="entity.worker?.id" />
-                    </span>
+                    <VnUserLink
+                        :name="entity.worker?.user?.nickname"
+                        :worker-id="entity.worker?.id"
+                    />
                 </template>
             </VnLv>
         </template>
-        <template #menu="{entity}">
+        <template #menu="{ entity }">
             <ShelvingDescriptorMenu :shelving="entity" />
         </template>
     </CardDescriptor>
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index e9fbffe96..2cc37ec4f 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -3,11 +3,11 @@ import { onMounted, ref, computed, onUpdated } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
-import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import { getUrl } from 'src/composables/getUrl';
 import { useRole } from 'src/composables/useRole';
 import { dashIfEmpty } from 'src/filters';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 onUpdated(() => summaryRef.value.fetch());
 
@@ -71,13 +71,10 @@ const isAdministrative = computed(() => {
                 <VnLv label="Alias" :value="supplier.nickname" />
                 <VnLv :label="t('supplier.summary.responsible')">
                     <template #value>
-                        <span class="link">
-                            {{ dashIfEmpty(supplier.worker?.user?.nickname) }}
-                            <WorkerDescriptorProxy
-                                v-if="supplier.worker?.user?.id"
-                                :id="supplier.worker?.user?.id"
-                            />
-                        </span>
+                        <VnUserLink
+                            :name="dashIfEmpty(supplier.worker?.user?.nickname)"
+                            :worker-id="supplier.worker?.user?.id"
+                        />
                     </template>
                 </VnLv>
                 <VnLv :label="t('supplier.summary.notes')" class="q-mb-xs">
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index d2a407874..37ed13c2e 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -8,7 +8,7 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const $props = defineProps({
     id: {
@@ -106,13 +106,10 @@ const setData = (entity) =>
             </VnLv>
             <VnLv :label="t('ticket.summary.salesPerson')">
                 <template #value>
-                    <span class="link">
-                        {{ entity.client.salesPersonUser.name }}
-                        <WorkerDescriptorProxy
-                            :id="entity.client.salesPersonFk"
-                            v-if="entity.client.salesPersonFk"
-                        />
-                    </span>
+                    <VnUserLink
+                        :name="entity.client.salesPersonUser?.name"
+                        :worker-id="entity.client.salesPersonFk"
+                    />
                 </template>
             </VnLv>
             <VnLv :label="t('ticket.card.warehouse')" :value="entity.warehouse?.name" />
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 4114b0c8e..65523bb82 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -8,10 +8,10 @@ import CardSummary from 'components/ui/CardSummary.vue';
 import FetchData from 'components/FetchData.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
-import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { getUrl } from 'src/composables/getUrl';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 onUpdated(() => summaryRef.value.fetch());
 
@@ -160,13 +160,10 @@ async function changeState(value) {
                 </VnLv>
                 <VnLv :label="t('ticket.summary.salesPerson')">
                     <template #value>
-                        <span class="link">
-                            {{ ticket.client?.salesPersonUser?.name }}
-                            <WorkerDescriptorProxy
-                                :id="ticket.client.salesPersonFk"
-                                v-if="ticket.client.salesPersonFk"
-                            />
-                        </span>
+                        <VnUserLink
+                            :name="ticket.client?.salesPersonUser?.name"
+                            :worker-id="ticket.client?.salesPersonFk"
+                        />
                     </template>
                 </VnLv>
                 <VnLv
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 970a0dee4..26328b9cd 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -2,12 +2,12 @@
 import { ref, onMounted, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import CardSummary from 'components/ui/CardSummary.vue';
+import { dashIfEmpty } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';
 import VnLv from 'src/components/ui/VnLv.vue';
-import WorkerDescriptorProxy from './WorkerDescriptorProxy.vue';
-import { dashIfEmpty } from 'src/filters';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -83,13 +83,11 @@ const filter = {
                 <VnLv :label="t('worker.list.email')" :value="worker.user.email" />
                 <VnLv :label="t('worker.summary.boss')" link>
                     <template #value>
-                        <span class="link">
-                            {{ dashIfEmpty(worker.boss?.name) }}
-                            <WorkerDescriptorProxy
-                                :id="worker.bossFk"
-                                v-if="worker.boss"
-                            />
-                        </span>
+                        <VnUserLink
+                            v-if="worker.boss"
+                            :name="dashIfEmpty(worker.boss?.name)"
+                            :worker-id="worker.bossFk"
+                        />
                     </template>
                 </VnLv>
                 <VnLv :value="worker.mobileExtension">
diff --git a/src/stores/useStateStore.js b/src/stores/useStateStore.js
index 328df9978..8278f2e66 100644
--- a/src/stores/useStateStore.js
+++ b/src/stores/useStateStore.js
@@ -36,6 +36,7 @@ export const useStateStore = defineStore('stateStore', () => {
     }
 
     function isSubToolbarShown() {
+        console.log('ye', subToolbar.value);
         return subToolbar.value;
     }
 

From 53a832ae6a4a429e390e8bed229889610b56a633 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 10 Jan 2024 09:54:23 -0300
Subject: [PATCH 090/105] supplier consumption submodule

---
 src/i18n/en/index.js                          |   5 +
 src/i18n/es/index.js                          |   5 +
 .../Supplier/Card/SupplierConsumption.vue     | 170 +++++++++++++++++-
 src/pages/Travel/ExtraCommunity.vue           |  12 +-
 4 files changed, 184 insertions(+), 8 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 8d0e0a9cc..205f919eb 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -935,6 +935,11 @@ export default {
             routePrice: 'Route price',
             minimumKm: 'Minimum Km',
         },
+        consumption: {
+            entry: 'Entry',
+            date: 'Date',
+            reference: 'Reference',
+        },
     },
     travel: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 96e0177a5..352e67046 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -934,6 +934,11 @@ export default {
             routePrice: 'Precio ruta',
             minimumKm: 'Km mínimos',
         },
+        consumption: {
+            entry: 'Entrada',
+            date: 'Fecha',
+            reference: 'Referencia',
+        },
     },
     travel: {
         pageTitles: {
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 4504c8251..714499f63 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -1,12 +1,96 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
 
 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 { openReport, sendEmail } = usePrintService();
+const quasar = useQuasar();
+const { notify } = useNotify();
 
 const suppliersConsumption = ref();
+
+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 reportParams = computed(() => ({
+    recipientId: Number(route.params.id),
+    ...userParams.value,
+}));
+
+const rows = computed(() => suppliersConsumption.value || []);
+
+const openReportPdf = () => {
+    openReport(`Suppliers/${route.params.id}/campaign-metrics-pdf`, reportParams.value);
+};
+
+const getSupplierContacts = async () => {
+    try {
+        const params = {
+            filter: {
+                where: {
+                    supplierFk: route.params.id,
+                    email: { neq: null },
+                },
+                limit: 1,
+            },
+        };
+
+        const { data } = await axios.get('SupplierContacts', params);
+
+        if (data && data.length) return data[0].email;
+    } catch (err) {
+        notify('This supplier does not have a contact with an email address', 'negative');
+        console.error('Error fetching supplierContacts: ', err);
+    }
+};
+
+const openSendEmailDialog = async () => {
+    const email = await getSupplierContacts();
+    quasar.dialog({
+        component: SendEmailDialog,
+        componentProps: {
+            data: {
+                address: email,
+            },
+            promise: sendCampaignMetricsEmail,
+        },
+    });
+};
+
+const sendCampaignMetricsEmail = ({ address }) => {
+    sendEmail(`Suppliers/${route.params.id}/campaign-metrics-email`, {
+        recipient: address,
+        ...reportParams.value,
+    });
+};
+
+const calculateTotal = (buysArray) => {
+    return buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
+};
 </script>
 
 <template>
@@ -17,20 +101,92 @@ const suppliersConsumption = ref();
             where: { supplierFk: route.params.id },
             order: ['itemTypeFk', 'itemName', 'itemSize'],
         }"
+        :params="userParams"
         auto-load
     />
     <QToolbar class="bg-vn-dark justify-end">
-        <div id="st-data"></div>
-        <QSpace />
-        <div id="st-actions">
-            <QBtn color="primary" icon-right="archive" no-caps />
+        <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>
-    <QPage class="column items-center q-pa-md"> </QPage>
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :rows="rows"
+            hide-bottom
+            row-key="id"
+            hide-header
+            :pagination="{ rowsPerPage: 0 }"
+            class="full-width q-mt-md"
+        >
+            <template #body="{ row }">
+                <QTr>
+                    <QTd no-hover class="label">{{
+                        t('supplier.consumption.entry')
+                    }}</QTd>
+                    <QTd no-hover>{{ row.id }}</QTd>
+                    <QTd no-hover class="label">{{ t('supplier.consumption.date') }}</QTd>
+                    <QTd no-hover>{{ toDate(row.shipped) }}</QTd>
+                    <QTd no-hover class="label">{{
+                        t('supplier.consumption.reference')
+                    }}</QTd>
+                    <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>
+                        <span>{{ buy.subName }}</span>
+                        <fetched-tags :item="buy" :max-length="5" />
+                    </QTd>
+                    <QTd no-hover> {{ dashIfEmpty(buy.quantity) }}</QTd>
+                    <QTd no-hover> {{ dashIfEmpty(buy.price) }}</QTd>
+                    <QTd colspan="2" no-hover> {{ dashIfEmpty(buy.total) }}</QTd>
+                </QTr>
+                <QTr>
+                    <QTd colspan="6" no-hover>
+                        <span class="label">{{ t('Total entry') }}: </span>
+                        <span>{{ calculateTotal(row.buys) }}</span>
+                    </QTd>
+                </QTr>
+            </template>
+        </QTable>
+    </QPage>
 </template>
 
-<style lang="scss" scoped></style>
+<style scoped lang="scss">
+.label {
+    color: var(--vn-label);
+}
+</style>
 
 <i18n>
 es:
+    Total entry: Total entrada
+    Open as PDF: Abrir como PDF
+    Send to email: Enviar por email
+    This supplier does not have a contact with an email address: Este proveedor no tiene un email de contacto
 </i18n>
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index 62292f115..b9f4f002e 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -262,7 +262,16 @@ onMounted(async () => {
         <div id="st-data"></div>
         <QSpace />
         <div id="st-actions">
-            <QBtn color="primary" icon-right="archive" no-caps @click="openReportPdf()" />
+            <QBtn
+                color="primary"
+                icon-right="picture_as_pdf"
+                no-caps
+                @click="openReportPdf()"
+            >
+                <QTooltip>
+                    {{ t('Open as PDF') }}
+                </QTooltip>
+            </QBtn>
         </div>
     </QToolbar>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
@@ -415,4 +424,5 @@ es:
     physicKg: KG físico
     shipped: F. envío
     landed: F. llegada
+    Open as PDF: Abrir como PDF
 </i18n>

From 315c089936b551e14c5a7652ce8111c25408e1e9 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 10 Jan 2024 14:01:36 +0100
Subject: [PATCH 091/105] fix: refs #6643 fix tests

---
 test/cypress/support/commands.js | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 4dfde6e21..fc3a593ad 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -138,23 +138,20 @@ Cypress.Commands.add('validateRow', (rowSelector, expectedValues) => {
 
 Cypress.Commands.add('removeRow', (rowIndex) => {
     let rowsBefore;
-    let rowsAfter;
-
-    cy.get('tr')
+    cy.get('tbody > tr:visible')
         .its('length')
         .then((length) => {
-            rowsBefore = length;
             cy.get('.q-checkbox').eq(rowIndex).click();
             cy.removeCard();
             cy.get('.q-dialog button').eq(2).click();
+            rowsBefore = length;
         })
         .then(() => {
-            cy.get('tr')
-                .its('length')
-                .then((length) => {
-                    rowsAfter = length;
-                    expect(rowsBefore).to.eq(rowsAfter + 1);
-                });
+            // Check the existence of tbody before performing the second assertion.
+            cy.get('tbody').then(($tbody) => {
+                if ($tbody.length > 0)
+                    cy.get('tbody > tr:visible').should('have.length', rowsBefore - 1);
+            });
         });
 });
 Cypress.Commands.add('openListSummary', (row) => {

From fb4c371371b88de92c21951049b193842c7e7452 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 10 Jan 2024 14:36:30 +0100
Subject: [PATCH 092/105] fix: refs #6643 remove console log

---
 src/stores/useStateStore.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/stores/useStateStore.js b/src/stores/useStateStore.js
index 8278f2e66..328df9978 100644
--- a/src/stores/useStateStore.js
+++ b/src/stores/useStateStore.js
@@ -36,7 +36,6 @@ export const useStateStore = defineStore('stateStore', () => {
     }
 
     function isSubToolbarShown() {
-        console.log('ye', subToolbar.value);
         return subToolbar.value;
     }
 

From 9aeba371409b830e6b581cb4ab50be7367e8ce5e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 10 Jan 2024 12:11:49 -0300
Subject: [PATCH 093/105] Autocomplete postcodes

---
 src/components/CreateNewPostcodeForm.vue      |  4 ++--
 src/components/FormModelPopup.vue             |  6 +++---
 .../Customer/Card/CustomerFiscalData.vue      | 20 +++++++++++++------
 src/pages/Customer/CustomerCreate.vue         |  9 ++++++---
 .../Supplier/Card/SupplierFiscalData.vue      |  8 ++++++--
 src/pages/Worker/WorkerCreate.vue             |  8 ++++++--
 6 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 3504445f8..a9efcf8f4 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -28,8 +28,8 @@ const countriesOptions = ref([]);
 const provincesOptions = ref([]);
 const townsLocationOptions = ref([]);
 
-const onDataSaved = () => {
-    emit('onDataSaved');
+const onDataSaved = (dataSaved) => {
+    emit('onDataSaved', dataSaved);
 };
 
 const onCityCreated = async () => {
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index c314f6897..04322a3c8 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -42,8 +42,8 @@ const { t } = useI18n();
 const closeButton = ref(null);
 const isLoading = ref(false);
 
-const onDataSaved = () => {
-    emit('onDataSaved');
+const onDataSaved = (dataSaved) => {
+    emit('onDataSaved', dataSaved);
     closeForm();
 };
 
@@ -59,7 +59,7 @@ const closeForm = () => {
         :default-actions="false"
         :url-create="urlCreate"
         :model="model"
-        @on-data-saved="onDataSaved()"
+        @on-data-saved="onDataSaved($event)"
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index ab778670a..e7e626a99 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -22,8 +22,12 @@ const provincesLocationOptions = ref([]);
 const countriesOptions = ref([]);
 const postcodesOptions = ref([]);
 
-const onPostcodeCreated = async () => {
+const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formData) => {
     postcodeFetchDataRef.value.fetch();
+    formData.postcode = code;
+    formData.provinceFk = provinceFk;
+    formData.city = citiesLocationOptions.value.find((town) => town.id === townFk).name;
+    formData.countryFk = countryFk;
 };
 </script>
 
@@ -49,7 +53,12 @@ const onPostcodeCreated = async () => {
         auto-load
         url="Countries"
     />
-
+    <FetchData
+        ref="postcodeFetchDataRef"
+        url="Postcodes/location"
+        @on-fetch="(data) => (postcodesOptions = data)"
+        auto-load
+    />
     <FormModel
         :url-update="`Clients/${route.params.id}/updateFiscalData`"
         :url="`Clients/${route.params.id}/getCard`"
@@ -114,7 +123,7 @@ const onPostcodeCreated = async () => {
                     >
                         <template #form>
                             <CustomerCreateNewPostcode
-                                @on-data-saved="onPostcodeCreated($event)"
+                                @on-data-saved="onPostcodeCreated($event, data)"
                             />
                         </template>
                         <template #option="scope">
@@ -136,7 +145,6 @@ const onPostcodeCreated = async () => {
                     </VnSelectCreate>
                 </div>
                 <div class="col">
-                    <!-- ciudades -->
                     <VnSelectFilter
                         :label="t('City')"
                         :options="citiesLocationOptions"
@@ -169,7 +177,7 @@ const onPostcodeCreated = async () => {
                         hide-selected
                         option-label="name"
                         option-value="id"
-                        v-model="data.province"
+                        v-model="data.provinceFk"
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
@@ -189,7 +197,7 @@ const onPostcodeCreated = async () => {
                         hide-selected
                         option-label="country"
                         option-value="id"
-                        v-model="data.country"
+                        v-model="data.countryFk"
                     />
                 </div>
             </VnRow>
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 7b7aae11c..791135f1f 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -36,8 +36,12 @@ const provincesLocationOptions = ref([]);
 const countriesOptions = ref([]);
 const postcodesOptions = ref([]);
 
-const onPostcodeCreated = async () => {
+const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formData) => {
     postcodeFetchDataRef.value.fetch();
+    formData.postcode = code;
+    formData.provinceFk = provinceFk;
+    formData.city = citiesLocationOptions.value.find((town) => town.id === townFk).name;
+    formData.countryFk = countryFk;
 };
 </script>
 
@@ -81,7 +85,6 @@ const onPostcodeCreated = async () => {
         </QToolbar>
         <FormModel
             :form-initial-data="newClientForm"
-            :observe-form-changes="false"
             model="client"
             url-create="Clients/createWithUser"
         >
@@ -148,7 +151,7 @@ const onPostcodeCreated = async () => {
                         >
                             <template #form>
                                 <CustomerCreateNewPostcode
-                                    @on-data-saved="onPostcodeCreated($event)"
+                                    @on-data-saved="onPostcodeCreated($event, data)"
                                 />
                             </template>
                             <template #option="scope">
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index ebf1b96b6..806c25c09 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -24,8 +24,12 @@ const provincesLocationOptions = ref([]);
 const townsLocationOptions = ref([]);
 const countriesOptions = ref([]);
 
-const onPostcodeCreated = async () => {
+const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formData) => {
     postcodeFetchDataRef.value.fetch();
+    formData.postcode = code;
+    formData.provinceFk = provinceFk;
+    formData.city = townsLocationOptions.value.find((town) => town.id === townFk).name;
+    formData.countryFk = countryFk;
 };
 </script>
 <template>
@@ -179,7 +183,7 @@ const onPostcodeCreated = async () => {
                     >
                         <template #form>
                             <CustomerCreateNewPostcode
-                                @on-data-saved="onPostcodeCreated($event)"
+                                @on-data-saved="onPostcodeCreated($event, data)"
                             />
                         </template>
                         <template #option="scope">
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 66b6e4cd8..ce623e6c1 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -65,8 +65,11 @@ const onBankEntityCreated = (data) => {
     bankEntitiesOptions.value.push(data);
 };
 
-const onPostcodeCreated = async () => {
+const onPostcodeCreated = async ({ code, provinceFk, townFk }, formData) => {
     postcodeFetchDataRef.value.fetch();
+    formData.postcode = code;
+    formData.provinceFk = provinceFk;
+    formData.city = townsOptions.value.find((town) => town.id === townFk).name;
 };
 
 onMounted(async () => {
@@ -193,7 +196,7 @@ onMounted(async () => {
                         >
                             <template #form>
                                 <CustomerCreateNewPostcode
-                                    @on-data-saved="onPostcodeCreated($event)"
+                                    @on-data-saved="onPostcodeCreated($event, data)"
                                 />
                             </template>
                             <template #option="scope">
@@ -360,6 +363,7 @@ onMounted(async () => {
                         </template>
                     </VnSelectCreate>
                 </VnRow>
+                <pre>{{ data }}</pre>
             </template>
         </FormModel>
     </QPage>

From c362b31fb8819d8000223fa19918bfff90c62f90 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 11 Jan 2024 12:05:29 +0100
Subject: [PATCH 094/105] refs #6595 fix: VnSelectFilter fix: invoiceIn

---
 src/components/FetchData.vue                  |  6 +--
 src/components/common/VnSelectFilter.vue      | 38 +++++++++++------
 src/i18n/en/index.js                          |  1 +
 src/i18n/es/index.js                          |  1 +
 src/pages/Claim/Card/ClaimDevelopment.vue     |  9 +---
 src/pages/Customer/Card/CustomerCard.vue      |  7 +---
 src/pages/Customer/CustomerCreate.vue         |  7 +---
 .../Notifications/CustomerNotifications.vue   |  7 +---
 src/pages/Department/Card/DepartmentCard.vue  |  8 ++--
 src/pages/Entry/Card/EntryCard.vue            |  8 ++--
 src/pages/Entry/EntryCreate.vue               |  7 +---
 .../InvoiceIn/Card/InvoiceInBasicData.vue     | 42 ++++++++++++++-----
 src/pages/InvoiceIn/Card/InvoiceInCard.vue    |  7 +---
 .../InvoiceOut/InvoiceOutNegativeBases.vue    |  7 +---
 src/pages/Order/Card/OrderCard.vue            |  2 +
 src/pages/Order/Card/OrderForm.vue            |  8 +---
 src/pages/Supplier/Card/SupplierCard.vue      |  8 ++--
 .../Supplier/Card/SupplierDescriptor.vue      |  4 +-
 src/pages/Supplier/SupplierCreate.vue         |  7 +---
 src/pages/Ticket/Card/TicketCard.vue          |  8 ++--
 src/pages/Travel/Card/TravelCard.vue          |  8 ++--
 src/pages/Travel/TravelCreate.vue             |  8 +---
 src/pages/Worker/Card/WorkerCard.vue          |  8 ++--
 src/pages/Worker/WorkerCreate.vue             |  7 +---
 src/stores/useNavigationStore.js              |  1 -
 25 files changed, 105 insertions(+), 119 deletions(-)

diff --git a/src/components/FetchData.vue b/src/components/FetchData.vue
index b8e7c2ac3..137f751db 100644
--- a/src/components/FetchData.vue
+++ b/src/components/FetchData.vue
@@ -30,7 +30,7 @@ const $props = defineProps({
     params: {
         type: Object,
         default: null,
-    }
+    },
 });
 
 const emit = defineEmits(['onFetch']);
@@ -42,9 +42,9 @@ onMounted(async () => {
     }
 });
 
-async function fetch() {
+async function fetch(fetchFilter = {}) {
     try {
-        const filter = Object.assign({}, $props.filter); // eslint-disable-line vue/no-dupe-keys
+        const filter = Object.assign(fetchFilter, $props.filter); // eslint-disable-line vue/no-dupe-keys
         if ($props.where) filter.where = $props.where;
         if ($props.sortBy) filter.order = $props.sortBy;
         if ($props.limit) filter.limit = $props.limit;
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index f2fd2a311..244fb50bb 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, toRefs, computed } from 'vue';
+import { ref, toRefs, computed, watch } from 'vue';
 const emit = defineEmits(['update:modelValue', 'update:options']);
 
 const $props = defineProps({
@@ -23,13 +23,31 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    defaultFilter: {
+        type: Boolean,
+        default: true,
+    },
 });
 
-const { optionLabel } = toRefs($props);
+const { optionLabel, options } = toRefs($props);
 const myOptions = ref([]);
-const myOptionsOriginal = computed(() => $props.options);
-const vnSelectRef = ref(null);
+const myOptionsOriginal = ref([]);
+const vnSelectRef = ref();
 
+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();
 
@@ -53,7 +71,8 @@ const filter = (val, options) => {
 const filterHandler = (val, update) => {
     update(
         () => {
-            myOptions.value = filter(val, myOptionsOriginal.value);
+            if ($props.defaultFilter)
+                myOptions.value = filter(val, myOptionsOriginal.value);
         },
         (ref) => {
             if (val !== '' && ref.options.length > 0) {
@@ -64,13 +83,8 @@ const filterHandler = (val, update) => {
     );
 };
 
-const value = computed({
-    get() {
-        return $props.modelValue;
-    },
-    set(value) {
-        emit('update:modelValue', value);
-    },
+watch(options, (newValue) => {
+    setOptions(newValue);
 });
 </script>
 
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index e25130aa0..76d2d97c3 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -109,6 +109,7 @@ export default {
     customer: {
         pageTitles: {
             customers: 'Customers',
+            create: 'Create',
             list: 'List',
             webPayments: 'Web Payments',
             extendedList: 'Extended list',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index c0247dda0..26d8a335b 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -109,6 +109,7 @@ export default {
     customer: {
         pageTitles: {
             customers: 'Clientes',
+            create: 'Crear',
             list: 'Listado',
             webPayments: 'Pagos Web',
             extendedList: 'Listado extendido',
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index d1634c709..0b740cf64 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -1,13 +1,11 @@
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import CrudModel from 'components/CrudModel.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
-import { getUrl } from 'composables/getUrl';
 import { tMobile } from 'composables/tMobile';
-import router from 'src/router';
 
 const route = useRoute();
 
@@ -21,11 +19,6 @@ const claimRedeliveries = ref([]);
 const workers = ref([]);
 const selected = ref([]);
 const saveButtonRef = ref();
-let salixUrl;
-
-onMounted(async () => {
-    salixUrl = await getUrl(`claim/${route.params.id}`);
-});
 
 const developmentsFilter = {
     fields: [
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/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 7b7aae11c..cfaef0855 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -8,6 +8,7 @@ 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 VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 
@@ -74,11 +75,7 @@ const onPostcodeCreated = async () => {
         url="Countries"
     />
     <QPage>
-        <QToolbar class="bg-vn-dark">
-            <div id="st-data"></div>
-            <QSpace />
-            <div id="st-actions"></div>
-        </QToolbar>
+        <VnSubToolbar />
         <FormModel
             :form-initial-data="newClientForm"
             :observe-form-changes="false"
diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index df128cce7..cf66443b9 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -9,6 +9,7 @@ import { useStateStore } from 'stores/useStateStore';
 
 import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -102,11 +103,7 @@ const selectCustomerId = (id) => {
         </QScrollArea>
     </QDrawer>
 
-    <QToolbar class="bg-vn-dark">
-        <div id="st-data"></div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
+    <VnSubToolbar />
 
     <QPage class="column items-center q-pa-md">
         <QTable
diff --git a/src/pages/Department/Card/DepartmentCard.vue b/src/pages/Department/Card/DepartmentCard.vue
index 885b5e5f1..da9accee1 100644
--- a/src/pages/Department/Card/DepartmentCard.vue
+++ b/src/pages/Department/Card/DepartmentCard.vue
@@ -2,6 +2,7 @@
 import { useStateStore } from 'stores/useStateStore';
 import DepartmentDescriptor from 'pages/Department/Card/DepartmentDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 </script>
@@ -15,11 +16,8 @@ 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 column items-center">
                 <RouterView></RouterView>
             </div>
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
index 5aa50fc94..d4937e983 100644
--- a/src/pages/Entry/Card/EntryCard.vue
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import LeftMenu from 'components/LeftMenu.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 </script>
@@ -15,11 +16,8 @@ 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/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
index 37cfea1ad..d4eb8a3ef 100644
--- a/src/pages/Entry/EntryCreate.vue
+++ b/src/pages/Entry/EntryCreate.vue
@@ -7,6 +7,7 @@ import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import { toDate } from 'src/filters';
 
@@ -51,11 +52,7 @@ const companiesOptions = ref([]);
     <!-- Agregar searchbar de entries -->
 
     <QPage>
-        <QToolbar class="bg-vn-dark justify-end">
-            <div id="st-data"></div>
-            <QSpace />
-            <div id="st-actions"></div>
-        </QToolbar>
+        <VnSubToolbar />
         <FormModel url-create="Entries" model="entry" :form-initial-data="newEntryForm">
             <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 4572c4c16..38025c464 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -23,6 +23,7 @@ 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,13 +131,36 @@ 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 });
+}
+function currencyRefFilter(val) {
+    let where = { limit: 30 };
+    let params = {};
+    let key = 'code';
+
+    if (new RegExp(/\d/g).test(val)) {
+        key = 'id';
+    }
+    params = { [key]: { like: `%${val}%` } };
+    where = Object.assign(where, params);
+    currenciesRef.value.fetch({ where });
+}
 </script>
 <template>
     <FetchData
         ref="suppliersRef"
         url="Suppliers"
-        :filter="{ fields: ['id', 'nickname'] }"
-        limit="30"
         @on-fetch="(data) => (suppliers = data)"
     />
     <FetchData
@@ -189,7 +213,8 @@ async function upsert() {
                         option-value="id"
                         option-label="nickname"
                         :input-debounce="100"
-                        @input-value="suppliersRef.fetch()"
+                        @input-value="supplierRefFilter"
+                        :default-filter="false"
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
@@ -406,7 +431,9 @@ async function upsert() {
                         :options="currencies"
                         option-value="id"
                         option-label="code"
-                        @input-value="currenciesRef.fetch()"
+                        :input-debounce="100"
+                        :default-filter="false"
+                        @input-value="currencyRefFilter"
                     />
                 </div>
                 <div class="col">
@@ -417,7 +444,6 @@ async function upsert() {
                         :options="companies"
                         option-value="id"
                         option-label="code"
-                        @input-value="companiesRef.fetch()"
                     />
                 </div>
             </div>
@@ -459,7 +485,6 @@ async function upsert() {
                         :options="companies"
                         option-value="id"
                         option-label="code"
-                        @input-value="companiesRef.fetch()"
                         :rules="[requiredFieldRule]"
                     />
                 </QItem>
@@ -471,7 +496,6 @@ async function upsert() {
                         :options="warehouses"
                         option-value="id"
                         option-label="name"
-                        @input-value="warehousesRef.fetch()"
                         :rules="[requiredFieldRule]"
                     />
                     <VnSelectFilter
@@ -481,7 +505,6 @@ async function upsert() {
                         :options="dmsTypes"
                         option-value="id"
                         option-label="name"
-                        @input-value="dmsTypesRef.fetch()"
                         :rules="[requiredFieldRule]"
                     />
                 </QItem>
@@ -571,7 +594,6 @@ async function upsert() {
                         :options="companies"
                         option-value="id"
                         option-label="code"
-                        @input-value="companiesRef.fetch()"
                         :rules="[requiredFieldRule]"
                     />
                 </QItem>
@@ -583,7 +605,6 @@ async function upsert() {
                         :options="warehouses"
                         option-value="id"
                         option-label="name"
-                        @input-value="warehousesRef.fetch()"
                         :rules="[requiredFieldRule]"
                     />
                     <VnSelectFilter
@@ -593,7 +614,6 @@ async function upsert() {
                         :options="dmsTypes"
                         option-value="id"
                         option-label="name"
-                        @input-value="dmsTypesRef.fetch()"
                         :rules="[requiredFieldRule]"
                     />
                 </QItem>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index 4d06cb41e..e22da75bf 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -4,6 +4,7 @@ import { useStateStore } from 'stores/useStateStore';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { onMounted, watch } from 'vue';
 import { useRoute } from 'vue-router';
@@ -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/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 6db35c808..d27808114 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -6,6 +6,7 @@ import { QCheckbox, QBtn } from 'quasar';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import InvoiceOutNegativeFilter from './InvoiceOutNegativeBasesFilter.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import { toCurrency } from 'src/filters';
 import { useInvoiceOutGlobalStore } from 'src/stores/invoiceOutGlobal.js';
@@ -225,11 +226,7 @@ const selectWorkerId = (id) => {
             <InvoiceOutNegativeFilter data-key="InvoiceOutNegative" />
         </QScrollArea>
     </QDrawer>
-    <QToolbar class="bg-vn-dark">
-        <div id="st-data"></div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
+    <VnSubToolbar />
     <QPage class="column items-center q-pa-md">
         <QTable
             :columns="columns"
diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index e81c6a3eb..7ac083c37 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -2,6 +2,7 @@
 import LeftMenu from 'components/LeftMenu.vue';
 import { useStateStore } from 'stores/useStateStore';
 import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 </script>
@@ -15,6 +16,7 @@ const stateStore = useStateStore();
     </QDrawer>
     <QPageContainer>
         <QPage>
+            <VnSubToolbar />
             <RouterView></RouterView>
         </QPage>
     </QPageContainer>
diff --git a/src/pages/Order/Card/OrderForm.vue b/src/pages/Order/Card/OrderForm.vue
index 67f77d0ca..42aee7640 100644
--- a/src/pages/Order/Card/OrderForm.vue
+++ b/src/pages/Order/Card/OrderForm.vue
@@ -9,6 +9,7 @@ import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -105,18 +106,13 @@ const orderFilter = {
 </script>
 
 <template>
-    <QToolbar class="bg-vn-dark justify-end">
-        <div id="st-data"></div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
     <FetchData
         url="Clients"
         @on-fetch="(data) => (clientList = data)"
         :filter="{ fields: ['id', 'name', 'defaultAddressFk'] }"
         auto-load
     />
-
+    <VnSubToolbar v-if="isNew" />
     <div class="q-pa-md">
         <FormModel
             :url="!isNew ? `Orders/${route.params.id}` : null"
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index 04115cc3d..5b44159df 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -4,6 +4,7 @@ import { useStateStore } from 'stores/useStateStore';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import LeftMenu from 'components/LeftMenu.vue';
 import SupplierDescriptor from './SupplierDescriptor.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -27,11 +28,8 @@ 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/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 910d36489..43857fd1e 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -78,11 +78,11 @@ const setData = (entity) => {
             <VnLv label="Alias" :value="entity.nickname" />
             <VnLv
                 :label="t('supplier.summary.payMethod')"
-                :value="entity.payMethod.name"
+                :value="entity?.payMethod?.name"
             />
             <VnLv
                 :label="t('supplier.summary.payDeadline')"
-                :value="entity.payDem.payDem"
+                :value="entity?.payDem?.payDem"
             />
             <VnLv :label="t('supplier.summary.payDay')" :value="entity.payDay" />
             <VnLv :label="t('supplier.summary.account')" :value="entity.account" />
diff --git a/src/pages/Supplier/SupplierCreate.vue b/src/pages/Supplier/SupplierCreate.vue
index d6cfaeb42..ebe0518f2 100644
--- a/src/pages/Supplier/SupplierCreate.vue
+++ b/src/pages/Supplier/SupplierCreate.vue
@@ -5,6 +5,7 @@ import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 
@@ -28,11 +29,7 @@ const newSupplierForm = reactive({
     </template>
 
     <QPage>
-        <QToolbar class="bg-vn-dark justify-end">
-            <div id="st-data"></div>
-            <QSpace />
-            <div id="st-actions"></div>
-        </QToolbar>
+        <VnSubToolbar />
         <FormModel
             url-create="Suppliers/newSupplier"
             model="supplier"
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index 91921f827..35870946a 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,8 @@ 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 b5e555a44..34ecc25ee 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -2,6 +2,7 @@
 import { useStateStore } from 'stores/useStateStore';
 import TravelDescriptor from './TravelDescriptor.vue';
 import LeftMenu from 'components/LeftMenu.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 </script>
@@ -15,11 +16,8 @@ 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/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
index 4f5d82593..c8ac7e690 100644
--- a/src/pages/Travel/TravelCreate.vue
+++ b/src/pages/Travel/TravelCreate.vue
@@ -8,7 +8,7 @@ import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { toDate } from 'src/filters';
 
 const { t } = useI18n();
@@ -57,11 +57,7 @@ onBeforeMount(() => {
         auto-load
     />
     <QPage>
-        <QToolbar class="bg-vn-dark">
-            <div id="st-data"></div>
-            <QSpace />
-            <div id="st-actions"></div>
-        </QToolbar>
+        <VnSubToolbar />
         <FormModel
             url-update="Travels"
             model="travel"
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 972eb52ec..719831523 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,8 @@ 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/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 66b6e4cd8..accac7cf2 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -11,6 +11,7 @@ import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
 import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import { useUserConfig } from 'src/composables/useUserConfig';
 
@@ -122,11 +123,7 @@ onMounted(async () => {
     />
 
     <QPage>
-        <QToolbar class="bg-vn-dark">
-            <div id="st-data"></div>
-            <QSpace />
-            <div id="st-actions"></div>
-        </QToolbar>
+        <VnSubToolbar />
         <FormModel
             url-create="Workers/new"
             model="worker"
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 8d132fcee..2eda6f686 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -19,7 +19,6 @@ export const useNavigationStore = defineStore('navigationStore', () => {
         'route',
         'supplier',
         'travel',
-        'invoiceIn',
         'entry',
     ];
     const pinnedModules = ref([]);

From 7b974a2f3292f77fb8a657d28a4c6124314131d4 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 11 Jan 2024 12:13:38 +0100
Subject: [PATCH 095/105] refs #6595 fix: remove duplicated

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

diff --git a/src/pages/InvoiceIn/Card/InvoiceInCard.vue b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
index 8f98fcd50..e22da75bf 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCard.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCard.vue
@@ -8,7 +8,6 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import { onMounted, watch } from 'vue';
 import { useRoute } from 'vue-router';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();

From 489ea94d3f2934ca88e795d29056fbf9461383cc Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 11 Jan 2024 13:12:55 +0100
Subject: [PATCH 096/105] refs #6595 fix invoiceInBasicData

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

diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 38025c464..a46978458 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -144,18 +144,6 @@ function supplierRefFilter(val) {
     where = Object.assign(where, params);
     suppliersRef.value.fetch({ where });
 }
-function currencyRefFilter(val) {
-    let where = { limit: 30 };
-    let params = {};
-    let key = 'code';
-
-    if (new RegExp(/\d/g).test(val)) {
-        key = 'id';
-    }
-    params = { [key]: { like: `%${val}%` } };
-    where = Object.assign(where, params);
-    currenciesRef.value.fetch({ where });
-}
 </script>
 <template>
     <FetchData
@@ -169,6 +157,7 @@ function currencyRefFilter(val) {
         :filter="{ fields: ['id', 'code'] }"
         order="code"
         @on-fetch="(data) => (currencies = data)"
+        auto-load
     />
     <FetchData
         ref="companiesRef"
@@ -176,6 +165,7 @@ function currencyRefFilter(val) {
         :filter="{ fields: ['id', 'code'] }"
         order="code"
         @on-fetch="(data) => (companies = data)"
+        auto-load
     />
     <FetchData
         ref="dmsTypesRef"
@@ -183,6 +173,7 @@ function currencyRefFilter(val) {
         :filter="{ fields: ['id', 'name'] }"
         order="name"
         @on-fetch="(data) => (dmsTypes = data)"
+        auto-load
     />
     <FetchData
         ref="warehousesRef"
@@ -190,11 +181,13 @@ function currencyRefFilter(val) {
         :filter="{ fields: ['id', 'name'] }"
         order="name"
         @on-fetch="(data) => (warehouses = data)"
+        auto-load
     />
     <FetchData
         ref="allowTypesRef"
         url="DmsContainers/allowedContentTypes"
         @on-fetch="(data) => (allowedContentTypes = data)"
+        auto-load
     />
     <FetchData
         url="UserConfigs/getUserConfig"
@@ -431,9 +424,6 @@ function currencyRefFilter(val) {
                         :options="currencies"
                         option-value="id"
                         option-label="code"
-                        :input-debounce="100"
-                        :default-filter="false"
-                        @input-value="currencyRefFilter"
                     />
                 </div>
                 <div class="col">

From d2ee8a98eb754f93cc4348f9cd2feb7566fdc6cb Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 11 Jan 2024 08:25:59 -0500
Subject: [PATCH 097/105] Se crea la tarjeta que muestra el listado de
 consignatarios existentes y la tarjeta de creacion

---
 .../Customer/Card/CustomerConsigneeCreate.vue | 241 ++++++++++++++++++
 .../Customer/Card/CustomerConsigneeEdit.vue   |   3 +
 .../Customer/Card/CustomerConsignees.vue      | 112 +++++++-
 src/router/modules/customer.js                |  43 +++-
 4 files changed, 391 insertions(+), 8 deletions(-)
 create mode 100644 src/pages/Customer/Card/CustomerConsigneeCreate.vue
 create mode 100644 src/pages/Customer/Card/CustomerConsigneeEdit.vue

diff --git a/src/pages/Customer/Card/CustomerConsigneeCreate.vue b/src/pages/Customer/Card/CustomerConsigneeCreate.vue
new file mode 100644
index 000000000..69d478b6f
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerConsigneeCreate.vue
@@ -0,0 +1,241 @@
+<script setup>
+import { onBeforeMount, reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const formInitialData = reactive({
+    isDefaultAddress: false,
+    nickname: null,
+    street: null,
+    postalCode: null,
+    city: null,
+    provinceFk: null,
+    agencyModeFk: null,
+    phone: null,
+    mobile: null,
+    incotermsFk: null,
+    customsAgentFk: null,
+});
+
+const agencyModes = ref([]);
+const incoterms = ref([]);
+const customsAgents = ref([]);
+const postcodeFetchDataRef = ref(null);
+const citiesLocationOptions = ref([]);
+const provincesLocationOptions = ref([]);
+const postcodesOptions = ref([]);
+const urlCreate = ref('');
+
+onBeforeMount(() => {
+    urlCreate.value = `Clients/${route.params.id}/createAddress`;
+});
+
+const onPostcodeCreated = async () => {
+    postcodeFetchDataRef.value.fetch();
+};
+</script>
+
+<template>
+    <FetchData
+        @on-fetch="(data) => (postcodesOptions = data)"
+        auto-load
+        url="Postcodes/location"
+    />
+    <FetchData
+        @on-fetch="(data) => (citiesLocationOptions = data)"
+        auto-load
+        url="Towns/location"
+    />
+    <FetchData
+        @on-fetch="(data) => (provincesLocationOptions = data)"
+        auto-load
+        url="Provinces/location"
+    />
+    <fetch-data
+        @on-fetch="(data) => (agencyModes = data)"
+        auto-load
+        url="AgencyModes/isActive"
+    />
+    <fetch-data @on-fetch="(data) => (incoterms = data)" auto-load url="Incoterms" />
+    <fetch-data
+        @on-fetch="(data) => (customsAgents = data)"
+        auto-load
+        url="CustomsAgents"
+    />
+
+    <FormModel
+        :form-initial-data="formInitialData"
+        :observe-form-changes="false"
+        model="client"
+        :url-create="urlCreate"
+    >
+        <template #form="{ data, validate }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox :label="t('Default')" v-model="data.isDefaultAddress" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput :label="t('Consignee')" v-model="data.nickname" />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Street address')" v-model="data.street" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectCreate
+                        :label="t('Postcode')"
+                        :options="postcodesOptions"
+                        :roles-allowed-to-create="['deliveryAssistant']"
+                        :rules="validate('Worker.postcode')"
+                        hide-selected
+                        option-label="code"
+                        option-value="code"
+                        v-model="data.postalCode"
+                    >
+                        <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('Agency')"
+                        :options="agencyModes"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.agencyModeFk"
+                    />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput :label="t('Phone')" v-model="data.phone" />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Mobile')" v-model="data.mobile" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Incoterms')"
+                        :options="incoterms"
+                        hide-selected
+                        option-label="name"
+                        option-value="code"
+                        v-model="data.incotermsFk"
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Customs agent')"
+                        :options="customsAgents"
+                        hide-selected
+                        option-label="fiscalName"
+                        option-value="id"
+                        v-model="data.customsAgentFk"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
+
+<i18n>
+es:
+    Default: Predeterminado
+    Consignee: Consignatario
+    Street address: Dirección postal
+    Postcode: Código postal
+    City: Población
+    Province: Provincia
+    Agency: Agencia
+    Phone: Teléfono
+    Mobile: Movíl
+    Incoterms: Incoterms
+    Customs agent: Agente de aduanas
+</i18n>
diff --git a/src/pages/Customer/Card/CustomerConsigneeEdit.vue b/src/pages/Customer/Card/CustomerConsigneeEdit.vue
new file mode 100644
index 000000000..6546c527d
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerConsigneeEdit.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Customer consignee edit</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerConsignees.vue b/src/pages/Customer/Card/CustomerConsignees.vue
index bab2bd1ff..5abe89589 100644
--- a/src/pages/Customer/Card/CustomerConsignees.vue
+++ b/src/pages/Customer/Card/CustomerConsignees.vue
@@ -1,3 +1,113 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+
+const provincesLocation = ref([]);
+
+const setProvince = (provinceFk) => {
+    const result = provincesLocation.value.filter(
+        (province) => province.id === provinceFk
+    );
+    return result[0].name || '';
+};
+
+const toCustomerConsigneeCreate = () => {
+    router.push({ name: 'CustomerConsigneeCreate' });
+};
+
+const toCustomerConsigneeEdit = () => {
+    router.push({ name: 'CustomerConsigneeEdit' });
+};
+</script>
+
 <template>
-    <div class="flex justify-center">Consignees</div>
+    <FetchData
+        @on-fetch="(data) => (provincesLocation = data)"
+        auto-load
+        url="Provinces/location"
+    />
+
+    <FormModel
+        :observe-form-changes="false"
+        :url="`Clients/${route.params.id}/addresses`"
+        auto-load
+        model="customer"
+    >
+        <template #form="{ data }">
+            <div v-if="data?.length">
+                <div v-for="(item, index) in data" :key="index">
+                    <div
+                        :class="{
+                            'consignees-card': true,
+                            'q-mb-md': index + 1 === data.length ? false : true,
+                        }"
+                    >
+                        <div class="consignees-card-icon">
+                            <QIcon name="star" size="md" color="primary" />
+                        </div>
+                        <div>
+                            <div>
+                                <div class="text-weight-bold">
+                                    {{ item.nickname }} - #{{ item.id }}
+                                </div>
+                                <div>{{ item.street }}</div>
+                                <div>
+                                    {{ item.postalCode }} - {{ item.city }},
+                                    {{ setProvince(item.provinceFk) }}
+                                </div>
+                            </div>
+                            <div class="flex">
+                                <QCheckbox
+                                    :label="t('Is equalizated')"
+                                    v-model="item.isEqualizated"
+                                    class="q-mr-lg"
+                                    @click.stop="toCustomerConsigneeEdit()"
+                                />
+                                <QCheckbox
+                                    :label="t('Is logiflora allowed')"
+                                    v-model="item.isLogifloraAllowed"
+                                    @click.stop="toCustomerConsigneeEdit()"
+                                />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </template>
+    </FormModel>
+    <QPageSticky :offset="[18, 18]">
+        <QBtn @click.stop="toCustomerConsigneeCreate()" color="primary" fab icon="add" />
+        <QTooltip>
+            {{ t('New consignee') }}
+        </QTooltip>
+    </QPageSticky>
 </template>
+
+<style lang="scss" scoped>
+.consignees-card {
+    border: 2px solid var(--vn-light-gray);
+    border-radius: 10px;
+    padding: 10px;
+    display: flex;
+}
+.consignees-card-icon {
+    margin: 0 15px 0 5px;
+    display: flex;
+    align-items: center;
+}
+</style>
+
+<i18n>
+es:
+    Is equalizated: Recargo de equivalencia
+    Is logiflora allowed: Compra directa en Holanda
+    New consignee: Nuevo consignatario
+</i18n>
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 3c8445f42..752c486ee 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -152,13 +152,42 @@ export default {
                 },
                 {
                     path: 'consignees',
-                    name: 'CustomerConsignees',
-                    meta: {
-                        title: 'consignees',
-                        icon: 'vn:delivery',
-                    },
-                    component: () =>
-                        import('src/pages/Customer/Card/CustomerConsignees.vue'),
+                    name: 'ConsigneesCard',
+                    redirect: { name: 'CustomerConsignees' },
+                    children: [
+                        {
+                            path: '',
+                            name: 'CustomerConsignees',
+                            meta: {
+                                icon: 'vn:delivery',
+                                title: 'consignees',
+                            },
+                            component: () =>
+                                import('src/pages/Customer/Card/CustomerConsignees.vue'),
+                        },
+                        {
+                            path: 'create',
+                            name: 'CustomerConsigneeCreate',
+                            meta: {
+                                title: 'consignee-create',
+                            },
+                            component: () =>
+                                import(
+                                    'src/pages/Customer/Card/CustomerConsigneeCreate.vue'
+                                ),
+                        },
+                        {
+                            path: 'edit',
+                            name: 'CustomerConsigneeEdit',
+                            meta: {
+                                title: 'consignee-edit',
+                            },
+                            component: () =>
+                                import(
+                                    'src/pages/Customer/Card/CustomerConsigneeEdit.vue'
+                                ),
+                        },
+                    ],
                 },
                 {
                     path: 'notes',

From 627226d3cd125785abd40540a7f8e8ddacc1a80f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 11 Jan 2024 14:58:22 -0300
Subject: [PATCH 098/105] Entry list

---
 src/components/ui/CardList.vue |   4 +
 src/i18n/en/index.js           |   6 ++
 src/i18n/es/index.js           |   6 ++
 src/pages/Entry/EntryList.vue  | 139 +++++++++++++++++++++++++++++++--
 4 files changed, 149 insertions(+), 6 deletions(-)

diff --git a/src/components/ui/CardList.vue b/src/components/ui/CardList.vue
index 7d7cee23e..eba69a952 100644
--- a/src/components/ui/CardList.vue
+++ b/src/components/ui/CardList.vue
@@ -9,6 +9,7 @@ const $props = defineProps({
     isSelected: { type: Boolean, default: false },
     title: { type: String, default: null },
     showCheckbox: { type: Boolean, default: false },
+    hasInfoIcons: { type: Boolean, default: false },
 });
 
 const emit = defineEmits(['toggleCardCheck']);
@@ -39,6 +40,9 @@ const toggleCardCheck = (item) => {
                 </div>
             </slot>
             <div class="card-list-body">
+                <div v-if="hasInfoIcons" class="column q-mr-md q-gutter-y-xs">
+                    <slot name="info-icons" />
+                </div>
                 <div class="list-items row flex-wrap-wrap">
                     <slot name="list-items" />
                 </div>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 1b3c1298c..ffff99cc4 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -267,6 +267,12 @@ export default {
         },
         list: {
             newEntry: 'New entry',
+            landed: 'Landed',
+            invoiceNumber: 'Invoice number',
+            supplier: 'Supplier',
+            booked: 'Booked',
+            confirmed: 'Confirmed',
+            ordered: 'Ordered',
         },
     },
     ticket: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 9758baefd..d8993a08c 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -265,6 +265,12 @@ export default {
         },
         list: {
             newEntry: 'Nueva entrada',
+            landed: 'F. entrega',
+            invoiceNumber: 'Núm. factura',
+            supplier: 'Proveedor',
+            booked: 'Asentado',
+            confirmed: 'Confirmado',
+            ordered: 'Pedida',
         },
     },
     ticket: {
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 1baa9e019..84f0d8112 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -1,22 +1,149 @@
 <script setup>
+import { onMounted, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
+import { useQuasar } from 'quasar';
 
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import CardList from 'src/components/ui/CardList.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { toDate } from 'src/filters/index';
+
+const stateStore = useStateStore();
 const router = useRouter();
+const quasar = useQuasar();
 const { t } = useI18n();
 
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+});
+onUnmounted(() => (stateStore.rightDrawer = false));
+
+function navigate(id) {
+    router.push({ path: `/invoice-in/${id}` });
+}
+
 const redirectToCreateView = () => {
     router.push({ name: 'EntryCreate' });
 };
+
+function viewSummary(id) {
+    // quasar.dialog({
+    //     component: EntrySummaryDialog,
+    //     componentProps: {
+    //         id,
+    //     },
+    // });
+}
 </script>
 
 <template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="EntryList"
+                :label="t('Search entries')"
+                :info="t('You can search by entry reference')"
+            />
+        </Teleport>
+    </template>
+
     <QPage class="column items-center q-pa-md">
-        <QPageSticky :offset="[20, 20]">
-            <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
-            <QTooltip>
-                {{ t('entry.list.newEntry') }}
-            </QTooltip>
-        </QPageSticky>
+        <div class="card-list">
+            <VnPaginate
+                data-key="EntryList"
+                url="Entries/filter"
+                order="landed DESC, id DESC"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :key="row.id"
+                        :title="row.reference"
+                        @click="navigate(row.id)"
+                        :id="row.id"
+                        :has-info-icons="row.isExcludedFromAvailable || row.isRaid"
+                    >
+                        <template #info-icons>
+                            <QIcon
+                                v-if="row.isExcludedFromAvailable"
+                                name="vn:inventory"
+                                color="primary"
+                                size="xs"
+                            >
+                                <QTooltip>{{ t('Inventory entry') }}</QTooltip>
+                            </QIcon>
+                            <QIcon
+                                v-if="row.isRaid"
+                                name="vn:web"
+                                color="primary"
+                                size="xs"
+                            >
+                                <QTooltip>{{ t('Virtual entry') }}</QTooltip>
+                            </QIcon>
+                        </template>
+                        <template #list-items>
+                            <VnLv
+                                :label="t('entry.list.landed')"
+                                :value="toDate(row.landed)"
+                            />
+                            <VnLv
+                                :label="t('entry.list.booked')"
+                                :value="!!row.isBooked"
+                            />
+                            <VnLv
+                                :label="t('entry.list.invoiceNumber')"
+                                :value="row.invoiceNumber"
+                            />
+                            <VnLv
+                                :label="t('entry.list.confirmed')"
+                                :value="!!row.isConfirmed"
+                            />
+                            <VnLv
+                                :label="t('entry.list.supplier')"
+                                :value="row.supplierName"
+                            />
+                            <VnLv
+                                :label="t('entry.list.ordered')"
+                                :value="!!row.isOrdered"
+                            />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id)"
+                                color="primary"
+                                type="submit"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
     </QPage>
+    <QPageSticky :offset="[20, 20]">
+        <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
+        <QTooltip>
+            {{ t('entry.list.newEntry') }}
+        </QTooltip>
+    </QPageSticky>
 </template>
+
+<style lang="scss" scoped>
+.card-list {
+    width: 100%;
+    max-width: 60em;
+}
+</style>
+
+<i18n>
+es:
+    Search entries: Buscar entradas
+    You can search by entry reference: Puedes buscar por referencia de la entrada
+    Inventory entry: Es inventario
+    Virtual entry: Es una redada
+</i18n>

From f9cbf03991c184d06b096e96882ae51817c049ba Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 11 Jan 2024 13:12:44 -0500
Subject: [PATCH 099/105] Se corrige el componente por comentario en pr

---
 .../Customer/Card/CustomerConsignees.vue      | 51 ++++++++++++-------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerConsignees.vue b/src/pages/Customer/Card/CustomerConsignees.vue
index 5abe89589..0d06c31fc 100644
--- a/src/pages/Customer/Card/CustomerConsignees.vue
+++ b/src/pages/Customer/Card/CustomerConsignees.vue
@@ -1,22 +1,36 @@
 <script setup>
-import { ref } from 'vue';
+import { computed, onBeforeMount, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
+import { useArrayData } from 'composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
 import FetchData from 'components/FetchData.vue';
-import FormModel from 'components/FormModel.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
+const stateStore = useStateStore();
 
+const arrayData = ref(null);
 const provincesLocation = ref([]);
 
+onBeforeMount(async () => {
+    arrayData.value = useArrayData('CustomerConsignees', {
+        url: `Clients/${route.params.id}/addresses`,
+        limit: 0,
+    });
+    await arrayData.value.fetch({ append: false });
+    stateStore.rightDrawer = true;
+});
+
+const data = computed(() => arrayData.value.store.data);
+
 const setProvince = (provinceFk) => {
     const result = provincesLocation.value.filter(
         (province) => province.id === provinceFk
     );
-    return result[0].name || '';
+    return result[0]?.name || '';
 };
 
 const toCustomerConsigneeCreate = () => {
@@ -35,13 +49,8 @@ const toCustomerConsigneeEdit = () => {
         url="Provinces/location"
     />
 
-    <FormModel
-        :observe-form-changes="false"
-        :url="`Clients/${route.params.id}/addresses`"
-        auto-load
-        model="customer"
-    >
-        <template #form="{ data }">
+    <QCard class="q-pa-sm">
+        <QCardSection>
             <div v-if="data?.length">
                 <div v-for="(item, index) in data" :key="index">
                     <div
@@ -81,14 +90,20 @@ const toCustomerConsigneeEdit = () => {
                     </div>
                 </div>
             </div>
-        </template>
-    </FormModel>
-    <QPageSticky :offset="[18, 18]">
-        <QBtn @click.stop="toCustomerConsigneeCreate()" color="primary" fab icon="add" />
-        <QTooltip>
-            {{ t('New consignee') }}
-        </QTooltip>
-    </QPageSticky>
+        </QCardSection>
+
+        <QPageSticky :offset="[18, 18]">
+            <QBtn
+                @click.stop="toCustomerConsigneeCreate()"
+                color="primary"
+                fab
+                icon="add"
+            />
+            <QTooltip>
+                {{ t('New consignee') }}
+            </QTooltip>
+        </QPageSticky>
+    </QCard>
 </template>
 
 <style lang="scss" scoped>

From bf19ce630dd8143dc3e0f4eb38a1247c03adb287 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Fri, 12 Jan 2024 05:28:58 -0500
Subject: [PATCH 100/105] Nueva correccion por comentario

---
 .../Customer/Card/CustomerConsignees.vue      | 60 ++++++++-----------
 1 file changed, 25 insertions(+), 35 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerConsignees.vue b/src/pages/Customer/Card/CustomerConsignees.vue
index 0d06c31fc..f8f6160dd 100644
--- a/src/pages/Customer/Card/CustomerConsignees.vue
+++ b/src/pages/Customer/Card/CustomerConsignees.vue
@@ -1,31 +1,17 @@
 <script setup>
-import { computed, onBeforeMount, ref } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
-import { useArrayData } from 'composables/useArrayData';
-import { useStateStore } from 'stores/useStateStore';
 import FetchData from 'components/FetchData.vue';
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
-const stateStore = useStateStore();
 
-const arrayData = ref(null);
 const provincesLocation = ref([]);
 
-onBeforeMount(async () => {
-    arrayData.value = useArrayData('CustomerConsignees', {
-        url: `Clients/${route.params.id}/addresses`,
-        limit: 0,
-    });
-    await arrayData.value.fetch({ append: false });
-    stateStore.rightDrawer = true;
-});
-
-const data = computed(() => arrayData.value.store.data);
-
 const setProvince = (provinceFk) => {
     const result = provincesLocation.value.filter(
         (province) => province.id === provinceFk
@@ -49,14 +35,19 @@ const toCustomerConsigneeEdit = () => {
         url="Provinces/location"
     />
 
-    <QCard class="q-pa-sm">
-        <QCardSection>
-            <div v-if="data?.length">
-                <div v-for="(item, index) in data" :key="index">
+    <QCard class="q-pa-lg">
+        <VnPaginate
+            data-key="CustomerConsignees"
+            :url="`Clients/${route.params.id}/addresses`"
+            order="id"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <div v-for="(item, index) in rows" :key="index">
                     <div
                         :class="{
                             'consignees-card': true,
-                            'q-mb-md': index + 1 === data.length ? false : true,
+                            'q-mb-md': index + 1 === rows.length ? false : true,
                         }"
                     >
                         <div class="consignees-card-icon">
@@ -89,20 +80,19 @@ const toCustomerConsigneeEdit = () => {
                         </div>
                     </div>
                 </div>
-            </div>
-        </QCardSection>
-
-        <QPageSticky :offset="[18, 18]">
-            <QBtn
-                @click.stop="toCustomerConsigneeCreate()"
-                color="primary"
-                fab
-                icon="add"
-            />
-            <QTooltip>
-                {{ t('New consignee') }}
-            </QTooltip>
-        </QPageSticky>
+                <QPageSticky :offset="[18, 18]">
+                    <QBtn
+                        @click.stop="toCustomerConsigneeCreate()"
+                        color="primary"
+                        fab
+                        icon="add"
+                    />
+                    <QTooltip>
+                        {{ t('New consignee') }}
+                    </QTooltip>
+                </QPageSticky>
+            </template>
+        </VnPaginate>
     </QCard>
 </template>
 

From 4bf16da814579840108b688cd0c22b6ab904b15d Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 12 Jan 2024 09:49:34 -0300
Subject: [PATCH 101/105] Improve autocompletion

---
 src/components/CreateNewCityForm.vue           |  4 ++--
 src/components/CreateNewPostcodeForm.vue       | 18 ++++++++++++++----
 src/components/CreateNewProvinceForm.vue       |  4 ++--
 src/pages/Customer/Card/CustomerFiscalData.vue |  7 +++++--
 src/pages/Customer/CustomerCreate.vue          |  5 ++++-
 src/pages/Supplier/Card/SupplierFiscalData.vue | 13 ++++++++-----
 src/pages/Worker/WorkerCreate.vue              |  5 ++++-
 7 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index ee842e86f..7326ea7a5 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -19,8 +19,8 @@ const cityFormData = reactive({
 
 const provincesOptions = ref([]);
 
-const onDataSaved = () => {
-    emit('onDataSaved');
+const onDataSaved = (dataSaved) => {
+    emit('onDataSaved', dataSaved);
 };
 </script>
 
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 40efa0789..ccffb2ec2 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -32,12 +32,20 @@ const onDataSaved = (dataSaved) => {
     emit('onDataSaved', dataSaved);
 };
 
-const onCityCreated = async () => {
+const onCityCreated = async ({ name, provinceFk }, formData) => {
     await townsFetchDataRef.value.fetch();
+    formData.townFk = townsLocationOptions.value.find((town) => town.name === name).id;
+    formData.provinceFk = provinceFk;
+    formData.countryFk = provincesOptions.value.find(
+        (province) => province.id === provinceFk
+    ).countryFk;
 };
 
-const onProvinceCreated = async () => {
+const onProvinceCreated = async ({ name }, formData) => {
     await provincesFetchDataRef.value.fetch();
+    formData.provinceFk = provincesOptions.value.find(
+        (province) => province.name === name
+    ).id;
 };
 </script>
 
@@ -88,7 +96,9 @@ const onProvinceCreated = async () => {
                         :roles-allowed-to-create="['deliveryAssistant']"
                     >
                         <template #form>
-                            <CreateNewCityForm @on-data-saved="onCityCreated($event)" />
+                            <CreateNewCityForm
+                                @on-data-saved="onCityCreated($event, data)"
+                            />
                         </template>
                     </VnSelectCreate>
                 </div>
@@ -107,7 +117,7 @@ const onProvinceCreated = async () => {
                     >
                         <template #form>
                             <CreateNewProvinceForm
-                                @on-data-saved="onProvinceCreated($event)"
+                                @on-data-saved="onProvinceCreated($event, data)"
                             />
                         </template>
                     </VnSelectCreate>
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index 0f88952ea..b972db2c9 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -19,8 +19,8 @@ const provinceFormData = reactive({
 
 const autonomiesOptions = ref([]);
 
-const onDataSaved = () => {
-    emit('onDataSaved');
+const onDataSaved = (dataSaved) => {
+    emit('onDataSaved', dataSaved);
 };
 </script>
 
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index e7e626a99..0edcc3c07 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -14,16 +14,18 @@ import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
 const { t } = useI18n();
 const route = useRoute();
 
+const townsFetchDataRef = ref(null);
+const postcodeFetchDataRef = ref(null);
 const typesTaxes = ref([]);
 const typesTransactions = ref([]);
-const postcodeFetchDataRef = ref(null);
 const citiesLocationOptions = ref([]);
 const provincesLocationOptions = ref([]);
 const countriesOptions = ref([]);
 const postcodesOptions = ref([]);
 
 const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formData) => {
-    postcodeFetchDataRef.value.fetch();
+    await postcodeFetchDataRef.value.fetch();
+    await townsFetchDataRef.value.fetch();
     formData.postcode = code;
     formData.provinceFk = provinceFk;
     formData.city = citiesLocationOptions.value.find((town) => town.id === townFk).name;
@@ -39,6 +41,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
         url="SageTransactionTypes"
     />
     <FetchData
+        ref="townsFetchDataRef"
         @on-fetch="(data) => (citiesLocationOptions = data)"
         auto-load
         url="Towns/location"
diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
index 767fdd0de..310deb71a 100644
--- a/src/pages/Customer/CustomerCreate.vue
+++ b/src/pages/Customer/CustomerCreate.vue
@@ -30,6 +30,7 @@ const newClientForm = reactive({
 });
 
 const postcodeFetchDataRef = ref(null);
+const townsFetchDataRef = ref(null);
 const workersOptions = ref([]);
 const businessTypesOptions = ref([]);
 const citiesLocationOptions = ref([]);
@@ -38,7 +39,8 @@ const countriesOptions = ref([]);
 const postcodesOptions = ref([]);
 
 const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formData) => {
-    postcodeFetchDataRef.value.fetch();
+    await postcodeFetchDataRef.value.fetch();
+    await townsFetchDataRef.value.fetch();
     formData.postcode = code;
     formData.provinceFk = provinceFk;
     formData.city = citiesLocationOptions.value.find((town) => town.id === townFk).name;
@@ -64,6 +66,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
         url="BusinessTypes"
     />
     <FetchData
+        ref="townsFetchDataRef"
         @on-fetch="(data) => (citiesLocationOptions = data)"
         auto-load
         url="Towns/location"
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 806c25c09..28ad26961 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -15,6 +15,7 @@ const route = useRoute();
 const { t } = useI18n();
 
 const postcodeFetchDataRef = ref(null);
+const townsFetchDataRef = ref(null);
 const sageTaxTypesOptions = ref([]);
 const sageWithholdingsOptions = ref([]);
 const sageTransactionTypesOptions = ref([]);
@@ -25,8 +26,9 @@ const townsLocationOptions = ref([]);
 const countriesOptions = ref([]);
 
 const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formData) => {
-    postcodeFetchDataRef.value.fetch();
-    formData.postcode = code;
+    await postcodeFetchDataRef.value.fetch();
+    await townsFetchDataRef.value.fetch();
+    formData.postCode = code;
     formData.provinceFk = provinceFk;
     formData.city = townsLocationOptions.value.find((town) => town.id === townFk).name;
     formData.countryFk = countryFk;
@@ -60,6 +62,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
         auto-load
     />
     <FetchData
+        ref="townsFetchDataRef"
         @on-fetch="(data) => (townsLocationOptions = data)"
         auto-load
         url="Towns/location"
@@ -171,14 +174,13 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
                 </div>
                 <div class="col">
                     <VnSelectCreate
-                        v-model="data.postCode"
                         :label="t('supplier.fiscalData.postcode')"
+                        v-model="data.postCode"
+                        :options="postcodesOptions"
                         :rules="validate('supplier.postCode')"
                         :roles-allowed-to-create="['deliveryAssistant']"
-                        :options="postcodesOptions"
                         option-label="code"
                         option-value="code"
-                        map-options
                         hide-selected
                     >
                         <template #form>
@@ -286,6 +288,7 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk, countryFk }, formDa
                     </div>
                 </div>
             </VnRow>
+            <pre> {{ data }}</pre>
         </template>
     </FormModel>
 </template>
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index eb9dc70f6..91d4d454b 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -50,6 +50,7 @@ const newWorkerForm = ref({
 });
 
 const postcodeFetchDataRef = ref(null);
+const townsFetchDataRef = ref(null);
 const provincesOptions = ref([]);
 const townsOptions = ref([]);
 const companiesOptions = ref([]);
@@ -67,7 +68,8 @@ const onBankEntityCreated = (data) => {
 };
 
 const onPostcodeCreated = async ({ code, provinceFk, townFk }, formData) => {
-    postcodeFetchDataRef.value.fetch();
+    await postcodeFetchDataRef.value.fetch();
+    await townsFetchDataRef.value.fetch();
     formData.postcode = code;
     formData.provinceFk = provinceFk;
     formData.city = townsOptions.value.find((town) => town.id === townFk).name;
@@ -99,6 +101,7 @@ onMounted(async () => {
         auto-load
     />
     <FetchData
+        ref="townsFetchDataRef"
         url="Towns/location"
         @on-fetch="(data) => (townsOptions = data)"
         :filter="townsFilter"

From 207a5a590867aa2976a357768cb4ffb67f54acb6 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 12 Jan 2024 10:36:42 -0300
Subject: [PATCH 102/105] changes

---
 src/components/CreateNewPostcodeForm.vue      |  4 +-
 src/components/FormModelPopup.vue             |  6 +-
 .../Customer/Card/CustomerConsigneeCreate.vue | 15 +++--
 .../Customer/Card/CustomerConsignees.vue      | 67 ++++++++++---------
 4 files changed, 50 insertions(+), 42 deletions(-)

diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 3504445f8..a9efcf8f4 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -28,8 +28,8 @@ const countriesOptions = ref([]);
 const provincesOptions = ref([]);
 const townsLocationOptions = ref([]);
 
-const onDataSaved = () => {
-    emit('onDataSaved');
+const onDataSaved = (dataSaved) => {
+    emit('onDataSaved', dataSaved);
 };
 
 const onCityCreated = async () => {
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index c314f6897..04322a3c8 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -42,8 +42,8 @@ const { t } = useI18n();
 const closeButton = ref(null);
 const isLoading = ref(false);
 
-const onDataSaved = () => {
-    emit('onDataSaved');
+const onDataSaved = (dataSaved) => {
+    emit('onDataSaved', dataSaved);
     closeForm();
 };
 
@@ -59,7 +59,7 @@ const closeForm = () => {
         :default-actions="false"
         :url-create="urlCreate"
         :model="model"
-        @on-data-saved="onDataSaved()"
+        @on-data-saved="onDataSaved($event)"
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
diff --git a/src/pages/Customer/Card/CustomerConsigneeCreate.vue b/src/pages/Customer/Card/CustomerConsigneeCreate.vue
index 69d478b6f..2f8ef1b97 100644
--- a/src/pages/Customer/Card/CustomerConsigneeCreate.vue
+++ b/src/pages/Customer/Card/CustomerConsigneeCreate.vue
@@ -28,10 +28,11 @@ const formInitialData = reactive({
     customsAgentFk: null,
 });
 
+const townsFetchDataRef = ref(null);
+const postcodeFetchDataRef = ref(null);
 const agencyModes = ref([]);
 const incoterms = ref([]);
 const customsAgents = ref([]);
-const postcodeFetchDataRef = ref(null);
 const citiesLocationOptions = ref([]);
 const provincesLocationOptions = ref([]);
 const postcodesOptions = ref([]);
@@ -41,18 +42,24 @@ onBeforeMount(() => {
     urlCreate.value = `Clients/${route.params.id}/createAddress`;
 });
 
-const onPostcodeCreated = async () => {
-    postcodeFetchDataRef.value.fetch();
+const onPostcodeCreated = async ({ code, provinceFk, townFk }, formData) => {
+    await postcodeFetchDataRef.value.fetch();
+    await townsFetchDataRef.value.fetch();
+    formData.postalCode = code;
+    formData.provinceFk = provinceFk;
+    formData.city = citiesLocationOptions.value.find((town) => town.id === townFk).name;
 };
 </script>
 
 <template>
     <FetchData
+        ref="postcodeFetchDataRef"
         @on-fetch="(data) => (postcodesOptions = data)"
         auto-load
         url="Postcodes/location"
     />
     <FetchData
+        ref="townsFetchDataRef"
         @on-fetch="(data) => (citiesLocationOptions = data)"
         auto-load
         url="Towns/location"
@@ -110,7 +117,7 @@ const onPostcodeCreated = async () => {
                     >
                         <template #form>
                             <CustomerCreateNewPostcode
-                                @on-data-saved="onPostcodeCreated($event)"
+                                @on-data-saved="onPostcodeCreated($event, data)"
                             />
                         </template>
                         <template #option="scope">
diff --git a/src/pages/Customer/Card/CustomerConsignees.vue b/src/pages/Customer/Card/CustomerConsignees.vue
index f8f6160dd..f412eda59 100644
--- a/src/pages/Customer/Card/CustomerConsignees.vue
+++ b/src/pages/Customer/Card/CustomerConsignees.vue
@@ -5,6 +5,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -43,43 +44,38 @@ const toCustomerConsigneeEdit = () => {
             auto-load
         >
             <template #body="{ rows }">
-                <div v-for="(item, index) in rows" :key="index">
-                    <div
-                        :class="{
-                            'consignees-card': true,
-                            'q-mb-md': index + 1 === rows.length ? false : true,
-                        }"
-                    >
-                        <div class="consignees-card-icon">
-                            <QIcon name="star" size="md" color="primary" />
+                <QCard
+                    v-for="(item, index) in rows"
+                    :key="index"
+                    :class="['consignees-card', { 'q-mb-md': rows.length - 1 !== index }]"
+                    @click="toCustomerConsigneeEdit()"
+                >
+                    <div class="consignees-card-icon">
+                        <QIcon name="star" size="md" color="primary" />
+                    </div>
+                    <div>
+                        <div class="text-weight-bold q-mb-sm">
+                            {{ item.nickname }} - #{{ item.id }}
                         </div>
+                        <div>{{ item.street }}</div>
                         <div>
-                            <div>
-                                <div class="text-weight-bold">
-                                    {{ item.nickname }} - #{{ item.id }}
-                                </div>
-                                <div>{{ item.street }}</div>
-                                <div>
-                                    {{ item.postalCode }} - {{ item.city }},
-                                    {{ setProvince(item.provinceFk) }}
-                                </div>
-                            </div>
-                            <div class="flex">
-                                <QCheckbox
-                                    :label="t('Is equalizated')"
-                                    v-model="item.isEqualizated"
-                                    class="q-mr-lg"
-                                    @click.stop="toCustomerConsigneeEdit()"
-                                />
-                                <QCheckbox
-                                    :label="t('Is logiflora allowed')"
-                                    v-model="item.isLogifloraAllowed"
-                                    @click.stop="toCustomerConsigneeEdit()"
-                                />
-                            </div>
+                            {{ item.postalCode }} - {{ item.city }},
+                            {{ setProvince(item.provinceFk) }}
+                        </div>
+                        <div class="flex">
+                            <VnLv
+                                :label="t('Is equalizated')"
+                                :value="item.isEqualizated"
+                                class="row q-mr-lg"
+                            />
+                            <VnLv
+                                :label="t('Is logiflora allowed')"
+                                :value="item.isLogifloraAllowed"
+                                class="row"
+                            />
                         </div>
                     </div>
-                </div>
+                </QCard>
                 <QPageSticky :offset="[18, 18]">
                     <QBtn
                         @click.stop="toCustomerConsigneeCreate()"
@@ -102,6 +98,11 @@ const toCustomerConsigneeEdit = () => {
     border-radius: 10px;
     padding: 10px;
     display: flex;
+    cursor: pointer;
+
+    &:hover {
+        background-color: var(--vn-light-gray);
+    }
 }
 .consignees-card-icon {
     margin: 0 15px 0 5px;

From f64ac5c70d0974a0022c21547160aacc4f26d0f8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 12 Jan 2024 17:02:52 -0300
Subject: [PATCH 103/105] Entry summary

---
 src/i18n/en/index.js                        |  30 ++
 src/i18n/es/index.js                        |  30 ++
 src/pages/Entry/Card/EntrySummary.vue       | 373 ++++++++++++++++++++
 src/pages/Entry/Card/EntrySummaryDialog.vue |  29 ++
 src/pages/Entry/EntryList.vue               |  17 +-
 src/pages/Supplier/Card/SupplierSummary.vue |   1 -
 src/router/modules/entry.js                 |  35 +-
 7 files changed, 488 insertions(+), 27 deletions(-)
 create mode 100644 src/pages/Entry/Card/EntrySummary.vue
 create mode 100644 src/pages/Entry/Card/EntrySummaryDialog.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index ffff99cc4..a8859798e 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -274,6 +274,36 @@ export default {
             confirmed: 'Confirmed',
             ordered: 'Ordered',
         },
+        summary: {
+            commission: 'Commission',
+            currency: 'Currency',
+            company: 'Company',
+            reference: 'Reference',
+            invoiceNumber: 'Invoice number',
+            ordered: 'Ordered',
+            confirmed: 'Confirmed',
+            booked: 'Booked',
+            raid: 'Raid',
+            excludedFromAvailable: 'Inventory',
+            travelReference: 'Reference',
+            travelAgency: 'Agency',
+            travelShipped: 'Shipped',
+            travelWarehouseOut: 'Warehouse Out',
+            travelDelivered: 'Delivered',
+            travelLanded: 'Landed',
+            travelWarehouseIn: 'Warehouse In',
+            travelReceived: 'Received',
+            buys: 'Buys',
+            quantity: 'Quantity',
+            stickers: 'Stickers',
+            package: 'Package',
+            weight: 'Weight',
+            packing: 'Packing',
+            grouping: 'Grouping',
+            buyingValue: 'Buying value',
+            import: 'Import',
+            pvp: 'PVP',
+        },
     },
     ticket: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index d8993a08c..27687ef57 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -272,6 +272,36 @@ export default {
             confirmed: 'Confirmado',
             ordered: 'Pedida',
         },
+        summary: {
+            commission: 'Comisión',
+            currency: 'Moneda',
+            company: 'Empresa',
+            reference: 'Referencia',
+            invoiceNumber: 'Núm. factura',
+            ordered: 'Pedida',
+            confirmed: 'Confirmado',
+            booked: 'Asentado',
+            raid: 'Redada',
+            excludedFromAvailable: 'Inventario',
+            travelReference: 'Referencia',
+            travelAgency: 'Agencia',
+            travelShipped: 'F. envio',
+            travelWarehouseOut: 'Alm. salida',
+            travelDelivered: 'Enviada',
+            travelLanded: 'F. entrega',
+            travelWarehouseIn: 'Alm. entrada',
+            travelReceived: 'Recibida',
+            buys: 'Compras',
+            quantity: 'Cantidad',
+            stickers: 'Etiquetas',
+            package: 'Embalaje',
+            weight: 'Peso',
+            packing: 'Packing',
+            grouping: 'Grouping',
+            buyingValue: 'Coste',
+            import: 'Importe',
+            pvp: 'PVP',
+        },
     },
     ticket: {
         pageTitles: {
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
new file mode 100644
index 000000000..19c59da27
--- /dev/null
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -0,0 +1,373 @@
+<script setup>
+import { onMounted, ref, computed, onUpdated } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+
+import { toDate, toCurrency } from 'src/filters';
+import { getUrl } from 'src/composables/getUrl';
+import axios from 'axios';
+
+onUpdated(() => summaryRef.value.fetch());
+
+const route = useRoute();
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const entityId = computed(() => $props.id || route.params.id);
+const summaryRef = ref();
+const entry = ref();
+const entryBuys = ref([]);
+const entryUrl = ref();
+
+onMounted(async () => {
+    entryUrl.value = (await getUrl('entry/')) + entityId.value;
+});
+
+const tableColumnComponents = {
+    quantity: {
+        component: () => 'span',
+        props: () => {},
+    },
+    stickers: {
+        component: () => 'span',
+        props: () => {},
+        event: () => {},
+    },
+    packagingFk: {
+        component: () => 'span',
+        props: () => {},
+        event: () => {},
+    },
+    weight: {
+        component: () => 'span',
+        props: () => {},
+        event: () => {},
+    },
+    packing: {
+        component: () => 'span',
+        props: () => {},
+        event: () => {},
+    },
+    grouping: {
+        component: () => 'span',
+        props: () => {},
+        event: () => {},
+    },
+    buyingValue: {
+        component: () => 'span',
+        props: () => {},
+        event: () => {},
+    },
+    amount: {
+        component: () => 'span',
+        props: () => {},
+        event: () => {},
+    },
+    pvp: {
+        component: () => 'span',
+        props: () => {},
+        event: () => {},
+    },
+};
+
+const entriesTableColumns = computed(() => {
+    return [
+        {
+            label: t('entry.summary.quantity'),
+            field: 'quantity',
+            name: 'quantity',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.stickers'),
+            field: 'stickers',
+            name: 'stickers',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.package'),
+            field: 'packagingFk',
+            name: 'packagingFk',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.weight'),
+            field: 'weight',
+            name: 'weight',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.packing'),
+            field: 'packing',
+            name: 'packing',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.grouping'),
+            field: 'grouping',
+            name: 'grouping',
+            align: 'left',
+        },
+        {
+            label: t('entry.summary.buyingValue'),
+            field: 'buyingValue',
+            name: 'buyingValue',
+            align: 'left',
+            format: (value) => toCurrency(value),
+        },
+        {
+            label: t('entry.summary.import'),
+            name: 'amount',
+            align: 'left',
+            format: (_, row) => toCurrency(row.buyingValue * row.quantity),
+        },
+        {
+            label: t('entry.summary.pvp'),
+            name: 'pvp',
+            align: 'left',
+            format: (_, row) => toCurrency(row.price2) + ' / ' + toCurrency(row.price3),
+        },
+    ];
+});
+
+async function setEntryData(data) {
+    if (data) entry.value = data;
+    await fetchEntryBuys();
+}
+
+const fetchEntryBuys = async () => {
+    try {
+        const { data } = await axios.get(`Entries/${entry.value.id}/getBuys`);
+        if (data) entryBuys.value = data;
+    } catch (err) {
+        console.error('Error fetching entry buys');
+    }
+};
+</script>
+
+<template>
+    <CardSummary
+        ref="summaryRef"
+        :url="`Entries/${entityId}/getEntry`"
+        @on-fetch="(data) => setEntryData(data)"
+    >
+        <template #header-left>
+            <a class="header link" :href="entryUrl">
+                <QIcon name="open_in_new" color="white" size="sm" />
+            </a>
+        </template>
+        <template #header>
+            <span>{{ entry.id }} - {{ entry.supplier.nickname }}</span>
+        </template>
+
+        <template #body>
+            <QCard class="vn-one">
+                <a class="header link" :href="entryUrl">
+                    {{ t('globals.summary.basicData') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <VnRow>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.commission')"
+                            :value="entry.commission"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.currency')"
+                            :value="entry.currency.name"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.company')"
+                            :value="entry.company.code"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.reference')"
+                            :value="entry.reference"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.invoiceNumber')"
+                            :value="entry.invoiceNumber"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.ordered')"
+                            :value="entry.isOrdered"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.confirmed')"
+                            :value="entry.isConfirmed"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.booked')"
+                            :value="entry.isBooked"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv :label="t('entry.summary.raid')" :value="entry.isRaid" />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.excludedFromAvailable')"
+                            :value="entry.isExcludedFromAvailable"
+                        />
+                    </div>
+                </VnRow>
+            </QCard>
+            <QCard class="vn-one">
+                <a class="header link" :href="entryUrl">
+                    {{ t('Travel data') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <VnRow>
+                    <div class="col">
+                        <VnLv :label="t('entry.summary.travelReference')">
+                            <template #value>
+                                <span class="link">
+                                    {{ entry.travel.ref }}
+                                    <TravelDescriptorProxy :id="entry.travel.id" />
+                                </span>
+                            </template>
+                        </VnLv>
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.travelAgency')"
+                            :value="entry.travel.agency.name"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.travelShipped')"
+                            :value="toDate(entry.travel.shipped)"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.travelWarehouseOut')"
+                            :value="entry.travel.warehouseOut.name"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.travelDelivered')"
+                            :value="entry.travel.isDelivered"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.travelLanded')"
+                            :value="toDate(entry.travel.landed)"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.travelWarehouseIn')"
+                            :value="entry.travel.warehouseIn.name"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnLv
+                            :label="t('entry.summary.travelReceived')"
+                            :value="entry.travel.isReceived"
+                        />
+                    </div>
+                </VnRow>
+            </QCard>
+            <QCard class="vn-two" style="min-width: 100%">
+                <a class="header">
+                    {{ t('entry.summary.buys') }}
+                </a>
+                <QTable
+                    :rows="entryBuys"
+                    :columns="entriesTableColumns"
+                    hide-bottom
+                    row-key="index"
+                    class="full-width q-mt-md"
+                >
+                    <template #body="{ cols, row, rowIndex }">
+                        <QTr no-hover>
+                            <QTd v-for="col in cols" :key="col.name">
+                                <component
+                                    :is="tableColumnComponents[col.name].component(props)"
+                                    v-bind="tableColumnComponents[col.name].props(props)"
+                                    @click="tableColumnComponents[col.name].event(props)"
+                                    class="col-content"
+                                >
+                                    <template
+                                        v-if="
+                                            col.name !== 'observation' &&
+                                            col.name !== 'isConfirmed'
+                                        "
+                                        >{{ col.value }}</template
+                                    >
+                                    <QTooltip v-if="col.toolTip">{{
+                                        col.toolTip
+                                    }}</QTooltip>
+                                </component>
+                            </QTd>
+                        </QTr>
+                        <QTr no-hover>
+                            <QTd>
+                                <span>{{ row.item.itemType.code }}</span>
+                            </QTd>
+                            <QTd>
+                                <span>{{ row.item.id }}</span>
+                            </QTd>
+                            <QTd>
+                                <span>{{ row.item.size }}</span>
+                            </QTd>
+                            <QTd>
+                                <span>{{ toCurrency(row.item.minPrice) }}</span>
+                            </QTd>
+                            <QTd colspan="6">
+                                <span>{{ row.item.concept }}</span>
+                                <span v-if="row.item.subName" class="subName">
+                                    {{ row.item.subName }}
+                                </span>
+                                <fetched-tags :item="row.item" :max-length="5" />
+                            </QTd>
+                        </QTr>
+                        <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->
+                        <QTr
+                            v-if="rowIndex !== entryBuys.length - 1"
+                            style="height: 30px"
+                        >
+                            <QTd colspan="10" />
+                        </QTr>
+                    </template>
+                </QTable>
+            </QCard>
+        </template>
+    </CardSummary>
+</template>
+
+<i18n>
+es:
+    Travel data: 'Datos envío'
+</i18n>
diff --git a/src/pages/Entry/Card/EntrySummaryDialog.vue b/src/pages/Entry/Card/EntrySummaryDialog.vue
new file mode 100644
index 000000000..527421ce2
--- /dev/null
+++ b/src/pages/Entry/Card/EntrySummaryDialog.vue
@@ -0,0 +1,29 @@
+<script setup>
+import { useDialogPluginComponent } from 'quasar';
+import EntrySummary from './EntrySummary.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+
+defineEmits([...useDialogPluginComponent.emits]);
+
+const { dialogRef, onDialogHide } = useDialogPluginComponent();
+</script>
+
+<template>
+    <QDialog ref="dialogRef" @hide="onDialogHide">
+        <EntrySummary v-if="$props.id" :id="$props.id" />
+    </QDialog>
+</template>
+
+<style lang="scss">
+.q-dialog .summary .header {
+    position: sticky;
+    z-index: $z-max;
+    top: 0;
+}
+</style>
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 84f0d8112..fc4f60ff0 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -8,6 +8,7 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
+import EntrySummaryDialog from './Card/EntrySummaryDialog.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters/index';
@@ -23,7 +24,7 @@ onMounted(async () => {
 onUnmounted(() => (stateStore.rightDrawer = false));
 
 function navigate(id) {
-    router.push({ path: `/invoice-in/${id}` });
+    router.push({ path: `/entry/${id}` });
 }
 
 const redirectToCreateView = () => {
@@ -31,12 +32,12 @@ const redirectToCreateView = () => {
 };
 
 function viewSummary(id) {
-    // quasar.dialog({
-    //     component: EntrySummaryDialog,
-    //     componentProps: {
-    //         id,
-    //     },
-    // });
+    quasar.dialog({
+        component: EntrySummaryDialog,
+        componentProps: {
+            id,
+        },
+    });
 }
 </script>
 
@@ -66,7 +67,7 @@ function viewSummary(id) {
                         :title="row.reference"
                         @click="navigate(row.id)"
                         :id="row.id"
-                        :has-info-icons="row.isExcludedFromAvailable || row.isRaid"
+                        :has-info-icons="!!row.isExcludedFromAvailable || !!row.isRaid"
                     >
                         <template #info-icons>
                             <QIcon
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 29b0c18c4..d734e21a5 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -182,4 +182,3 @@ const isAdministrative = computed(() => {
         </template>
     </CardSummary>
 </template>
-<style lang="scss" scoped></style>
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 6a1cd6173..a806190a8 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -39,23 +39,22 @@ export default {
                 },
             ],
         },
-        // {
-        //     name: 'EntryCard',
-        //     path: ':id',
-        //     component: () => import('src/pages/Entry/Card/EntryCard.vue'),
-        //     redirect: { name: 'EntrySummary' },
-        //     children: [
-        //         {
-        //             name: 'EntrySummary',
-        //             path: 'summary',
-        //             meta: {
-        //                 title: 'summary',
-        //                 icon: 'launch',
-        //             },
-        //             component: () =>
-        //                 import('src/pages/Entry/Card/EntrySummary.vue'),
-        //         },
-        //     ],
-        // },
+        {
+            name: 'EntryCard',
+            path: ':id',
+            component: () => import('src/pages/Entry/Card/EntryCard.vue'),
+            redirect: { name: 'EntrySummary' },
+            children: [
+                {
+                    name: 'EntrySummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'launch',
+                    },
+                    component: () => import('src/pages/Entry/Card/EntrySummary.vue'),
+                },
+            ],
+        },
     ],
 };

From 91f675ec99198dc51831d41f6502bcebfb72867e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sun, 14 Jan 2024 21:12:39 -0300
Subject: [PATCH 104/105] small table visual change in entry summary

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

diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 19c59da27..d19b1f744 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -356,9 +356,9 @@ const fetchEntryBuys = async () => {
                         <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->
                         <QTr
                             v-if="rowIndex !== entryBuys.length - 1"
-                            style="height: 30px"
+                            class="separation-row"
                         >
-                            <QTd colspan="10" />
+                            <QTd colspan="10" style="height: 24px" />
                         </QTr>
                     </template>
                 </QTable>
@@ -367,6 +367,12 @@ const fetchEntryBuys = async () => {
     </CardSummary>
 </template>
 
+<style lang="scss" scoped>
+.separation-row {
+    background-color: var(--vn-gray) !important;
+}
+</style>
+
 <i18n>
 es:
     Travel data: 'Datos envío'

From c471a4febc4046f57dd0f0b9e0325b6c51fd8ab6 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Mon, 15 Jan 2024 09:16:50 -0500
Subject: [PATCH 105/105] Se crea el formulario para la creacion de un agente
 de aduanas

---
 .../Customer/Card/CustomerConsignees.vue      | 16 +++--
 .../CustomerConsigneeCreate.vue               | 34 ++++++----
 .../CustomerConsigneeEdit.vue                 |  0
 .../components/CustomerNewCustomsAgent.vue    | 65 +++++++++++++++++++
 src/router/modules/customer.js                |  4 +-
 5 files changed, 98 insertions(+), 21 deletions(-)
 rename src/pages/Customer/{Card => components}/CustomerConsigneeCreate.vue (91%)
 rename src/pages/Customer/{Card => components}/CustomerConsigneeEdit.vue (100%)
 create mode 100644 src/pages/Customer/components/CustomerNewCustomsAgent.vue

diff --git a/src/pages/Customer/Card/CustomerConsignees.vue b/src/pages/Customer/Card/CustomerConsignees.vue
index f412eda59..553ab641b 100644
--- a/src/pages/Customer/Card/CustomerConsignees.vue
+++ b/src/pages/Customer/Card/CustomerConsignees.vue
@@ -47,7 +47,10 @@ const toCustomerConsigneeEdit = () => {
                 <QCard
                     v-for="(item, index) in rows"
                     :key="index"
-                    :class="['consignees-card', { 'q-mb-md': rows.length - 1 !== index }]"
+                    :class="{
+                        'consignees-card': true,
+                        'q-mb-md': index < rows.length - 1,
+                    }"
                     @click="toCustomerConsigneeEdit()"
                 >
                     <div class="consignees-card-icon">
@@ -63,15 +66,14 @@ const toCustomerConsigneeEdit = () => {
                             {{ setProvince(item.provinceFk) }}
                         </div>
                         <div class="flex">
-                            <VnLv
+                            <QCheckbox
                                 :label="t('Is equalizated')"
-                                :value="item.isEqualizated"
-                                class="row q-mr-lg"
+                                v-model="item.isEqualizated"
+                                class="q-mr-lg"
                             />
-                            <VnLv
+                            <QCheckbox
                                 :label="t('Is logiflora allowed')"
-                                :value="item.isLogifloraAllowed"
-                                class="row"
+                                v-model="item.isLogifloraAllowed"
                             />
                         </div>
                     </div>
diff --git a/src/pages/Customer/Card/CustomerConsigneeCreate.vue b/src/pages/Customer/components/CustomerConsigneeCreate.vue
similarity index 91%
rename from src/pages/Customer/Card/CustomerConsigneeCreate.vue
rename to src/pages/Customer/components/CustomerConsigneeCreate.vue
index 2f8ef1b97..3f3b2aedf 100644
--- a/src/pages/Customer/Card/CustomerConsigneeCreate.vue
+++ b/src/pages/Customer/components/CustomerConsigneeCreate.vue
@@ -8,8 +8,9 @@ import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
-import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
+import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
+import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -124,15 +125,12 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk }, formData) => {
                             <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
-                                    >
+                                    <QItemLabel caption>
+                                        {{ scope.opt.code }} -
+                                        {{ scope.opt.town.name }}
+                                        ({{ scope.opt.town.province.name }},
+                                        {{ scope.opt.town.province.country.country }})
+                                    </QItemLabel>
                                 </QItemSection>
                             </QItem>
                         </template>
@@ -218,20 +216,32 @@ const onPostcodeCreated = async ({ code, provinceFk, townFk }, formData) => {
                     />
                 </div>
                 <div class="col">
-                    <VnSelectFilter
+                    <VnSelectCreate
                         :label="t('Customs agent')"
                         :options="customsAgents"
                         hide-selected
                         option-label="fiscalName"
                         option-value="id"
                         v-model="data.customsAgentFk"
-                    />
+                    >
+                        <template #form>
+                            <CustomsNewCustomsAgent />
+                        </template>
+                    </VnSelectCreate>
                 </div>
             </VnRow>
         </template>
     </FormModel>
 </template>
 
+<style lang="scss" scoped>
+.add-icon {
+    cursor: pointer;
+    background-color: $primary;
+    border-radius: 50px;
+}
+</style>
+
 <i18n>
 es:
     Default: Predeterminado
diff --git a/src/pages/Customer/Card/CustomerConsigneeEdit.vue b/src/pages/Customer/components/CustomerConsigneeEdit.vue
similarity index 100%
rename from src/pages/Customer/Card/CustomerConsigneeEdit.vue
rename to src/pages/Customer/components/CustomerConsigneeEdit.vue
diff --git a/src/pages/Customer/components/CustomerNewCustomsAgent.vue b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
new file mode 100644
index 000000000..b8b83e763
--- /dev/null
+++ b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
@@ -0,0 +1,65 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const { t } = useI18n();
+
+const initialData = reactive({
+    nif: null,
+    fiscalName: null,
+    street: null,
+    phone: null,
+});
+
+const onDataSaved = (dataSaved) => {
+    emit('onDataSaved', dataSaved);
+};
+</script>
+
+<template>
+    <FormModelPopup
+        :title="t('New customs agent')"
+        url-create="CustomsAgents"
+        model="customer"
+        :form-initial-data="initialData"
+        @on-data-saved="onDataSaved($event)"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput :label="t('NIF')" :required="true" v-model="data.nif" />
+                </div>
+                <div class="col">
+                    <VnInput
+                        :label="t('Fiscal name')"
+                        :required="true"
+                        v-model="data.fiscalName"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput :label="t('Street')" v-model="data.street" />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Phone')" v-model="data.phone" />
+                </div>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    New customs agent: Nuevo agente de aduanas
+    NIF: NIF
+    Fiscal name: Nombre fiscal
+    Street: Dirección fiscal
+    Phone: Teléfono
+</i18n>
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 752c486ee..a0dc2df23 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -173,7 +173,7 @@ export default {
                             },
                             component: () =>
                                 import(
-                                    'src/pages/Customer/Card/CustomerConsigneeCreate.vue'
+                                    'src/pages/Customer/components/CustomerConsigneeCreate.vue'
                                 ),
                         },
                         {
@@ -184,7 +184,7 @@ export default {
                             },
                             component: () =>
                                 import(
-                                    'src/pages/Customer/Card/CustomerConsigneeEdit.vue'
+                                    'src/pages/Customer/components/CustomerConsigneeEdit.vue'
                                 ),
                         },
                     ],