Merge branch '1057842_FixUpdatingContactInOffer' into '2020.1'

[Projekt: Entwicklung - Neon][TicketNr.: 1057842][Wechsel Kontakt im Angebot]

See merge request xrm/basic!235

entity/Offer_entity/Offer_entity.aod

@@ -930,7 +930,6 @@
       <name>LETTERSALUTATION</name>
       <title>Letter salutation</title>
       <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/lettersalutation/stateProcess.js</stateProcess>
-      <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/lettersalutation/valueProcess.js</valueProcess>
     </entityField>
     <entityActionField>
       <name>openAdminView</name>

entity/Offer_entity/entityfields/chosenaddress/valueProcess.js

@@ -3,7 +3,7 @@ import("system.result");
 import("system.neon");
 import("system.vars");
 
-if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && !vars.get("$field.ADDRESS"))
+if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT))
 {
     var defaultAddressId = ContactUtils.getDefaultAddressId(vars.get("$field.CONTACT_ID"));
     if (defaultAddressId)

entity/Offer_entity/entityfields/contact_id/onValueChange.js

+import("PostalAddress_lib");
 import("Sql_lib");
 import("system.neon");
 import("system.vars");
@@ -17,6 +18,17 @@ if(contactid != "")
     if(lang != "") 
         neon.setFieldValue("field.ISOLANGUAGE", lang);
     
+    var defaultAddressId = ContactUtils.getDefaultAddressId(contactid);
+    if (defaultAddressId)
+    {
+        neon.setFieldValue("field.ChosenAddress", defaultAddressId);
+            neon.setFieldValue("$field.ADDRESS", AddressUtils.getAddressById(defaultAddressId));
+    }
+    var addrobj = new AddrObject(contactid);
+    var salutation = addrobj.getFormattedAddress(false, "{letter_salutation},");
+    if (salutation != "Err.,")
+        neon.setFieldValue("field.LETTERSALUTATION", salutation);
+    
     // set $field.CONTATCT_ORG_ID per contactid
     var orgid = ContactUtils.getPersOrgIds(contactid);
     neon.setFieldValue("$field.CONTACT_ORG_ID", orgid[2]);

entity/Offer_entity/entityfields/lettersalutation/valueProcess.js

-import("system.result");
-import("system.neon");
-import("system.vars");
-import("Address_lib");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null) 
-{
-    var addrobj = new AddrObject(vars.get("$field.CONTACT_ID"));
-    var salutation = addrobj.getFormattedAddress(false, "{letter_salutation},");
-    if (salutation != "Err.,")
-        result.string(salutation);
-}
\ No newline at end of file