From 6e9ea9665d982605eab682e51070d06724760f57 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Tue, 7 May 2024 13:18:46 +0200
Subject: [PATCH] Merge branch 'master' into test

---
 modules/worker/back/models/worker.json | 84 --------------------------
 1 file changed, 84 deletions(-)

diff --git a/modules/worker/back/models/worker.json b/modules/worker/back/models/worker.json
index fd3a530b4..ed430f133 100644
--- a/modules/worker/back/models/worker.json
+++ b/modules/worker/back/models/worker.json
@@ -92,89 +92,5 @@
             "model": "WorkerTeamCollegues",
             "foreignKey": "workerFk"
         }
-<<<<<<< HEAD
-    },
-    "scopes":{
-        "summary": {
-            "include": [
-                {
-                    "relation": "user",
-                    "scope": {
-                        "fields": ["email", "name", "nickname", "roleFk", "emailVerified"],
-                        "include": [
-                            {
-                                "relation": "role",
-                                "scope": {
-                                    "fields": ["name"]
-                                }
-                            },
-                            {
-                                "relation": "emailUser",
-                                "scope": {
-                                    "fields": ["email"]
-                                }
-                            }
-                        ]
-                    }
-                }, {
-                    "relation": "department",
-                    "scope": {
-                        "include": {
-                            "relation": "department"
-                        }
-                    }
-                }, {
-                    "relation": "boss"
-                }, {
-                    "relation": "client",
-                    "scope": {
-                        "fields": [
-                            "id",
-                            "name",
-                            "fi",
-                            "socialName",
-                            "contact",
-                            "street",
-                            "city",
-                            "postcode",
-                            "email",
-                            "mobile",
-                            "isActive",
-                            "credit",
-                            "creditInsurance",
-                            "iban",
-                            "dueDay",
-                            "isEqualizated",
-                            "isFreezed",
-                            "hasToInvoiceByAddress",
-                            "hasToInvoice",
-                            "isToBeMailed",
-                            "hasSepaVnl",
-                            "hasLcr",
-                            "hasCoreVnl",
-                            "hasCoreVnh",
-                            "hasIncoterms",
-                            "isTaxDataChecked",
-                            "quality",
-                            "isVies",
-                            "isRelevant",
-                            "accountingAccount",
-                            "created",
-                            "sageTaxTypeFk",
-                            "sageTransactionTypeFk",
-                            "businessTypeFk",
-                            "salesPersonFk",
-                            "hasElectronicInvoice",
-                            "rating",
-                            "recommendedCredit"
-                        ]
-                    }
-                }, {
-                    "relation": "sip"
-                }
-            ]
-        }
-=======
->>>>>>> master
     }
 }