Merge branch 'cm_2001901_FixContentitle' into '2021.2.1'

Cm 2001901 fix contentitle

See merge request xrm/basic!1447

entity/Person_entity/recordcontainers/db/recordfieldmappings/contenttitle.value/expression.js

@@ -15,7 +15,7 @@ if (db.getDatabaseType(db.getCurrentAlias()) == db.DBTYPE_DERBY10)
 }
 else
 {
-    contenttitleSQL = Contacttils.getContactSalutationSubSql(true);
+    contenttitleSQL = ContactUtils.getContactSalutationSubSql(true);
 }
 
 result.string(contenttitleSQL);
\ No newline at end of file

process/Contact_lib/process.js

@@ -841,7 +841,7 @@ ContactUtils.getContactSalutationSubSql = function(pGetHeadline, pGetLetterSalut
     }
     
     return sqlHelper.isNull( 
-             "(" + newSelect(SqlBuilder.caseWhen("CONTACT.PERSON_ID is null").then(orgSelect).elseValue(personSelect))
+             "(" + newSelect(SqlBuilder.caseWhen("CONTACT.PERSON_ID is null").then(salutationColumn).elseValue(personSelect))
                         .from("SALUTATION")
                         .where("SALUTATION.ISOLANGUAGE = CONTACT.ISOLANGUAGE")
                         .and(newWhere("SALUTATION.SEX = PERSON.GENDER").or("SALUTATION.SEX is null"))