From c72ea3c692e7872d0b39a950e4ad24c9758328c8 Mon Sep 17 00:00:00 2001
From: "s.pongratz" <s.pongratz@adito.de>
Date: Mon, 3 Aug 2020 11:43:43 +0200
Subject: [PATCH] #1062047-FehlerBearbeitungMitarbeiter Anzeige der E-Mail und
 Behebung des Fehlers beim Setzen

---
 entity/Employee_entity/entityfields/contact_id/onValueChange.js | 2 +-
 .../entityfields/email_address/dropDownProcess.js               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/entity/Employee_entity/entityfields/contact_id/onValueChange.js b/entity/Employee_entity/entityfields/contact_id/onValueChange.js
index d469435d5c..4a1dbe67e5 100644
--- a/entity/Employee_entity/entityfields/contact_id/onValueChange.js
+++ b/entity/Employee_entity/entityfields/contact_id/onValueChange.js
@@ -22,7 +22,7 @@ if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.r
     neon.setFieldValues({
         "$field.FIRSTNAME" : name[0] || "",
         "$field.LASTNAME" : name[1] || "",
-        "$field.EMAIL_ADDRESS" : name[2] || "",
+        "$field.EMAIL_ADDRESS" : name[2] || vars.get("$field.EMAIL_ADDRESS") || "",
         "$field.TITLE" : username
     });
 }
\ No newline at end of file
diff --git a/entity/Employee_entity/entityfields/email_address/dropDownProcess.js b/entity/Employee_entity/entityfields/email_address/dropDownProcess.js
index 99e97c2ddd..559a598b48 100644
--- a/entity/Employee_entity/entityfields/email_address/dropDownProcess.js
+++ b/entity/Employee_entity/entityfields/email_address/dropDownProcess.js
@@ -6,7 +6,7 @@ import("system.result");
 import("Sql_lib");
 
 var contactId = vars.get("$field.CONTACT_ID");
-if (contactId && (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW))
+if (contactId)
 {
     var addresses = newSelect("ADDR, ADDR")
                 .from("COMMUNICATION")
-- 
GitLab