Merge branch '1061658_FixVisitPlanEntry_ContactId_OrgId_Confusion' into '2020.1'

1061658 fix visit plan entry contact id org id confusion

See merge request xrm/basic!328

.liquibase/Data_alias/basic/2020.1.3/VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml

@@ -3,9 +3,9 @@
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
         <changeSet id="3d7f038c-04f1-45a2-9a1c-73c1a8666fea" author="b.ulrich" >
     <renameColumn
-            columnDataType="CHAR(36)"  
-            newColumnName="ORGANISATION_CONTACT_ID"  
+            columnDataType="CHAR"  
             oldColumnName="ORGANISATION_ID"  
+            newColumnName="ORGANISATION_CONTACT_ID"  
             tableName="VISITPLANENTRY"/>  
     </changeSet>
 </databaseChangeLog>

.liquibase/Data_alias/basic/2020.1.3/changelog.xml

@@ -3,6 +3,5 @@
                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
     <include file="AlterButtonLabelTitles/AlterButtonLabelTitles.xml" relativeToChangelogFile="true" />
     <include file="add_Address_LatLon.xml" relativeToChangelogFile="true"/>
-    <!--    disabled the following script since it is WIP-->
-    <!--<include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true" />-->
+    <include file="VisitPlanEntry/rename_VisitPlanEntry_ORGANISATION_ID.xml" relativeToChangelogFile="true" />
 </databaseChangeLog>

entity/VisitRecommendation_entity/recordcontainers/jdito/contentProcess.js

@@ -62,7 +62,7 @@ if(idValues == false)
                                         .from("CONTACT")
                                         .join("ORGANISATION", "CONTACT.ORGANISATION_ID = org.ORGANISATIONID", "org")
                                         .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
-                                        .join("ADDRESS", "ADDRESS_ID = ADDRESSID")
+                                        .leftJoin("ADDRESS", "ADDRESS_ID = ADDRESSID")
                                         .join("AB_ATTRIBUTERELATION", "visitPlanFrequency.OBJECT_ROWID = CONTACT.CONTACTID", "visitPlanFrequency")
                                         .where(["AB_ATTRIBUTERELATION", "AB_ATTRIBUTE_ID", "visitPlanFrequency"], $AttributeRegistry.visitPlanFrequency())
                                         .table();
@@ -80,7 +80,7 @@ var recommendationSQLData = newSelect(["VISITRECOMMENDATIONID", "VISITRECOMMENDA
                 
     newSelect("min(ENTRYDATE)")
                 .from("VISITPLANENTRY")
-                .where("VISITPLANENTRY.ORGANISATION_CONTACT_ID = VISITRECOMMENDATION.CONTACT_ID")
+                .where("VISITPLANENTRY.ORGANISATION_CONTACT_ID", "VISITRECOMMENDATION.CONTACT_ID")
                 .and("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$planned())
                 .or("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged())
                 .and("VISITPLANENTRY.entrydate", datetime.today(), SqlBuilder.GREATER())
@@ -88,8 +88,8 @@ var recommendationSQLData = newSelect(["VISITRECOMMENDATIONID", "VISITRECOMMENDA
                 
     newSelect("VISITRECOMMENDATION.CONTACT_ID")
                 .from("VISITPLANEMPLOYEEWEEK, VISITPLANENTRY")
-                .where("VISITPLANENTRY.VISITPLANEMPLOYEEWEEK_ID", "VISITPLANEMPLOYEEWEEKID")
-                .and("VISITRECOMMENDATION.CONTACT_ID = VISITPLANENTRY.ORGANISATION_CONTACT_ID")
+                .where("VISITPLANENTRY.VISITPLANEMPLOYEEWEEK_ID", "VISITPLANEMPLOYEEWEEK.VISITPLANEMPLOYEEWEEKID")
+                .and("VISITRECOMMENDATION.CONTACT_ID", "VISITPLANENTRY.ORGANISATION_CONTACT_ID")
                 .and(newWhere("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$planned())
                 .or("VISITPLANENTRY.STATUS", $KeywordRegistry.visitPlanEntryStatus$Appointmentarranged()))
                 .and("VISITPLANENTRY.entrydate", newSelect("min(vp.entrydate)")