From 0a71060f603ead9badd05d1f09b0424f4a14e012 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 May 2024 15:28:00 +0200
Subject: [PATCH 1/2] fix: refs #6938 workerCard

---
 src/pages/Worker/Card/WorkerCard.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index e0047bf9e..d76ef6f59 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -1,15 +1,12 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import WorkerDescriptor from './WorkerDescriptor.vue';
-
-const filter = { where: {} };
 </script>
 <template>
     <VnCard
         data-key="Worker"
-        custom-url="Workers/Summary"
+        base-url="Workers"
         :descriptor="WorkerDescriptor"
-        :filter="filter"
         searchbar-data-key="WorkerList"
         searchbar-url="Workers/filter"
         searchbar-label="Search worker"
-- 
2.40.1


From 5e0db81a211b29b50ec27878434c9d63e76dc3fe Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 7 May 2024 15:51:55 +0200
Subject: [PATCH 2/2] fix: refs #6938 conflicts

---
 src/pages/Worker/Card/WorkerBasicData.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/pages/Worker/Card/WorkerBasicData.vue b/src/pages/Worker/Card/WorkerBasicData.vue
index 0b4250c68..4f1786a67 100644
--- a/src/pages/Worker/Card/WorkerBasicData.vue
+++ b/src/pages/Worker/Card/WorkerBasicData.vue
@@ -86,13 +86,6 @@ const maritalStatus = [
                     :label="t('Mobile extension')"
                     clearable
                 />
-                <<<<<<< HEAD
-                <VnInput
-                    v-model="data.client.phone"
-                    :label="t('Personal phone')"
-                    clearable
-                />
-                ======= >>>>>>> 095e62ebac4b6b88bc431f7c87455a0bb0989e80
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-- 
2.40.1