Merge branch '2021.0_CW_1072524' into '2021.0'

[Projekt: xRM-Sales][TicketNr.: 1072524][[Besuch vor Ort] Firma - neuer Besuchsplan - inaktive Kontakte werden angezeigt]

See merge request xrm/basic!843

entity/VisitPlanEntry_entity/VisitPlanEntry_entity.aod

@@ -223,12 +223,11 @@
       <children>
         <entityParameter>
           <name>OrgId_param</name>
-          <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/persons/children/orgid_param/valueProcess.js</valueProcess>
-          <expose v="true" />
         </entityParameter>
         <entityParameter>
           <name>OnlyShowContactIds_param</name>
           <valueProcess>%aditoprj%/entity/VisitPlanEntry_entity/entityfields/persons/children/onlyshowcontactids_param/valueProcess.js</valueProcess>
+          <expose v="true" />
         </entityParameter>
       </children>
     </entityConsumer>

entity/VisitPlanEntry_entity/entityfields/persons/children/onlyshowcontactids_param/valueProcess.js

+import("system.logging");
+import("KeywordRegistry_basic");
 import("Contact_lib");
 import("system.result");
 import("system.vars");
@@ -8,6 +10,7 @@ var contactIdArray = newSelect("CONTACT.CONTACTID")
                                 .from("CONTACT")
                                 .where("CONTACT.ORGANISATION_ID", ContactUtils.getPersOrgIds(orgContactId)[2], SqlBuilder.EQUAL())
                                 .and("CONTACT.CONTACTID", orgContactId, SqlBuilder.NOT_EQUAL())
+                                .and("CONTACT.STATUS", $KeywordRegistry.contactStatus$inactive(), SqlBuilder.NOT_EQUAL())
                                 .arrayColumn();
                                 
 result.object(contactIdArray)
\ No newline at end of file

entity/VisitPlanEntry_entity/entityfields/persons/children/orgid_param/valueProcess.js

-import("system.logging");
-import("Sql_lib");
-import("system.vars");
-import("system.result");
-
-var orgContactId = vars.get("$field.ORGANISATION_CONTACT_ID")
-var orgId = newSelect("CONTACT.ORGANISATION_ID").from("CONTACT").where("CONTACT.CONTACTID", orgContactId).cell();
-
-result.string(orgId);
\ No newline at end of file