diff --git a/.merge_file_a67688 b/.merge_file_a67688
new file mode 100644
index 0000000000000000000000000000000000000000..e1dd74e5b3c25014aa8b7f711e9601f377d7f55c
--- /dev/null
+++ b/.merge_file_a67688
@@ -0,0 +1,279 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.2.0">
+ <name>Address_entity</name>
+ <title>Addresses</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Address_entity/documentation.adoc</documentation>
+ <titleProcess>%aditoprj%/entity/Address_entity/titleProcess.js</titleProcess>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityField>
+ <name>ADDRESS</name>
+ <title>Address</title>
+ <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/address/mandatoryProcess.js</mandatoryProcess>
+ </entityField>
+ <entityField>
+ <name>ADDRESSADDITION</name>
+ </entityField>
+ <entityField>
+ <name>ADDRESSID</name>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/addressid/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>ADDRIDENTIFIER</name>
+ </entityField>
+ <entityField>
+ <name>ADDR_TYPE</name>
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/addr_type/documentation.adoc</documentation>
+ <title>Addresstype</title>
+ <consumer>KeywordAddressType</consumer>
+ </entityField>
+ <entityField>
+ <name>BUILDINGNO</name>
+ <title>House number</title>
+ </entityField>
+ <entityField>
+ <name>CITY</name>
+ <title>City</title>
+ <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/city/mandatoryProcess.js</mandatoryProcess>
+ </entityField>
+ <entityField>
+ <name>COUNTRY</name>
+ <title>Country</title>
+ <consumer>Countries</consumer>
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/Address_entity/entityfields/country/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>DISTRICT</name>
+ <title>District</title>
+ </entityField>
+ <entityField>
+ <name>REGION</name>
+ <title>Region</title>
+ </entityField>
+ <entityField>
+ <name>CONTACT_ID</name>
+ <mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/contact_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>STATE</name>
+ <title>${ADDRESS_STATE}</title>
+ <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/state/mandatoryProcess.js</mandatoryProcess>
+ </entityField>
+ <entityField>
+ <name>ZIP</name>
+ <title>postcode</title>
+ <mandatoryProcess>%aditoprj%/entity/Address_entity/entityfields/zip/mandatoryProcess.js</mandatoryProcess>
+ <onValidation>%aditoprj%/entity/Address_entity/entityfields/zip/onValidation.js</onValidation>
+ </entityField>
+ <entityProvider>
+ <name>OrganisationAddresses</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>b484b43c-16f6-4875-9787-f0813dd200cb</name>
+ <entityName>Organisation_entity</entityName>
+ <fieldName>Addresses</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactType_param</name>
+ <code>%aditoprj%/entity/Address_entity/entityfields/organisationaddresses/children/contacttype_param/code.js</code>
+ <expose v="true" />
+ <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>DefaultAddressId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/contactid_param/documentation.adoc</documentation>
+ </entityParameter>
+ <entityProvider>
+ <name>ContactAddresses</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>efdb2f19-ab41-4f49-941a-843610e2b31b</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>PersAddresses</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactType_param</name>
+ <code>%aditoprj%/entity/Address_entity/entityfields/contactaddresses/children/contacttype_param/code.js</code>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>DefaultAddressId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityConsumer>
+ <name>Countries</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Countries_Entity</entityName>
+ <fieldName>ISO2_NAME</fieldName>
+ </dependency>
+ </entityConsumer>
+ <entityProvider>
+ <name>OrganisationAddressesByContact</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/documentation.adoc</documentation>
+ <recordContainer>db</recordContainer>
+ <dependencies>
+ <entityDependency>
+ <name>388f6ad3-b817-4dc0-a5d5-a41eec485357</name>
+ <entityName>Person_entity</entityName>
+ <fieldName>OrgAddresses</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ </dependencies>
+ <children>
+ <entityParameter>
+ <name>ContactType_param</name>
+ <code>%aditoprj%/entity/Address_entity/entityfields/organisationaddressesbycontact/children/contacttype_param/code.js</code>
+ <expose v="true" />
+ <description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>IS_STANDARD</name>
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/is_standard/documentation.adoc</documentation>
+ <contentType>BOOLEAN</contentType>
+ <valueProcess>%aditoprj%/entity/Address_entity/entityfields/is_standard/valueProcess.js</valueProcess>
+ </entityField>
+ <entityParameter>
+ <name>DefaultAddressId_param</name>
+ <expose v="true" />
+ <mandatory v="false" />
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/defaultaddressid_param/documentation.adoc</documentation>
+ <description>provide a ADDRESSID-value of the standard address (of a CONTACT)</description>
+ </entityParameter>
+ <entityParameter>
+ <name>ContactType_param</name>
+ <expose v="true" />
+ <mandatory v="true" />
+ <documentation>%aditoprj%/entity/Address_entity/entityfields/contacttype_param/documentation.adoc</documentation>
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityConsumer>
+ <name>KeywordAddressType</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <code>%aditoprj%/entity/Address_entity/entityfields/keywordaddresstype/children/containername_param/code.js</code>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <alias>Data_alias</alias>
+ <conditionProcess>%aditoprj%/entity/Address_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <linkInformation>
+ <linkInformation>
+ <name>6a0005cc-c64b-4044-9712-c9d00f02d7a8</name>
+ <tableName>ADDRESS</tableName>
+ <primaryKey>ADDRESSID</primaryKey>
+ <isUIDTable v="true" />
+ </linkInformation>
+ </linkInformation>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>ADDRESS.value</name>
+ <recordfield>ADDRESS.ADDRESS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CITY.value</name>
+ <recordfield>ADDRESS.CITY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDRESSADDITION.value</name>
+ <recordfield>ADDRESS.ADDRESSADDITION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>COUNTRY.value</name>
+ <recordfield>ADDRESS.COUNTRY</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDRESSID.value</name>
+ <recordfield>ADDRESS.ADDRESSID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDRIDENTIFIER.value</name>
+ <recordfield>ADDRESS.ADDRIDENTIFIER</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDR_TYPE.value</name>
+ <recordfield>ADDRESS.ADDR_TYPE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DISTRICT.value</name>
+ <recordfield>ADDRESS.DISTRICT</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>BUILDINGNO.value</name>
+ <recordfield>ADDRESS.BUILDINGNO</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>REGION.value</name>
+ <recordfield>ADDRESS.REGION</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CONTACT_ID.value</name>
+ <recordfield>ADDRESS.CONTACT_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STATE.value</name>
+ <recordfield>ADDRESS.STATE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ZIP.value</name>
+ <recordfield>ADDRESS.ZIP</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDR_TYPE.displayValue</name>
+ <expression>%aditoprj%/entity/Address_entity/recordcontainers/db/recordfieldmappings/addr_type.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 5b828a4deb9769c9b3d4c121355478404730cdc4..ca6d09e6577754d0365bca8f27e4c93e6d47cff9 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -4942,6 +4942,138 @@
</entityFieldDb>
</entityFields>
</entityDb>
+ <entityDb>
+ <name>SALUTATION</name>
+ <dbName></dbName>
+ <idColumn>SALUTATIONID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>LANGUAGE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="3" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SALUTATION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SEX</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SORT</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SALUTATIONID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>TITLE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="30" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>HEADLINE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>LETTERSALUTATION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
</entities>
</entityGroup>
</aliasDefDb>
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 4e90b5b470b7003fa1c6ef6a40e349f8fdb102e9..29aff4640e7d1b3091d0a8cdf4444ad2d860f2c9 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -32,6 +32,7 @@
<node name="Attribute" kind="10077" />
<node name="KeywordEntry" kind="10077" />
<node name="KeywordAttribute" kind="10077" />
+ <node name="Salutation" kind="10077" />
<node name="INTERNAL_ADMINISTRATOR" kind="159" />
</node>
</node>
diff --git a/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod b/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
index 6d333cf4cd3b9aee342d350544b30ec55525ae90..b8dc2fcdd6569d77239376a8343f0bd0bb791ea2 100644
--- a/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
+++ b/application/_____SYSTEM_CALENDAR_RIBBON/_____SYSTEM_CALENDAR_RIBBON.aod
@@ -1,14 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
- <name>_____SYSTEM_CALENDAR_RIBBON</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entityNode name="_____SYSTEM_COMPANY" kind="200" />
- <calendarRibbon>
- <name>calendarRibbon</name>
- <ribbonTasks>
- <ribbonTask>
- <name>TASK_CALENDAR</name>
- </ribbonTask>
- </ribbonTasks>
- </calendarRibbon>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
+ <name>_____SYSTEM_CALENDAR_RIBBON</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entityNode name="_____SYSTEM_COMPANY" kind="200" />
+ <calendarRibbon>
+ <name>calendarRibbon</name>
+ <ribbonTasks>
+ <ribbonTask>
+ <name>TASK_CALENDAR</name>
+ </ribbonTask>
+ </ribbonTasks>
+ </calendarRibbon>
+</application>
diff --git a/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod b/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod
index 0dc789214fb90fd1cc60f2d8e83b7c6862ed7e7e..114ee28146d6509474675e0905da9d217b0fc329 100644
--- a/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod
+++ b/application/_____SYSTEM_INDEXSEARCH_RIBBON/_____SYSTEM_INDEXSEARCH_RIBBON.aod
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
- <name>_____SYSTEM_INDEXSEARCH_RIBBON</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <entityNode name="_____SYSTEM_COMPANY" kind="200" />
- <indexSearchRibbon>
- <name>indexSearchRibbon</name>
- <ribbonTasks>
- <ribbonTask>
- <name>TASK_INDEXSEARCH</name>
- </ribbonTask>
- </ribbonTasks>
- </indexSearchRibbon>
-</application>
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/application/1.2.0">
+ <name>_____SYSTEM_INDEXSEARCH_RIBBON</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entityNode name="_____SYSTEM_COMPANY" kind="200" />
+ <indexSearchRibbon>
+ <name>indexSearchRibbon</name>
+ <ribbonTasks>
+ <ribbonTask>
+ <name>TASK_INDEXSEARCH</name>
+ </ribbonTask>
+ </ribbonTasks>
+ </indexSearchRibbon>
+</application>
diff --git a/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js b/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js
deleted file mode 100644
index fdd4c8703dc1f6867aa93955019c3052bb227e7d..0000000000000000000000000000000000000000
--- a/entity/Appointment_entity/entityfields/appointmentlinks/children/appointmentid_param/valueProcess.js
+++ /dev/null
@@ -1,5 +0,0 @@
-import("system.logging");
-import("system.result");
-import("system.vars");
-
-result.string(vars.get("$field.UID"));
diff --git a/entity/AttributeRelation_entity/AttributeRelation_entity.aod b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
index a1bb8ae6e911dd660fa561ffcd31525dc6b7726d..ad9628d65aabadd83d5492f88a92fae7ef9c299d 100644
--- a/entity/AttributeRelation_entity/AttributeRelation_entity.aod
+++ b/entity/AttributeRelation_entity/AttributeRelation_entity.aod
@@ -64,12 +64,6 @@
<fieldName>AttributeChildren</fieldName>
<isConsumer v="false" />
</entityDependency>
- <entityDependency>
- <name>ba8046ba-f58c-48f1-9c35-fe897247534a</name>
- <entityName>Person_entity</entityName>
- <fieldName>Attributes</fieldName>
- <isConsumer v="false" />
- </entityDependency>
<entityDependency>
<name>21de4424-d5e2-4c19-a5e1-1f59dbc186b3</name>
<entityName>Contract_entity</entityName>
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js b/entity/AttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js
index d916ea680e646d3f92de179bf93b33a6bbbf260c..1e7cfe8ada6f58bd12a58cf076c0a887ceee54f7 100644
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js
+++ b/entity/AttributeRelation_entity/entityfields/valueproxy/contentTypeProcess.js
@@ -1,6 +1,6 @@
-import("system.vars");
-import("system.result");
-import("Attribute_lib");
-
-var attrType = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID")).getAttributeContentType();
+import("system.vars");
+import("system.result");
+import("Attribute_lib");
+
+var attrType = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID")).getAttributeContentType();
result.string(attrType);
\ No newline at end of file
diff --git a/entity/AttributeRelation_entity/entityfields/valueproxy/onValueChange.js b/entity/AttributeRelation_entity/entityfields/valueproxy/onValueChange.js
index ec2f10e7054b84b619e524fd7e39529b4e449833..5d8c07fa23edf16c4178d05f5de69dec3196dd17 100644
--- a/entity/AttributeRelation_entity/entityfields/valueproxy/onValueChange.js
+++ b/entity/AttributeRelation_entity/entityfields/valueproxy/onValueChange.js
@@ -1,10 +1,10 @@
-import("system.vars");
-import("Entity_lib");
-import("Attribute_lib");
-
-var attrValue = vars.exists("$field.valueProxy") ? vars.get("$field.valueProxy") : "";
-attrValue = ProcessHandlingUtils.getOnValidationValue(attrValue);
-var attribute = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID"));
-
-if(attrValue != null)
+import("system.vars");
+import("Entity_lib");
+import("Attribute_lib");
+
+var attrValue = vars.exists("$field.valueProxy") ? vars.get("$field.valueProxy") : "";
+attrValue = ProcessHandlingUtils.getOnValidationValue(attrValue);
+var attribute = AttributeHandler.begin(vars.get("$field.AB_ATTRIBUTE_ID"));
+
+if(attrValue != null)
attribute.setAttributeValue(attrValue);
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 6f3644a58169c7cc5b36e0746c1ad29e9e3ddc8d..788bc0efe4f0472d2bdf339e537f53f07652c5a3 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -25,6 +25,12 @@
<name>GENDER</name>
<title>Gender</title>
<consumer>KeywordGenders</consumer>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/gender/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/gender/displayValueProcess.js</displayValueProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ </onValueChangeTypes>
</entityField>
<entityField>
<name>LASTNAME</name>
@@ -44,12 +50,14 @@
<entityField>
<name>SALUTATION</name>
<title>Salutation</title>
- <mandatory v="true" />
- <possibleItemsProcess>%aditoprj%/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js</possibleItemsProcess>
+ <consumer>Salutations</consumer>
+ <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/salutation/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>TITLE</name>
<title>Title</title>
+ <consumer>SalutationTitles</consumer>
+ <displayValueProcess>%aditoprj%/entity/Person_entity/entityfields/title/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>TITLESUFFIX</name>
@@ -182,7 +190,7 @@
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/communications/children/contactid_param/valueProcess.js</valueProcess>
<expose v="false" />
<triggerRecalculation v="true" />
- <description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
+ <description>This parameter is used for specifing a related &quot;CONTACTID&quot; to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
</children>
@@ -292,6 +300,11 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<title>Language</title>
<consumer>Languages</consumer>
<mandatory v="true" />
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/language/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Person_entity/entityfields/language/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
</entityField>
<entityConsumer>
<name>Documents</name>
@@ -414,14 +427,14 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>STANDARD_EMAIL_COMMUNICATION</name>
<title>E-Mail</title>
<consumer>EmailCommunications</consumer>
- <searchable v="true" />
+ <searchable v="false" />
<onValueChange>%aditoprj%/entity/Person_entity/entityfields/standard_email_communication/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>STANDARD_PHONE_COMMUNICATION</name>
<title>Phone</title>
<consumer>PhoneCommunications</consumer>
- <searchable v="true" />
+ <searchable v="false" />
<onValueChange>%aditoprj%/entity/Person_entity/entityfields/standard_phone_communication/onValueChange.js</onValueChange>
</entityField>
<entityConsumer>
@@ -438,7 +451,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/phonecommunications/children/contactid_param/valueProcess.js</valueProcess>
<expose v="false" />
- <description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
+ <description>This parameter is used for specifing a related &quot;CONTACTID&quot; to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
</children>
@@ -457,7 +470,7 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>ContactId_param</name>
<valueProcess>%aditoprj%/entity/Person_entity/entityfields/emailcommunications/children/contactid_param/valueProcess.js</valueProcess>
<expose v="false" />
- <description>This parameter is used for specifing a related "CONTACTID" to a COMMUNICATION-entry.
+ <description>This parameter is used for specifing a related &quot;CONTACTID&quot; to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
</children>
@@ -539,6 +552,22 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>Salutations</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>SalutationDistinct_entity</entityName>
+ <fieldName>Salutations</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>Language_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/salutations/children/language_param/valueProcess.js</valueProcess>
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityConsumer>
<entityConsumer>
<name>Attributes</name>
<title>Attributes</title>
@@ -562,6 +591,25 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
</entityParameter>
</children>
</entityConsumer>
+ <entityConsumer>
+ <name>SalutationTitles</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>SalutationTitleDistinct_entity</entityName>
+ <fieldName>SalutationTitles</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>Salutation_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/salutationtitles/children/salutation_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>Language_param</name>
+ <valueProcess>%aditoprj%/entity/Person_entity/entityfields/salutationtitles/children/language_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
<entityActionField>
<name>newTask</name>
<fieldType>ACTION</fieldType>
@@ -738,6 +786,14 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<name>LANGUAGE.displayValue</name>
<expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SALUTATION.displayValue</name>
+ <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/salutation.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TITLE.displayValue</name>
+ <expression>%aditoprj%/entity/Person_entity/recordcontainers/db/recordfieldmappings/title.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Person_entity/entityfields/gender/displayValueProcess.js b/entity/Person_entity/entityfields/gender/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d59364952c126d80d9a62a7462e95cc1482e8ac2
--- /dev/null
+++ b/entity/Person_entity/entityfields/gender/displayValueProcess.js
@@ -0,0 +1,20 @@
+import("system.vars");
+import("Keyword_lib");
+import("system.result");
+import("system.db");
+import("system.vars");
+import("system.neon");
+import("Sql_lib");
+
+
+var cond = SqlCondition.begin()
+
+var sex = db.cell(cond.andPrepareVars("SALUTATION.SALUTATION", "$field.SALUTATION").buildSql("select SEX from SALUTATION", "1=2"))
+
+
+if (sex)
+{
+ var keyword = KeywordUtils.getViewValue("PersonGender", sex);
+
+ result.string(keyword)
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/gender/valueProcess.js b/entity/Person_entity/entityfields/gender/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9d763fea86f10f390de8a5fd38d6398bc827d677
--- /dev/null
+++ b/entity/Person_entity/entityfields/gender/valueProcess.js
@@ -0,0 +1,11 @@
+import("system.result");
+import("system.db");
+import("system.vars");
+import("system.neon");
+import("Sql_lib");
+
+var cond = SqlCondition.begin()
+
+var sex = db.cell(cond.andPrepareVars("SALUTATION.SALUTATION", "$field.SALUTATION").buildSql("select SEX from SALUTATION", "1=2"))
+
+result.string(sex)
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/language/onValueChange.js b/entity/Person_entity/entityfields/language/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..bff15d2335ac3186ec917f10525983f29e555b86
--- /dev/null
+++ b/entity/Person_entity/entityfields/language/onValueChange.js
@@ -0,0 +1,11 @@
+import("system.db");
+import("system.vars");
+import("system.neon");
+
+if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT))
+{
+ neon.setFieldValue("$field.SALUTATION", "");
+ neon.setFieldValue("$field.TITLE", "");
+
+ //neon.refresh(["$field.SALUTATION", "$field.TITLE"]);
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/language/valueProcess.js b/entity/Person_entity/entityfields/language/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6793351846181a86f6fbd2b1d5afd1a35e3eea79
--- /dev/null
+++ b/entity/Person_entity/entityfields/language/valueProcess.js
@@ -0,0 +1,7 @@
+import("system.neon");
+import("system.vars");
+import("system.db");
+import("system.result");
+
+if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$field.LANGUAGE") == "")
+ result.string("deu");
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/organisations/children/withprivat_param/valueProcess.js b/entity/Person_entity/entityfields/organisations/children/withprivat_param/valueProcess.js
index 7fbe0afc48df1a87b17cfbf8129c12481f84c99a..975bf6435dc851b37792e7ee9a8666ff109192dc 100644
--- a/entity/Person_entity/entityfields/organisations/children/withprivat_param/valueProcess.js
+++ b/entity/Person_entity/entityfields/organisations/children/withprivat_param/valueProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.result");
-logging.log("set")
+
result.string("1");
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/salutation/displayValueProcess.js b/entity/Person_entity/entityfields/salutation/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..47a0854d82508186c442dd64103e33b462f48db3
--- /dev/null
+++ b/entity/Person_entity/entityfields/salutation/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT))
+{
+ if (!vars.get("$field.SALUTATION"))
+ result.string("")
+}
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js b/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js
deleted file mode 100644
index 935c4ef90bfcfae64a38388e2c0c9a44cbec9da2..0000000000000000000000000000000000000000
--- a/entity/Person_entity/entityfields/salutation/possibleItemsProcess.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import("system.result");
-
-result.object([["Frau", "Frau"], ["Herr", "Herr"]])
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/salutations/children/language_param/valueProcess.js b/entity/Person_entity/entityfields/salutations/children/language_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2cb0f4295d8276abc980683fdc3945bcfd965aee
--- /dev/null
+++ b/entity/Person_entity/entityfields/salutations/children/language_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.LANGUAGE"))
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/salutationtitles/children/language_param/valueProcess.js b/entity/Person_entity/entityfields/salutationtitles/children/language_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2cb0f4295d8276abc980683fdc3945bcfd965aee
--- /dev/null
+++ b/entity/Person_entity/entityfields/salutationtitles/children/language_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.LANGUAGE"))
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/salutationtitles/children/salutation_param/valueProcess.js b/entity/Person_entity/entityfields/salutationtitles/children/salutation_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..f098580b1e736016c19e4d5cc776a552e24b55d4
--- /dev/null
+++ b/entity/Person_entity/entityfields/salutationtitles/children/salutation_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.SALUTATION"));
\ No newline at end of file
diff --git a/entity/Person_entity/entityfields/title/displayValueProcess.js b/entity/Person_entity/entityfields/title/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3682b56b29c28eb54083e5d08025f851591aed2c
--- /dev/null
+++ b/entity/Person_entity/entityfields/title/displayValueProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT))
+{
+ if (!vars.get("$field.TITLE"))
+ result.string("")
+}
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js
index 9b7d38b00dc1722f6e6fcc13b7a2b7ffbf0b92fd..56aa5aa75de8d6101953632ede50689fd8855343 100644
--- a/entity/Person_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/language.displayvalue/expression.js
@@ -2,4 +2,5 @@ import("system.result");
import("Keyword_lib");
var sql = LanguageKeywordUtils.getResolvedTitleSqlPart("CONTACT.LANGUAGE");
+
result.string(sql);
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/salutation.displayvalue/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/salutation.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..c4d0a4e0b677f6ba8fb58e68c3a15381b26942bb
--- /dev/null
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/salutation.displayvalue/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("SALUTATION");
\ No newline at end of file
diff --git a/entity/Person_entity/recordcontainers/db/recordfieldmappings/title.displayvalue/expression.js b/entity/Person_entity/recordcontainers/db/recordfieldmappings/title.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..b02537f776e09bb62333e1b0921b9fe913f1599d
--- /dev/null
+++ b/entity/Person_entity/recordcontainers/db/recordfieldmappings/title.displayvalue/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("TITLE");
\ No newline at end of file
diff --git a/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..c24272e3d0d79eb282acadc538370961459116f0
--- /dev/null
+++ b/entity/SalutationDistinct_entity/SalutationDistinct_entity.aod
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+ <name>SalutationDistinct_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <titleProcess>%aditoprj%/entity/SalutationDistinct_entity/titleProcess.js</titleProcess>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityProvider>
+ <name>Salutations</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <children>
+ <entityParameter>
+ <name>Language_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>Language_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/SalutationDistinct_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFields>
+ <element>UID.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/SalutationDistinct_entity/recordcontainers/jdito/contentProcess.js b/entity/SalutationDistinct_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0e53e6c736a0703710a88cb472eb79eff71ccd7e
--- /dev/null
+++ b/entity/SalutationDistinct_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+import("system.db");
+import("Sql_lib");
+
+result.object(db.table(SqlCondition.begin()
+ .and("SALUTATION is not NULL")
+ .andPrepareVars("SALUTATION.LANGUAGE", "$param.Language_param")
+ .buildSql("select distinct SALUTATION from SALUTATION", "1=1")));
\ No newline at end of file
diff --git a/entity/SalutationDistinct_entity/titleProcess.js b/entity/SalutationDistinct_entity/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..16c85500b5355a72548030867e3d300661e9d4aa
--- /dev/null
+++ b/entity/SalutationDistinct_entity/titleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..3a36b6eeb4430d5a5ab04853663d41e06dbbe1c7
--- /dev/null
+++ b/entity/SalutationTitleDistinct_entity/SalutationTitleDistinct_entity.aod
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.0">
+ <name>SalutationTitleDistinct_entity</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <titleProcess>%aditoprj%/entity/SalutationTitleDistinct_entity/titleProcess.js</titleProcess>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityField>
+ <name>UID</name>
+ </entityField>
+ <entityParameter>
+ <name>Salutation_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ <entityProvider>
+ <name>SalutationTitles</name>
+ <fieldType>DEPENDENCY_IN</fieldType>
+ <children>
+ <entityParameter>
+ <name>Language_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>Salutation_param</name>
+ <expose v="true" />
+ <triggerRecalculation v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>Language_param</name>
+ <expose v="true" />
+ <description>PARAMETER</description>
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/SalutationTitleDistinct_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <recordFields>
+ <element>UID.value</element>
+ </recordFields>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/SalutationTitleDistinct_entity/recordcontainers/jdito/contentProcess.js b/entity/SalutationTitleDistinct_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8c0df5ff1d2cfee0ffc9a5ff526ebf4a608a072f
--- /dev/null
+++ b/entity/SalutationTitleDistinct_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+import("system.db");
+import("Sql_lib");
+
+result.object(db.table(SqlCondition.begin()
+ .and("TITLE is not NULL")
+ .andPrepareVars("SALUTATION.SALUTATION", "$param.Salutation_param")
+ .andPrepareVars("SALUTATION.LANGUAGE", "$param.Language_param")
+ .buildSql("select distinct TITLE from SALUTATION", "1=1")));
\ No newline at end of file
diff --git a/entity/SalutationTitleDistinct_entity/titleProcess.js b/entity/SalutationTitleDistinct_entity/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..16c85500b5355a72548030867e3d300661e9d4aa
--- /dev/null
+++ b/entity/SalutationTitleDistinct_entity/titleProcess.js
@@ -0,0 +1,4 @@
+import("system.vars");
+import("system.result");
+
+result.string(vars.get("$field.UID"));
\ No newline at end of file
diff --git a/neonContext/SalutationDistinct/SalutationDistinct.aod b/neonContext/SalutationDistinct/SalutationDistinct.aod
new file mode 100644
index 0000000000000000000000000000000000000000..0b5f0bef4315815c799aa5b1b7a79548545b8d1c
--- /dev/null
+++ b/neonContext/SalutationDistinct/SalutationDistinct.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>SalutationDistinct</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>SalutationDistinct_entity</entity>
+</neonContext>
diff --git a/neonContext/SalutationTitleDistinct/SalutationTitleDistinct.aod b/neonContext/SalutationTitleDistinct/SalutationTitleDistinct.aod
new file mode 100644
index 0000000000000000000000000000000000000000..03e5b2f36e2a3c3f209bac534999fffbfc2f2393
--- /dev/null
+++ b/neonContext/SalutationTitleDistinct/SalutationTitleDistinct.aod
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.0">
+ <name>SalutationTitleDistinct</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <entity>SalutationTitleDistinct_entity</entity>
+</neonContext>
diff --git a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod b/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
index 7b92985473799e2c293e1189b627dc1ea2b6708b..b1cd03b35f0c1b8f137ba724fe03ceba32679326 100644
--- a/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
+++ b/neonView/AttributeRelationTree_view/AttributeRelationTree_view.aod
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
- <name>AttributeRelationTree_view</name>
- <title>Attributes</title>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <filterable v="true" />
- <layout>
- <groupLayout>
- <name>layout</name>
- </groupLayout>
- </layout>
- <children>
- <treetableViewTemplate>
- <name>Treetable</name>
- <titleField>AB_ATTRIBUTE_ID</titleField>
- <descriptionField>ATTRIBUTERELATION_VALUE</descriptionField>
- <entityField>#ENTITY</entityField>
- <title></title>
- </treetableViewTemplate>
- </children>
-</neonView>
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.0">
+ <name>AttributeRelationTree_view</name>
+ <title>Attributes</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <groupLayout>
+ <name>layout</name>
+ </groupLayout>
+ </layout>
+ <children>
+ <treetableViewTemplate>
+ <name>Treetable</name>
+ <titleField>AB_ATTRIBUTE_ID</titleField>
+ <descriptionField>ATTRIBUTERELATION_VALUE</descriptionField>
+ <entityField>#ENTITY</entityField>
+ <title></title>
+ </treetableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/PersonFilter_view/PersonFilter_view.aod b/neonView/PersonFilter_view/PersonFilter_view.aod
index c763ea753ded91e609f06bea944af980a3bda1be..60c9ea74bcd01a0eedca740b550bce46223aea5f 100644
--- a/neonView/PersonFilter_view/PersonFilter_view.aod
+++ b/neonView/PersonFilter_view/PersonFilter_view.aod
@@ -42,6 +42,7 @@
<neonTableColumn>
<name>125d04cc-5c7a-4c38-bd0f-b5d02d21067d</name>
<entityField>SALUTATION</entityField>
+ <collapse v="false" />
</neonTableColumn>
<neonTableColumn>
<name>2cdfaf73-d3ee-4ad8-83ea-f50acba0335a</name>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index a14e981d0f155d0befa9e1cec9831d9f89c39c25..44cadc8a7c8ac2689b40553b0b0bc87b8987d246 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -24,7 +24,7 @@
<fields>
<entityFieldLink>
<name>f2b33601-12e8-463f-a920-6e1ae9745491</name>
- <entityField>CONTACT_ID</entityField>
+ <entityField>RELATION_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>4e3d7a37-f55b-4c18-9ba1-ab4ab0bbb442</name>
diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml
index 8a9244cf31b3e77737752445dda60b9024748262..139a4d6f4512a4ad12688edf19af74d879ee6007 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -47,6 +47,8 @@
<include relativeToChangelogFile="true" file="activity_add_parent.xml"/>
<include relativeToChangelogFile="true" file="task_add_parent.xml"/>
+
+ <include relativeToChangelogFile="true" file="create_salutation.xml"/>
<include relativeToChangelogFile="true" file="drop_estimation_salesproject.xml"/>
diff --git a/others/db_changes/data_alias/basic/2019.2/create_salutation.xml b/others/db_changes/data_alias/basic/2019.2/create_salutation.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7e3a19612134c8a967fc6d788a62fd423b9159a0
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/create_salutation.xml
@@ -0,0 +1,332 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="j.luginger" id="936582fe-351f-11e9-b210-d663bd873d93">
+ <createTable tableName="SALUTATION">
+ <column name="SALUTATIONID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_SALUTATION_SALUTATIONID"/>
+ </column>
+ <column name="HEADLINE" type="NVARCHAR(50)"/>
+ <column name="LANGUAGE" type="CHAR(3)"/>
+ <column name="LETTERSALUTATION" type="NVARCHAR(50)"/>
+ <column name="SALUTATION" type="NVARCHAR(50)"/>
+ <column name="SEX" type="CHAR(36)"/>
+ <column name="SORT" type="INTEGER"/>
+ <column name="TITLE" type="NVARCHAR(30)"/>
+ </createTable>
+
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Herr {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Sehr geehrter Herr {ln}"/>
+ <column name="SEX" value="m"/>
+ <column name="TITLE"/>
+ <column name="SALUTATION" value="Herr"/>
+ <column name="LANGUAGE" value="deu"/>
+ <column name="SORT" valueNumeric="1"/>
+ <column name="SALUTATIONID" value="c98c8644-9e00-4715-a775-827a364f5cef"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Herr Bürgermeister {fn} - {ln}"/>
+ <column name="LETTERSALUTATION" value="Sehr geehrter Herr Bürgermeister"/>
+ <column name="SEX" value="m"/>
+ <column name="TITLE" value="Bürgermeister"/>
+ <column name="SALUTATION" value="Herr"/>
+ <column name="LANGUAGE" value="deu"/>
+ <column name="SORT" valueNumeric="2"/>
+ <column name="SALUTATIONID" value="8feaf27b-1fae-4d8c-a742-9cd023f46409"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Frau {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Sehr geehrte Frau {ln}"/>
+ <column name="SEX" value="f"/>
+ <column name="TITLE"/>
+ <column name="SALUTATION" value="Frau"/>
+ <column name="LANGUAGE" value="deu"/>
+ <column name="SORT" valueNumeric="3"/>
+ <column name="SALUTATIONID" value="cbcc2c2b-9b64-442b-a6be-aaf8e462128c"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE"/>
+ <column name="LETTERSALUTATION" value="Sehr geehrte Dameng und Herreng"/>
+ <column name="SEX"/>
+ <column name="TITLE"/>
+ <column name="SALUTATION"/>
+ <column name="LANGUAGE" value="deu"/>
+ <column name="SORT" valueNumeric="4"/>
+ <column name="SALUTATIONID" value="6b835563-5d3e-4c4c-807b-63c5bdb82e68"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="{ti} {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Dear Dr. {ln}"/>
+ <column name="SEX" value="m"/>
+ <column name="TITLE" value="Dr."/>
+ <column name="SALUTATION" value="Mr."/>
+ <column name="LANGUAGE" value="eng"/>
+ <column name="SORT" valueNumeric="5"/>
+ <column name="SALUTATIONID" value="f9135efb-ebd4-4c9f-bfa1-3beedb647009"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Dr. {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Dear Dr. {ln}"/>
+ <column name="SEX" value="f"/>
+ <column name="TITLE" value="Dr."/>
+ <column name="SALUTATION" value="Mrs."/>
+ <column name="LANGUAGE" value="eng"/>
+ <column name="SORT" valueNumeric="6"/>
+ <column name="SALUTATIONID" value="0b9a3d9b-a56c-47e9-a984-e88cface58db"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE"/>
+ <column name="LETTERSALUTATION" value="Madame, Monsieur"/>
+ <column name="SEX"/>
+ <column name="TITLE"/>
+ <column name="SALUTATION"/>
+ <column name="LANGUAGE" value="fra"/>
+ <column name="SORT" valueNumeric="7"/>
+ <column name="SALUTATIONID" value="ff97826d-a8ea-45e5-b426-2a27f4fa9201"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Monsieur {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Monsieur"/>
+ <column name="SEX" value="m"/>
+ <column name="TITLE"/>
+ <column name="SALUTATION" value="Monsieur"/>
+ <column name="LANGUAGE" value="fra"/>
+ <column name="SORT" valueNumeric="8"/>
+ <column name="SALUTATIONID" value="c1095e86-38d6-4329-a388-4cfabab10eae"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Frau Dr. {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Sehr geehrte Frau Dr. {ln}"/>
+ <column name="SEX" value="f"/>
+ <column name="TITLE" value="Dr."/>
+ <column name="SALUTATION" value="Frau"/>
+ <column name="LANGUAGE" value="deu"/>
+ <column name="SORT" valueNumeric="9"/>
+ <column name="SALUTATIONID" value="6b35b8c5-920c-408b-b172-453a506aa775"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Monsieur Prof.{fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Monsieur Prof."/>
+ <column name="SEX" value="m"/>
+ <column name="TITLE" value="Prof."/>
+ <column name="SALUTATION" value="Monsieur"/>
+ <column name="LANGUAGE" value="fra"/>
+ <column name="SORT" valueNumeric="10"/>
+ <column name="SALUTATIONID" value="67fa73ae-a739-44fd-9244-28a49bc0d01d"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Monsieur Dr.{fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Monsieur Dr."/>
+ <column name="SEX" value="m"/>
+ <column name="TITLE" value="Dr."/>
+ <column name="SALUTATION" value="Monsieur"/>
+ <column name="LANGUAGE" value="fra"/>
+ <column name="SORT" valueNumeric="11"/>
+ <column name="SALUTATIONID" value="516b740d-b932-4a64-b611-af0ea69f6bd0"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Herr Professor {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Sehr geehrter Herr Professor"/>
+ <column name="SEX" value="m"/>
+ <column name="TITLE" value="Professor"/>
+ <column name="SALUTATION" value="Herr"/>
+ <column name="LANGUAGE" value="deu"/>
+ <column name="SORT" valueNumeric="12"/>
+ <column name="SALUTATIONID" value="5d9ad542-27b8-4dec-bcbd-a2c7d223f012"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Herr Dr. {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Sehr geehrter Herr Dr. {ln}"/>
+ <column name="SEX" value="m"/>
+ <column name="TITLE" value="Dr."/>
+ <column name="SALUTATION" value="Herr"/>
+ <column name="LANGUAGE" value="deu"/>
+ <column name="SORT" valueNumeric="13"/>
+ <column name="SALUTATIONID" value="76fe57c0-cf68-4240-ba6d-eb7d52f46317"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Herr Präsidengt {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Sehr geehrter Herr Präsidengt"/>
+ <column name="SEX" value="m"/>
+ <column name="TITLE" value="Präsidengt"/>
+ <column name="SALUTATION" value="Herr"/>
+ <column name="LANGUAGE" value="deu"/>
+ <column name="SORT" valueNumeric="14"/>
+ <column name="SALUTATIONID" value="4b9af3f4-f34a-4170-a28c-ffdbca80c4d3"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Herr Prof. Dr. {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Sehr geehrter Herr Professor"/>
+ <column name="SEX" value="m"/>
+ <column name="TITLE" value="Prof. Dr."/>
+ <column name="SALUTATION" value="Herr"/>
+ <column name="LANGUAGE" value="deu"/>
+ <column name="SORT" valueNumeric="15"/>
+ <column name="SALUTATIONID" value="1f19ba34-8346-4620-a10e-fb39fdd0be9b"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Mr. {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Dear Mr. {ln}"/>
+ <column name="SEX" value="m"/>
+ <column name="TITLE"/>
+ <column name="SALUTATION" value="Mr."/>
+ <column name="LANGUAGE" value="eng"/>
+ <column name="SORT" valueNumeric="16"/>
+ <column name="SALUTATIONID" value="801efd2a-41ce-4a5d-8ed5-c2db7fedb4e8"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Professor {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Dear Professor {ln}"/>
+ <column name="SEX" value="m"/>
+ <column name="TITLE" value="Professor"/>
+ <column name="SALUTATION" value="Mr."/>
+ <column name="LANGUAGE" value="eng"/>
+ <column name="SORT" valueNumeric="17"/>
+ <column name="SALUTATIONID" value="ce348b08-c1bf-4e76-8272-6d6b32ecdd6a"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Mrs. {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Dear Mrs. {ln}"/>
+ <column name="SEX" value="f"/>
+ <column name="TITLE"/>
+ <column name="SALUTATION" value="Mrs."/>
+ <column name="LANGUAGE" value="eng"/>
+ <column name="SORT" valueNumeric="18"/>
+ <column name="SALUTATIONID" value="11816f93-f6e9-427f-af68-fbf29c3e3544"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Madame {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Madame"/>
+ <column name="SEX" value="f"/>
+ <column name="TITLE"/>
+ <column name="SALUTATION" value="Madame"/>
+ <column name="LANGUAGE" value="fra"/>
+ <column name="SORT" valueNumeric="19"/>
+ <column name="SALUTATIONID" value="2360e24d-1784-47b8-b0e9-3b57bd704e8a"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE"/>
+ <column name="LETTERSALUTATION" value="Dear Sir or Madame"/>
+ <column name="SEX"/>
+ <column name="TITLE"/>
+ <column name="SALUTATION"/>
+ <column name="LANGUAGE" value="eng"/>
+ <column name="SORT" valueNumeric="20"/>
+ <column name="SALUTATIONID" value="f7b3c876-366d-438a-a1e6-f17ceb641f36"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Herr Prof. {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Sehr geehrter Herr Professor"/>
+ <column name="SEX" value="m"/>
+ <column name="TITLE" value="Prof."/>
+ <column name="SALUTATION" value="Herr"/>
+ <column name="LANGUAGE" value="deu"/>
+ <column name="SORT" valueNumeric="21"/>
+ <column name="SALUTATIONID" value="75f4f04f-1877-425d-8d5d-56604d0040b2"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Monsieur Prof.Dr.{fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Monsieur Prof.Dr."/>
+ <column name="SEX" value="m"/>
+ <column name="TITLE" value="Prof.Dr."/>
+ <column name="SALUTATION" value="Monsieur"/>
+ <column name="LANGUAGE" value="fra"/>
+ <column name="SORT" valueNumeric="22"/>
+ <column name="SALUTATIONID" value="2d8ec97f-38d7-45a8-9c45-ed672f4b035d"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Madame Dr.{fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Madame Dr."/>
+ <column name="SEX" value="f"/>
+ <column name="TITLE" value="Dr."/>
+ <column name="SALUTATION" value="Madame"/>
+ <column name="LANGUAGE" value="fra"/>
+ <column name="SORT" valueNumeric="23"/>
+ <column name="SALUTATIONID" value="4e76c69b-ee75-49e5-8581-2a808b29a117"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Monsieur Dr. Ing. {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Monsieur Dr. Ing. {ln}"/>
+ <column name="SEX" value="m"/>
+ <column name="TITLE" value="Dr. Ing."/>
+ <column name="SALUTATION" value="Monsieur"/>
+ <column name="LANGUAGE" value="fra"/>
+ <column name="SORT" valueNumeric="24"/>
+ <column name="SALUTATIONID" value="f3ea547a-d744-4ce8-815a-126d9697e037"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Madame Dr. Ing. {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Madame Dr. Ing. {ln}"/>
+ <column name="SEX" value="f"/>
+ <column name="TITLE" value="Dr. Ing."/>
+ <column name="SALUTATION" value="Madame"/>
+ <column name="LANGUAGE" value="fra"/>
+ <column name="SORT" valueNumeric="25"/>
+ <column name="SALUTATIONID" value="e8e001ab-b200-480f-917b-33d57e2a8734"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Frau Dr. Ing. {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Sehr geehrte Frau Dr. Ing. {ln}"/>
+ <column name="SEX" value="f"/>
+ <column name="TITLE" value="Dr. Ing."/>
+ <column name="SALUTATION" value="Frau"/>
+ <column name="LANGUAGE" value="deu"/>
+ <column name="SORT" valueNumeric="26"/>
+ <column name="SALUTATIONID" value="0e719a2a-1018-49e0-b056-c90779955bf9"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Herr Dr. Ing. {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Sehr geehrter Herr Dr. Ing. {ln}"/>
+ <column name="SEX" value="m"/>
+ <column name="TITLE" value="Dr. Ing."/>
+ <column name="SALUTATION" value="Herr"/>
+ <column name="LANGUAGE" value="deu"/>
+ <column name="SORT" valueNumeric="27"/>
+ <column name="SALUTATIONID" value="0500939e-5820-457d-a95f-6835b9501df9"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Mr. Dr. Ing. {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Dear Dr. Ing. {ln}"/>
+ <column name="SEX" value="m"/>
+ <column name="TITLE" value="Dr. Ing."/>
+ <column name="SALUTATION" value="Mr."/>
+ <column name="LANGUAGE" value="eng"/>
+ <column name="SORT" valueNumeric="28"/>
+ <column name="SALUTATIONID" value="5260f79c-1001-41dc-b3ff-28b4ce7091b9"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Señor Dr. Ing. {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Estimado Dr. Ing. {ln}"/>
+ <column name="SEX" value="m"/>
+ <column name="TITLE" value="Dr. Ing."/>
+ <column name="SALUTATION" value="Señor"/>
+ <column name="LANGUAGE" value="spa"/>
+ <column name="SORT" valueNumeric="29"/>
+ <column name="SALUTATIONID" value="7617a199-82b7-40ef-b2f7-0e85d32fad64"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Señora Dr. Ing. {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Estimado Dr. Ing. {ln}"/>
+ <column name="SEX" value="f"/>
+ <column name="TITLE" value="Dr. Ing."/>
+ <column name="SALUTATION" value="Señora"/>
+ <column name="LANGUAGE" value="spa"/>
+ <column name="SORT" valueNumeric="30"/>
+ <column name="SALUTATIONID" value="25b28c87-edb5-4686-a3c4-92a5136aadc0"/>
+ </insert>
+ <insert tableName="SALUTATION">
+ <column name="HEADLINE" value="Mrs. Dr. Ing. {fn} {ln}"/>
+ <column name="LETTERSALUTATION" value="Dear Dr. Ing. {ln}"/>
+ <column name="SEX" value="f"/>
+ <column name="TITLE" value="Dr. Ing."/>
+ <column name="SALUTATION" value="Mrs."/>
+ <column name="LANGUAGE" value="eng"/>
+ <column name="SORT" valueNumeric="31"/>
+ <column name="SALUTATIONID" value="4505783d-8a9f-4a18-ba2e-091794db3812"/>
+ </insert>
+
+ <rollback>
+ <dropTable tableName="SALUTATION"/>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
diff --git a/others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml b/others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml
index a74490dfcf370d59d36cbb6101152ac162ec0812..77bb7e789f09aea4f268a4f50b79d7c9c9de5780 100644
--- a/others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml
+++ b/others/db_changes/data_alias/basic/2019.2/removeTaskCode.xml
@@ -10,4 +10,4 @@
<!--the update which sets everything to null cannot be rolled back-->
</rollback>
</changeSet>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
diff --git a/process/Appointment_lib/Appointment_lib.aod b/process/Appointment_lib/Appointment_lib.aod
index 972c37d07cd235bb1d06ba35a91265be5e1fef34..8116d1ce92de31cf88a62114153aa1df86061e80 100644
--- a/process/Appointment_lib/Appointment_lib.aod
+++ b/process/Appointment_lib/Appointment_lib.aod
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.0">
- <name>Appointment_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Appointment_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?xml version="1.0" encoding="UTF-8"?>
<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.0">
+ <name>Appointment_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Appointment_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Attribute_lib/Attribute_lib.aod b/process/Attribute_lib/Attribute_lib.aod
index 524056d42c8ea7ee2286ce0a5821b38ff7b48621..5cc0e19791f3c84678baf8bdaf4acaeeada59846 100644
--- a/process/Attribute_lib/Attribute_lib.aod
+++ b/process/Attribute_lib/Attribute_lib.aod
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.0">
- <name>Attribute_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Attribute_lib/process.js</process>
- <alias>Data_alias</alias>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.0">
+ <name>Attribute_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Attribute_lib/process.js</process>
+ <alias>Data_alias</alias>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Timetracking_lib/Timetracking_lib.aod b/process/Timetracking_lib/Timetracking_lib.aod
index f4097628ca20e303534f3ae9efb535beb1cf2cff..f993357a8648d4a835f33fc6a82bc08c5a57412c 100644
--- a/process/Timetracking_lib/Timetracking_lib.aod
+++ b/process/Timetracking_lib/Timetracking_lib.aod
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.0">
- <name>Timetracking_lib</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/Timetracking_lib/process.js</process>
- <variants>
- <element>LIBRARY</element>
- </variants>
-</process>
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.0">
+ <name>Timetracking_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Timetracking_lib/process.js</process>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/autostartNeon/autostartNeon.aod b/process/autostartNeon/autostartNeon.aod
index f6c096f046aedf5e85fd9e85be6e3bbbdb355810..6db0d823bdcfd3f4f2665450c8a52274d11cce85 100644
--- a/process/autostartNeon/autostartNeon.aod
+++ b/process/autostartNeon/autostartNeon.aod
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.0">
- <name>autostartNeon</name>
- <majorModelMode>DISTRIBUTED</majorModelMode>
- <process>%aditoprj%/process/autostartNeon/process.js</process>
-</process>
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.0">
+ <name>autostartNeon</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/autostartNeon/process.js</process>
+</process>