Merge branch '1064221_FixContactFilterNotWorkingWithFunctions' into '2020.2.0'

[Projekt: Entwicklung - Neon][TicketNr.: 1064221][Kontakt: Suche 'Firma:Name...

See merge request xrm/basic!388

entity/Person_entity/recordcontainers/db/recordfieldmappings/organisations/filterConditionProcess.js

@@ -6,4 +6,5 @@ var from = "CONTACT PersonContact\n\
     join ORGANISATION on (ORGANISATION.ORGANISATIONID = PersonContact.ORGANISATION_ID)\n\
     join CONTACT on (ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID and CONTACT.PERSON_ID is null)";
 
-result.string("PERSONID in (select PersonContact.PERSON_ID from " + from + " where " + vars.get("$local.condition")+ ")");
\ No newline at end of file
+//using the ContactId instead of the PersonId to make it possible to also filter the functions by e.g organisationName
+result.string("CONTACTID in (select PersonContact.CONTACTID from " + from + " where " + vars.get("$local.condition")+ ")");
\ No newline at end of file