Merge branch '1046805_FixOrgReportTask' into '2020.1'

[Projekt: Entwicklung - Neon][TicketNr.: 1046805][Firma - Kundenstammblatt -...

See merge request xrm/basic!252

process/Organisation_lib/process.js

@@ -174,8 +174,10 @@ var activityData = activityQuery.table()
     //tasks
     var taskData = newSelect("TASK.SUBJECT, TASK.DESCRIPTION, TASK.STATUS, FIRSTNAME, LASTNAME")
                     .from("TASK")
-                    .join("CONTACT", "EDITOR_CONTACT_ID = CONTACTID")
-                    .leftJoin("PERSON", "CONTACT.PERSON_ID = PERSONID")
+                    .join("TASKLINK", "TASKLINK.TASK_ID = TASK.TASKID")
+                    .join("CONTACT", "TASKLINK.OBJECT_ROWID = CONTACTID and (TASKLINK.OBJECT_TYPE = 'Organisation' or TASKLINK.OBJECT_TYPE = 'Person')")
+                    .join("CONTACT c", "TASK.EDITOR_CONTACT_ID = c.CONTACTID")
+                    .leftJoin("PERSON", "c.PERSON_ID = PERSONID")
                     .where("CONTACT.ORGANISATION_ID", pOrgId)
                     .table();