Merge branch 'sales_pn_1083936_wrong_recipient_dropdown_if_created_without_reference' into '2021.1'

[Projekt: xRM-Sales][TicketNr.: 1083936][Empfängerauswahl von Angebot fehlerhaft]

See merge request xrm/basic!1157

entity/Offer_entity/entityfields/anycontacts/children/contactids_param/valueProcess.js

@@ -8,10 +8,13 @@ if(vars.exists("$param.ContactIds_param") && vars.get("$param.ContactIds_param")
     contactIds = vars.get("$param.ContactIds_param");
 }
 
-if(!contactIds && vars.get("$field.CONTACT_ORG_ID"))
+if(!contactIds && vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
 {
     var sql = newSelect("CONTACTID").from("CONTACT")
-        .where("CONTACT.ORGANISATION_ID", vars.get("$field.CONTACT_ORG_ID"));
+        .where("CONTACT.ORGANISATION_ID",
+            newSelect("CONTACT.ORGANISATION_ID").from("CONTACT")
+            .where("CONTACT.CONTACTID", vars.get("$param.ContactId_param"))
+        );
     contactIds = JSON.stringify(sql.arrayColumn());
 }
 

entity/Offer_entity/entityfields/contact_id/onValueChange.js

@@ -54,14 +54,9 @@ if(contactId != "")
                                 .and("CONTACT.PERSON_ID is null")
                                 .cell();
         }
-        var salesProjectId = newSelect("SALESPROJECT.SALESPROJECTID")
-                                        .from("SALESPROJECT")
-                                        .where("SALESPROJECT.CONTACT_ID",  contactId)
-                                        .cell();
-        if(salesProjectId)
-        {
-            neon.setFieldValue("$field.OBJECT_ROWID", salesProjectId);
-        }
+        var salesProjectId = newSelect("SALESPROJECT.SALESPROJECTID").from("SALESPROJECT")
+            .where("SALESPROJECT.CONTACT_ID",  contactId).cell();
+        neon.setFieldValue("$field.OBJECT_ROWID", salesProjectId);
     }
 
 }