Merge branch '2021.0_CW_1073798' into '2021.0'

[Projekt: xRM-ContactManagement][TicketNr.: 1073798][Telefonnummer - Validierung und Vorbelegung abhängig vom Land in der Adresse der Firma]

See merge request xrm/basic!841

entity/Organisation_entity/entityfields/communications/children/contactsmaincountry_param/valueProcess.js

+import("Entity_lib");
 import("system.logging");
 import("system.vars");
 import("system.result");
 
+//references needed for auto refresh:
+"$field.Addresses.insertedRows";
+"$field.Addresses.changedRows";
+"$field.Addresses.deletedRows";
+
 var country = vars.get("$field.STANDARD_COUNTRY");
 if (country)
-    result.string(country);
\ No newline at end of file
+{
+    result.string(country);
+}
+else 
+{
+    var addressRows = EntityConsumerRowsHelper.getCurrentConsumerRows("Addresses", ["COUNTRY"]);
+    if(addressRows.length > 0)
+        result.string(addressRows[0]["COUNTRY"]);
+}

entity/Person_entity/entityfields/communications/children/contactsmaincountry_param/valueProcess.js

+import("Sql_lib");
+import("Entity_lib");
 import("system.logging");
 import("system.vars");
 import("system.result");
 
+//references needed for auto refresh:
+"$field.PersAddresses.insertedRows";
+"$field.PersAddresses.changedRows";
+"$field.PersAddresses.deletedRows";
+
+var res = "";
 var country = vars.get("$field.STANDARD_COUNTRY");
-if (country)
-    result.string(country);
\ No newline at end of file
+var orgAddressId = newSelect("CONTACT.ADDRESS_ID").from("CONTACT")
+                                                    .where("CONTACT.ORGANISATION_ID", vars.get("$field.ORGANISATION_ID"))
+                                                    .and("CONTACT.PERSON_ID is null")
+                                                    .cell();
+                                                                    
+var standardCountryOrg = newSelect("ADDRESS.COUNTRY").from("ADDRESS")
+                                                             .where("ADDRESS.ADDRESSID", orgAddressId).cell();
+
+if(country)
+{
+    res = country;
+}
+else if(standardCountryOrg)
+{
+    res = standardCountryOrg;
+}
+else
+{
+    var addressPersonRows = EntityConsumerRowsHelper.getCurrentConsumerRows("PersAddresses", ["COUNTRY"]);
+    if(addressPersonRows.length > 0)
+        res = addressPersonRows[0]["COUNTRY"];
+}
+result.string(res);
\ No newline at end of file