Standard-Address: Fixed new contact

entity/Contact_entity/Contact_entity.aod

@@ -29,7 +29,6 @@
       <mandatory v="false" />
       <displayValueProcess>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/displayValueProcess.js</displayValueProcess>
       <onValidation>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValidation.js</onValidation>
-      <onValueChange>%aditoprj%/entity/Contact_entity/entityfields/organisation_id/onValueChange.js</onValueChange>
     </entityField>
     <entityField>
       <name>PERSON_ID</name>
@@ -92,6 +91,7 @@
     <entityField>
       <name>ADDRESS_ID</name>
       <title>standard address</title>
+      <valueProcess>%aditoprj%/entity/Contact_entity/entityfields/address_id/valueProcess.js</valueProcess>
     </entityField>
     <entityField>
       <name>PERSON_TITLE</name>

entity/Contact_entity/entityfields/address_id/valueProcess.js

+import("system.logging");
+import("system.result");
+import("system.vars");
+import("StandardObject_lib");
+
+//  Check if the standard address is already set.
+if (vars.get("$field.ADDRESS_ID") === null || vars.get("$field.ADDRESS_ID") === "" || vars.get("$field.ADDRESS_ID") == 0) {
+    var possibleStandardAddressID = new StandardObject("Address", null, "Person", vars.get("$field.CONTACTID"))
+        .onPersonValueChange(vars.get("$field.ORGANISATION_ID"));
+
+    // If a possible standard addrss was found it should get applied to the field.
+    if (possibleStandardAddressID !== null)
+        result.string(possibleStandardAddressID);
+}
\ No newline at end of file

entity/Contact_entity/entityfields/organisation_id/onValueChange.js

-import("system.vars");
-
-//since the standard address can be only values of org the standard address has to be reset on org change
-vars.set("$field.ADDRESS_ID", "");
\ No newline at end of file

entity/Person_entity/Person_entity.aod

@@ -481,6 +481,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
       <title>Address</title>
       <consumer>ContactAndOrganisationAddresses</consumer>
       <searchable v="false" />
+      <valueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/address_id/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityActionField>
@@ -945,12 +946,10 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>STANDARD_EMAIL_COMMUNICATION.displayValue</name>
-          <recordfield></recordfield>
           <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/standard_email_communication.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>STANDARD_PHONE_COMMUNICATION.displayValue</name>
-          <recordfield></recordfield>
           <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/standard_phone_communication.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>