From 9ee69274ae794f88350d3f71619fbcb111a728cf Mon Sep 17 00:00:00 2001
From: jon <jon@verdnatura.es>
Date: Wed, 7 May 2025 12:28:05 +0200
Subject: [PATCH 1/4] fix: make 0 become valid in VnInputNumber when using
 required from validator

---
 src/composables/useValidator.js               |  4 +++-
 .../customer/clientCredits.spec.js            | 22 ++++++++++++++++++-
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/composables/useValidator.js b/src/composables/useValidator.js
index ae6c47d91..e887c0c4f 100644
--- a/src/composables/useValidator.js
+++ b/src/composables/useValidator.js
@@ -47,7 +47,9 @@ export function useValidator() {
                 return !validator.isEmpty(value ? String(value) : '') || message;
             },
             required: (required, value) => {
-                return required ? !!value || t('globals.fieldRequired') : null;
+                return required
+                    ? value === 0 || !!value || t('globals.fieldRequired')
+                    : null;
             },
             length: (value) => {
                 const options = {
diff --git a/test/cypress/integration/customer/clientCredits.spec.js b/test/cypress/integration/customer/clientCredits.spec.js
index 5f303b40d..f39f3c06c 100644
--- a/test/cypress/integration/customer/clientCredits.spec.js
+++ b/test/cypress/integration/customer/clientCredits.spec.js
@@ -7,7 +7,27 @@ describe('Client credits', () => {
             timeout: 5000,
         });
     });
-    it('Should load layout', () => {
+
+    it('Should put a new credit', () => {
         cy.get('.q-page').should('be.visible');
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.dataCy('Credit_input').type('100');
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data saved');
+    });
+
+    it('Should put a new credit with value 0 to close the client card', () => {
+        cy.get('.q-page').should('be.visible');
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.dataCy('Credit_input').type('0');
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data saved');
+    });
+
+    it('Should not create the credit if there is no value in the input', () => {
+        cy.get('.q-page').should('be.visible');
+        cy.dataCy('vnTableCreateBtn').click();
+        cy.dataCy('FormModelPopup_save').click();
+        cy.get('.q-notification__message').should('not.exist');
     });
 });

From 84945b32f680708df35d790e0b218e03a4d316b7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 12 May 2025 13:13:14 +0200
Subject: [PATCH 2/4] fix: initialize form data in FormModelPopup

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

diff --git a/src/pages/Customer/components/CustomerNewCustomsAgent.vue b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
index ec9806334..69ecb0d27 100644
--- a/src/pages/Customer/components/CustomerNewCustomsAgent.vue
+++ b/src/pages/Customer/components/CustomerNewCustomsAgent.vue
@@ -16,6 +16,7 @@ const onDataSaved = (dataSaved) => {
 
 <template>
     <FormModelPopup
+        :form-initial-data="{}"
         :title="t('New customs agent')"
         @on-data-saved="onDataSaved($event)"
         model="customer"

From 16ed4e61813916ee3e6f453e3310962081f95296 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 12 May 2025 13:13:22 +0200
Subject: [PATCH 3/4] feat: add customs agent creation handling in
 CustomerAddressEdit

---
 .../Customer/components/CustomerAddressEdit.vue      | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index bc76f5985..5a7684e5e 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -179,6 +179,11 @@ function handleLocation(data, location) {
     data.provinceFk = provinceFk;
     data.countryFk = countryFk;
 }
+
+function onAgentCreated({ id, fiscalName }, data) {
+    customsAgents.value.push({ id, fiscalName });
+    data.customsAgentFk = id;
+}
 </script>
 
 <template>
@@ -292,9 +297,14 @@ function handleLocation(data, location) {
                     option-value="id"
                     v-model="data.customsAgentFk"
                     :tooltip="t('New customs agent')"
+                    :acls="[{ model: 'CustomsAgent', props: '*', accessType: 'WRITE' }]"
                 >
                     <template #form>
-                        <CustomerNewCustomsAgent />
+                        <CustomerNewCustomsAgent
+                            @on-data-saved="
+                                (requestResponse) => onAgentCreated(requestResponse, data)
+                            "
+                        />
                     </template>
                 </VnSelectDialog>
             </VnRow>

From d87308844b99436cbc8bf6d4fb1b1e2e7292b358 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 15 May 2025 09:19:37 +0200
Subject: [PATCH 4/4] fix: remove unused router import and update filter syntax
 in VnLog

---
 src/components/common/VnLog.vue               |  5 ++---
 .../Department/Card/DepartmentDescriptor.vue  | 22 +++++++++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 6e9128a43..1a180aaed 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, onMounted, onUnmounted, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import axios from 'axios';
 import { date } from 'quasar';
 import { useStateStore } from 'stores/useStateStore';
@@ -21,7 +21,6 @@ const stateStore = useStateStore();
 const validationsStore = useValidator();
 const { models } = validationsStore;
 const route = useRoute();
-const router = useRouter();
 const { t } = useI18n();
 const props = defineProps({
     model: {
@@ -273,7 +272,7 @@ onUnmounted(() => {
         :data-key
         :url="dataKey + 's'"
         :user-filter="filter"
-        :filter="{ where: { and: [{ originFk: route.params.id }] } }"
+        :filter="{ where: { originFk: $route.params.id } }"
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
diff --git a/src/pages/Worker/Department/Card/DepartmentDescriptor.vue b/src/pages/Worker/Department/Card/DepartmentDescriptor.vue
index 820658593..9f8cbc054 100644
--- a/src/pages/Worker/Department/Card/DepartmentDescriptor.vue
+++ b/src/pages/Worker/Department/Card/DepartmentDescriptor.vue
@@ -46,6 +46,28 @@ const { openConfirmationModal } = useVnConfirm();
         :summary="$props.summary"
         :to-module="{ name: 'WorkerDepartment' }"
         data-key="Department"
+        :filter="{
+            include: [
+                {
+                    relation: 'client',
+                    scope: {
+                        fields: ['id', 'name'],
+                    },
+                },
+                {
+                    relation: 'worker',
+                    scope: {
+                        fields: ['id', 'name'],
+                        include: {
+                            relation: 'user',
+                            scope: {
+                                fields: ['id', 'name'],
+                            },
+                        },
+                    },
+                },
+            ],
+        }"
     >
         <template #menu="{}">
             <QItem