Merge branch 'cm_1080658_GenderOther' into '2021.1'

[Projekt: xRM-ContactManagement][TicketNr.: 1080658][Anrede bei Geschlecht divers]

See merge request xrm/basic!1160

entity/Person_entity/Person_entity.aod

@@ -85,6 +85,7 @@
       <title>Salutation</title>
       <consumer>Salutations</consumer>
       <mandatory v="true" />
+      <mandatoryProcess>%aditoprj%/entity/Person_entity/entityfields/salutation/mandatoryProcess.js</mandatoryProcess>
       <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/salutation/displayValueProcess.js</displayValueProcess>
     </entityField>
     <entityField>

entity/Person_entity/entityfields/salutation/mandatoryProcess.js

+import("system.result");
+import("KeywordRegistry_basic");
+import("system.vars");
+
+
+var sex = vars.get("$field.GENDER")
+
+if (sex == $KeywordRegistry.personGender$other())
+{
+    result.string(false);
+}

language/_____LANGUAGE_en/_____LANGUAGE_en.aod

@@ -1741,7 +1741,7 @@
     </entry>
     <entry>
       <key>${GENDER_OTHER}</key>
-      <value>Other</value>
+      <value>Diverse</value>
     </entry>
     <entry>
       <key>Turkey</key>

process/Address_lib/process.js

@@ -224,7 +224,8 @@ function fetchAddressData( pCondition, pConfig, AddressID, pPerson)
             "CONTACT.CONTACTPOSITION", "CONTACT.LETTERSALUTATION", "ORGANISATION.NAME", "PERSON.FIRSTNAME", "PERSON.MIDDLENAME", "PERSON.LASTNAME",  // 13-18
             "PERSON.SALUTATION", "PERSON.TITLE", "PERSON.TITLESUFFIX", // 19-21
             "coalesce( CONTACT.ISOLANGUAGE, (select C.ISOLANGUAGE from CONTACT C where C.ORGANISATION_ID = CONTACT.ORGANISATION_ID and PERSON_ID is null))", // 22
-            "''", "''", "''", "(select ADDR_FORMAT from AB_COUNTRYINFO where ISO2 = ADDRESS.COUNTRY)", "ADDRESS.ADDR_TYPE" // 23-27
+            "''", "''", "''", "(select ADDR_FORMAT from AB_COUNTRYINFO where ISO2 = ADDRESS.COUNTRY)", "ADDRESS.ADDR_TYPE", // 23-27
+            "PERSON.GENDER"//28
         ];
 											
         for (let i=0; i < pConfig.length; i++ )
@@ -406,6 +407,7 @@ function _getAddrData( pData )
             if ( sformat == undefined )  sformat = _getSalutation( pData[22] + pData[19] );            
             //no language defined
             if ( sformat == undefined )  sformat = _getSalutation( pData[19] + pData[20] );
+            if ( sformat == undefined )  sformat = _getSalutation( pData[22] + pData[28] );
             // no language specific entry in salutation
             if ( sformat == undefined || sformat[0] == "" || sformat[1] == "" )	sformat = ["{sa} {ti} {fn} {ln}", "{sa} {ti} {ln}"];
             salutation = _formatAddrData( pData,  sformat[0] );
@@ -435,11 +437,15 @@ function _getSalutation( pSalutCode )
     }
     else
     {	
-        var list = db.table("select ISOLANGUAGE, SALUTATION, TITLE, HEADLINE, LETTERSALUTATION from SALUTATION" );
+        var list = newSelect(["SALUTATION.ISOLANGUAGE", "SALUTATION.SALUTATION", "SALUTATION.TITLE", "SALUTATION.HEADLINE", "SALUTATION.LETTERSALUTATION", "SALUTATION.SEX"])
+        .from("SALUTATION")
+        .orderBy("SALUTATION.SORT");
+        
         for ( var i = 0; i < list.length; i++ )	
         {   
             salut[list[i][0] + list[i][1] + list[i][2]] = [list[i][3], list[i][4]];
             salut[list[i][1] + list[i][2]] = [list[i][3], list[i][4]];
+            salut[list[i][0] + list[i][5]] = [list[i][3], list[i][4]];
         }
         vars.set("$global.Salutation", salut);
     }